Use JUGGLER_DETECTOR_CONFIG for xml file

08b2637d · Wouter Deconinck · 7e5aecf4 · 08b2637d · 08b2637d · 08b2637d
Commit 08b2637d authored Jun 15, 2022 by Wouter Deconinck
--- a/benchmarks/clustering/full_cal_clusters.sh
+++ b/benchmarks/clustering/full_cal_clusters.sh
@@ -75,7 +75,7 @@ if [[ ! -n "${DETECTOR_PATH}" ]] ; then
  export DETECTOR_PATH=${DETECTOR_PATH}
 fi
-compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 export JUGGLER_FILE_NAME_TAG="${nametag}"
 export JUGGLER_GEN_FILE="gen_${JUGGLER_FILE_NAME_TAG}.hepmc"

--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -9,8 +9,8 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
-detector_version = str(os.environ.get("JUGGLER_DETECTOR", "master"))
+detector_version = str(os.environ.get("JUGGLER_DETECTOR_VERSION", "master"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = os.path.join(detector_path, detector_name)

--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -9,7 +9,7 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))

--- a/benchmarks/ecal/options/endcap_e.py
+++ b/benchmarks/ecal/options/endcap_e.py
@@ -8,7 +8,7 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))

--- a/benchmarks/ecal/options/endcap_i.py
+++ b/benchmarks/ecal/options/endcap_i.py
@@ -9,7 +9,7 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 ci_ecal_sf = float(os.environ.get("CI_ECAL_SAMP_FRAC", 0.253))

--- a/benchmarks/ecal/run_emcal_benchmarks.py
+++ b/benchmarks/ecal/run_emcal_benchmarks.py
@@ -32,7 +32,7 @@ default_type = {
 }
 default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
-        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
+        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR_CONFIG', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('run_type', help='Run type, support {}'.format(list(default_type.keys())))
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')

--- a/benchmarks/far_forward/far_forward_protons.sh
+++ b/benchmarks/far_forward/far_forward_protons.sh
@@ -83,7 +83,7 @@ then
    --filter.tracker edep0 \
    -v WARNING \
    --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
    --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
    --outputFile  ${JUGGLER_SIM_FILE}
  if [[ "$?" -ne "0" ]] ; then

--- a/benchmarks/far_forward/options/far_forward_reconstruction.py
+++ b/benchmarks/far_forward/options/far_forward_reconstruction.py
@@ -3,7 +3,7 @@ from Gaudi.Configuration import *
 from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))

--- a/benchmarks/far_forward/run_zdc_neutrons.sh
+++ b/benchmarks/far_forward/run_zdc_neutrons.sh
@@ -67,7 +67,7 @@ if [[ ! -n "${ZDC_SCI_SAMP_FRAC}" ]] ; then
  export ZDC_PbSCI_SAMP_FRAC=1.0
 fi
-export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 export JUGGLER_FILE_NAME_TAG="zdc_neutrons"
 export JUGGLER_GEN_FILE="${JUGGLER_FILE_NAME_TAG}.hepmc"
@@ -93,7 +93,7 @@ then
    --filter.tracker edep0 \
    -v WARNING \
    --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
    --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
    --outputFile  ${JUGGLER_SIM_FILE}
  if [[ "$?" -ne "0" ]] ; then

--- a/benchmarks/far_forward/run_zdc_photons.sh
+++ b/benchmarks/far_forward/run_zdc_photons.sh
@@ -67,7 +67,7 @@ if [[ ! -n "${ZDC_SCI_SAMP_FRAC}" ]] ; then
  export ZDC_PbSCI_SAMP_FRAC=1.0
 fi
-export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 export JUGGLER_FILE_NAME_TAG="zdc_photons"
 export JUGGLER_GEN_FILE="${JUGGLER_FILE_NAME_TAG}.hepmc"
@@ -93,7 +93,7 @@ then
    --filter.tracker edep0 \
    -v WARNING \
    --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
    --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
    --outputFile  ${JUGGLER_SIM_FILE}
  if [[ "$?" -ne "0" ]] ; then

--- a/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
@@ -95,8 +95,8 @@ void emcal_barrel_pion_rejection_analysis(
  if(std::getenv("DETECTOR_PATH")) {
    detector_path = std::getenv("DETECTOR_PATH");
  }
-  if(std::getenv("JUGGLER_DETECTOR")) {
+  if(std::getenv("JUGGLER_DETECTOR_CONFIG")) {
-    detector_name = std::getenv("JUGGLER_DETECTOR");
+    detector_name = std::getenv("JUGGLER_DETECTOR_CONFIG");
  }
  // MCParticles Functions/////////////////////////////////////////////////////////////////////////////////////

--- a/benchmarks/imaging_ecal/run_emcal_barrel.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel.sh
@@ -47,7 +47,7 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
-export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
  export CB_EMCAL_NUMEV=1000

--- a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
@@ -47,7 +47,7 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
-export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
  export CB_EMCAL_NUMEV=1000

--- a/benchmarks/imaging_ecal/run_imcal_pion0.sh
+++ b/benchmarks/imaging_ecal/run_imcal_pion0.sh
@@ -47,7 +47,7 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
-export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
  export CB_EMCAL_NUMEV=1000

--- a/benchmarks/imaging_shower_ML/sim_rec_tag.py
+++ b/benchmarks/imaging_shower_ML/sim_rec_tag.py
@@ -12,7 +12,7 @@ import argparse
 default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
-        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
+        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR_CONFIG', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')
 parser.add_argument('-t', '--nametag', type=str, default='IMCAL_ML', help='Name tag for output files.')

--- a/benchmarks/rich/forward_hadrons.sh
+++ b/benchmarks/rich/forward_hadrons.sh
@@ -45,7 +45,7 @@ fi
 # This script appears to be missing
 ## run geant4 simulations
 #python benchmakrs/options/ForwardRICH/simu.py \
-#       --compact=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+#       --compact=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
 #       -i ${JUGGLER_FILE_NAME_TAG}.hepmc \
 #       -o ${JUGGLER_SIM_FILE}
 #       -n ${JUGGLER_N_EVENTS}
@@ -63,7 +63,7 @@ ddsim --runType batch \
      --filter.tracker edep0 \
      -v WARNING \
      --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
      --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
      --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then

--- a/benchmarks/rich/options/rich_reco.py
+++ b/benchmarks/rich/options/rich_reco.py
@@ -4,8 +4,8 @@ from GaudiKernel import SystemOfUnits as units
 from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 detector_name = "topside"
-if "JUGGLER_DETECTOR" in os.environ :
+if "JUGGLER_DETECTOR_CONFIG" in os.environ :
-  detector_name = str(os.environ["JUGGLER_DETECTOR"])
+  detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
 if "DETECTOR_PATH" in os.environ :
  detector_name = str(os.environ["DETECTOR_PATH"])+"/"+detector_name

--- a/benchmarks/track_finding/multiple_tracks.sh
+++ b/benchmarks/track_finding/multiple_tracks.sh
@@ -68,7 +68,7 @@ ddsim --runType batch \
  --filter.tracker edep0 \
  -v WARNING \
  --numberOfEvents ${JUGGLER_N_EVENTS} \
-  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
  --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
  --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then

--- a/benchmarks/track_finding/options/track_reconstruction.py
+++ b/benchmarks/track_finding/options/track_reconstruction.py
@@ -4,8 +4,8 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 detector_name = "topside"
-if "JUGGLER_DETECTOR" in os.environ :
+if "JUGGLER_DETECTOR_CONFIG" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR"])
+    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :

--- a/benchmarks/track_fitting/options/track_reconstruction.py
+++ b/benchmarks/track_fitting/options/track_reconstruction.py
@@ -4,8 +4,8 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 detector_name = "athena"
-if "JUGGLER_DETECTOR" in os.environ :
+if "JUGGLER_DETECTOR_CONFIG" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR"])
+    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :