modified: dvcs/dvcs.sh

	modified:   options/tracker_reconstruction.py

dvcs/dvcs.sh

@@ -44,7 +44,7 @@ npsim --runType batch \
       --part.minimalKineticEnergy 1000*GeV  \
       -v WARNING \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${JUGGLER_DETECTOR}/${JUGGLER_DETECTOR}.xml \
+      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
       --inputFiles test_proton_dvcs_eic.hepmc \
       --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then

options/tracker_reconstruction.py

@@ -13,13 +13,12 @@ input_sim_file  = str(os.environ["JUGGLER_SIM_FILE"])
 output_rec_file = str(os.environ["JUGGLER_REC_FILE"])
 n_events = str(os.environ["JUGGLER_N_EVENTS"])
 
-# This won't work
-#detector_path = ""
-#if "JUGGLER_DETECTOR_PATH" in os.environ :
-#    detector_path = str(os.environ["JUGGLER_DETECTOR_PATH"])
+detector_path = detector_name
+if "DETECTOR_PATH" in os.environ :
+    detector_path = str(os.environ["DETECTOR_PATH"])
 
 geo_service  = GeoSvc("GeoSvc",
-        detectors=["{}/{}.xml".format(detector_name, detector_name)])
+        detectors=["{}/{}.xml".format(detector_path, detector_name)])
 podioevent   = EICDataSvc("EventDataSvc", inputs=[input_sim_file], OutputLevel=DEBUG)
 
 from Configurables import PodioInput