modified: dvcs/dvcs.sh

	modified:   options/tracker_reconstruction.py

dvcs/dvcs.sh

@@ -34,7 +34,6 @@ pushd ${JUGGLER_DETECTOR}/build
 cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
 popd
 
-pushd ${JUGGLER_DETECTOR}
 
 curl -o test_proton_dvcs_eic.hepmc "https://eicweb.phy.anl.gov/api/v4/projects/345/jobs/artifacts/master/raw/data/test_proton_dvcs_eic.hepmc?job=compile"
 if [[ "$?" -ne "0" ]] ; then
@@ -42,13 +41,12 @@ if [[ "$?" -ne "0" ]] ; then
   exit 1
 fi
 
-
 ## run geant4 simulations
 npsim --runType batch \
       --part.minimalKineticEnergy 1000*GeV  \
       -v WARNING \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${JUGGLER_DETECTOR}.xml \
+      --compactFile ${JUGGLER_DETECTOR}/${JUGGLER_DETECTOR}.xml \
       --inputFiles test_proton_dvcs_eic.hepmc \
       --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then
@@ -58,7 +56,7 @@ fi
 
 # Need to figure out how to pass file name to juggler from the commandline
 xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-  gaudirun.py ../options/tracker_reconstruction.py
+  gaudirun.py options/tracker_reconstruction.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running juggler"
   exit 1

options/tracker_reconstruction.py

@@ -13,9 +13,10 @@ 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"])
 
-detector_path = ""
-if "JUGGLER_DETECTOR_PATH" in os.environ :
-    detector_path = str(os.environ["JUGGLER_DETECTOR_PATH"])
+# This won't work
+#detector_path = ""
+#if "JUGGLER_DETECTOR_PATH" in os.environ :
+#    detector_path = str(os.environ["JUGGLER_DETECTOR_PATH"])
 
 geo_service  = GeoSvc("GeoSvc",
         detectors=["{}/{}.xml".format(detector_name, detector_name)])