npsim all files

benchmarks/synchrotron/synchrotron.sh

@@ -73,7 +73,7 @@ print_env.sh
 FILE_NAME_TAG="synchrotron"
 DATA_URL="S3/eictest/ATHENA/EVGEN/SR/SR.10GeV_5kVthreshold_hepmc/"
 
-export JUGGLER_MC_FILES="${LOCAL_DATA_PATH}/mc_${FILE_NAME_TAG}/*.hepmc"
+export JUGGLER_MC_FILES="${LOCAL_DATA_PATH}/mc_${FILE_NAME_TAG}/"
 export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.root"
 export JUGGLER_REC_FILE="${LOCAL_DATA_PATH}/rec_${FILE_NAME_TAG}.root"
 
@@ -90,7 +90,7 @@ echo "JUGGLER_DETECTOR    = ${JUGGLER_DETECTOR}"
 ## Step 1. Get the data
 if [[ -n "${DATA_INIT}" || -n "${DO_ALL}" ]] ; then
   mc -C . config host add S3 https://dtn01.sdcc.bnl.gov:9000 $S3_ACCESS_KEY $S3_SECRET_KEY
-  mc -C . cp --insecure --recursive ${DATA_URL} "${LOCAL_DATA_PATH}/mc_${FILE_NAME_TAG}/"
+  mc -C . cp --insecure --recursive ${DATA_URL} "${JUGGLER_MC_FILES}"
   if [[ "$?" -ne "0" ]] ; then
     echo "Failed to download hepmc files"
     exit 1
@@ -100,14 +100,15 @@ fi
 ### Step 2. Run the simulation (geant4)
 if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
   ## run geant4 simulations
+  export JUGGLER_N_EVENTS=1000000
   npsim --runType batch \
     --part.minimalKineticEnergy 1000*GeV  \
     --filter.tracker edep0 \
     -v ERROR \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
     --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
-    --inputFiles "${JUGGLER_MC_FILES}" \
-    --outputFile  ${JUGGLER_SIM_FILE}
+    --inputFiles ${JUGGLER_MC_FILES}/*.hepmc \
+    --outputFile ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running npsim"
     exit 1