modified: benchmarks/calorimeters/run_emcal_barrel_electrons.sh

	modified:   benchmarks/calorimeters/run_emcal_barrel_pions.sh
	modified:   benchmarks/calorimeters/run_simulation_crystal.sh
	modified:   benchmarks/calorimeters/run_simulation_crystal_pion.sh
	modified:   benchmarks/calorimeters/run_simulation_zdc.sh

benchmarks/calorimeters/run_emcal_barrel_electrons.sh

@@ -8,9 +8,6 @@ if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then
   export JUGGLER_N_EVENTS=1000
 fi
 
-if [[ ! -n  "${JUGGLER_INSTALL_PREFIX}" ]] ; then 
-  export JUGGLER_INSTALL_PREFIX="/usr/local"
-fi
 
 if [[ ! -n  "${E_start}" ]] ; then
   export E_start=5.0
@@ -30,13 +27,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events
-root -b -q "calorimeters/scripts/emcal_barrel_electrons.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_electrons.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: generating input events"
   exit 1
 fi
 # Plot the input events
-root -b -q "calorimeters/scripts/emcal_barrel_electrons_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_electrons_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: plotting input events"
   exit 1
@@ -56,14 +53,6 @@ if [[ "$?" -ne "0" ]] ; then
   exit 1
 fi
 
-# Run Juggler
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-	gaudirun.py calorimeters/options/emcal_barrel_reco.py
-if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR running juggler"
-  exit 1
-fi
-
 # Directory for plots
 mkdir -p results
 

benchmarks/calorimeters/run_emcal_barrel_pions.sh

@@ -30,13 +30,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events
-root -b -q "calorimeters/scripts/emcal_barrel_pions.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_pions.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: generating input events"
   exit 1
 fi
 # Plot the input events
-root -b -q "calorimeters/scripts/emcal_barrel_pions_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_pions_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: plotting input events"
   exit 1
@@ -56,14 +56,6 @@ if [[ "$?" -ne "0" ]] ; then
   exit 1
 fi
 
-# Run Juggler
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-        gaudirun.py calorimeters/options/emcal_barrel_reco.py
-if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR running juggler"
-  exit 1
-fi
-
 # Directory for plots
 mkdir -p results
 

benchmarks/calorimeters/run_simulation_crystal.sh

 #!/bin/bash
 
 ddsim --runType batch --numberOfEvents 100 \
-      --compactFile ./calorimeters/Crystal_example.xml \
+      --compactFile benchmarks/calorimeters/Crystal_example.xml \
       --inputFiles  ./data/emcal_electrons.hepmc \
       --outputFile  ./sim_output/output_emcal_electrons.root

benchmarks/calorimeters/run_simulation_crystal_pion.sh

 #!/bin/bash
 
 npsim --runType batch --numberOfEvents 10000 \
-      --compactFile ./calorimeters/topside.xml \
+      --compactFile benchmarks/calorimeters/topside.xml \
       --inputFiles  ./data/emcal_pions_upto1GeV_10kevents.hepmc \
       --outputFile  ./sim_output/sim_crystal_pion_input.root

benchmarks/calorimeters/run_simulation_zdc.sh

 #!/bin/bash
 
 ddsim --runType batch --numberOfEvents 100 \
-      --compactFile ./calorimeters/ZDC_example.xml \
+      --compactFile benchmarks/calorimeters/ZDC_example.xml \
       --inputFiles  ./data/zdc_photons.hepmc \
       --outputFile  ./sim_output/output_zdc_photons.root