Replaced JUGGLER_DETECTOR_PATH with DETECTOR_PATH.

- Not sure why JUGGLER_DETECTOR_PATH was introduced but only
  JUGGLER_INSTALL_PREFIX and JUGGLER_DETECTOR should be used.
- JUGGLER_DETECTOR could probably have a different name but it is
  historical

benchmarks/clustering/full_cal_clusters.sh

@@ -71,11 +71,11 @@ if [[ ! -n  "${FULL_CAL_PMAX}" ]] ; then
   export FULL_CAL_PMIN=10.0
 fi
 
-if [[ ! -n "${JUGGLER_DETECTOR_PATH}" ]] ; then
-  export JUGGLER_DETECTOR_PATH=${DETECTOR_PATH}
+if [[ ! -n "${DETECTOR_PATH}" ]] ; then
+  export DETECTOR_PATH=${DETECTOR_PATH}
 fi
 
-compact_path=${JUGGLER_DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
 export JUGGLER_FILE_NAME_TAG="${nametag}"
 export JUGGLER_GEN_FILE="gen_${JUGGLER_FILE_NAME_TAG}.hepmc"
 
@@ -84,7 +84,7 @@ export JUGGLER_DIGI_FILE="digi_${JUGGLER_FILE_NAME_TAG}.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR_PATH = ${JUGGLER_DETECTOR_PATH}"
+echo "DETECTOR_PATH = ${DETECTOR_PATH}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events

benchmarks/clustering/options/full_cal_reco.py

@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = os.path.join(detector_path, detector_name)
 
 # get sampling fractions from system environment variable, 1.0 by default

benchmarks/clustering/options/full_trackpluscalo_reco.py

@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = os.path.join(detector_path, detector_name)
 
 # get sampling fractions from system environment variable, 1.0 by default

benchmarks/ecal/options/barrel.py

@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+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))))
 
 # input and output

benchmarks/ecal/options/endcap_e.py

@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+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))))
 
 # input and output

benchmarks/ecal/options/endcap_i.py

@@ -11,7 +11,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+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))
 

benchmarks/ecal/run_emcal_benchmarks.py

@@ -31,7 +31,7 @@ default_type = {
 #         ['EcalEndcapNClusters', 'EcalEndcapPClusters', 'EcalBarrelClusters']],
 }
 
-default_compact = os.path.join(os.environ.get('JUGGLER_DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
+default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
         '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('run_type', help='Run type, support {}'.format(list(default_type.keys())))

benchmarks/full/full_reconstruction.sh

@@ -110,15 +110,11 @@ if [[ ! -n "${JUGGLER_DETECTOR}" ]] ; then
   export JUGGLER_DETECTOR="athena"
 fi
 
-if [[ ! -n "${JUGGLER_DETECTOR_PATH}" ]] ; then
-  export JUGGLER_DETECTOR_PATH="/opt/detector/share/athena"
-fi
-
 if [[ ! -n "${JUGGLER_INSTALL_PREFIX}" ]] ; then
   export JUGGLER_INSTALL_PREFIX="/usr/local"
 fi
 
-compact_path=${JUGGLER_DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
 export JUGGLER_FILE_NAME_TAG="${nametag}"
 export JUGGLER_GEN_FILE="gen_${JUGGLER_FILE_NAME_TAG}.hepmc"
 
@@ -126,7 +122,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR_PATH = ${JUGGLER_DETECTOR_PATH}"
+echo "DETECTOR_PATH = ${DETECTOR_PATH}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events

benchmarks/full/options/full_reconstruction.py

@@ -10,8 +10,8 @@ if "JUGGLER_DETECTOR" in os.environ :
   detector_name = str(os.environ["JUGGLER_DETECTOR"])
 
 detector_path = ""
-if "JUGGLER_DETECTOR_PATH" in os.environ :
-  detector_path = str(os.environ["JUGGLER_DETECTOR_PATH"])
+if "DETECTOR_PATH" in os.environ :
+  detector_path = str(os.environ["DETECTOR_PATH"])
 
 compact_path = os.path.join(detector_path, detector_name)
 

benchmarks/imaging_shower_ML/sim_rec_tag.py

@@ -11,7 +11,7 @@ import subprocess
 import argparse
 
 
-default_compact = os.path.join(os.environ.get('JUGGLER_DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
+default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
         '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')

benchmarks/rich/forward_hadrons.sh

@@ -11,7 +11,7 @@
 ## You can ready options/env.sh for more in-depth explanations of the variables
 ## and how they can be controlled.
 source options/env.sh
-export JUGGLER_DETECTOR_PATH=${DETECTOR_PATH}
+export DETECTOR_PATH=${DETECTOR_PATH}
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
   export JUGGLER_N_EVENTS=100

benchmarks/rich/options/rich_reco.py

@@ -7,8 +7,8 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 detector_name = "topside"
 if "JUGGLER_DETECTOR" in os.environ :
   detector_name = str(os.environ["JUGGLER_DETECTOR"])
-if "JUGGLER_DETECTOR_PATH" in os.environ :
-  detector_name = str(os.environ["JUGGLER_DETECTOR_PATH"])+"/"+detector_name
+if "DETECTOR_PATH" in os.environ :
+  detector_name = str(os.environ["DETECTOR_PATH"])+"/"+detector_name
 
 # todo add checks
 input_sim_file  = str(os.environ["JUGGLER_SIM_FILE"])

benchmarks/tracking/central_electrons.sh

@@ -49,7 +49,7 @@ print_env.sh
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
 ## and how they can be controlled.
-export JUGGLER_DETECTOR_PATH=${DETECTOR_PATH}
+export DETECTOR_PATH=${DETECTOR_PATH}
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
   export JUGGLER_N_EVENTS=100

benchmarks/tracking/options/tracker_reconstruction.py

@@ -9,8 +9,8 @@ if "JUGGLER_DETECTOR" in os.environ :
   detector_name = str(os.environ["JUGGLER_DETECTOR"])
 
 detector_path = ""
-if "JUGGLER_DETECTOR_PATH" in os.environ :
-  detector_path = str(os.environ["JUGGLER_DETECTOR_PATH"])
+if "DETECTOR_PATH" in os.environ :
+  detector_path = str(os.environ["DETECTOR_PATH"])
 
 # todo add checks
 input_sim_file  = str(os.environ["JUGGLER_SIM_FILE"])