diff --git a/benchmarks/dis/analysis-only.sh b/benchmarks/dis/analysis-only.sh index 42b94679845d8900cb3d6f005ca0241e55a7692d..b2ba709459f2659e7b29675a716043b85d2c2df3 100755 --- a/benchmarks/dis/analysis-only.sh +++ b/benchmarks/dis/analysis-only.sh @@ -81,14 +81,12 @@ echo "Running Geant4 simulation" ## - JUGGLER_DETECTOR: detector package (part of global environment) #export JUGGLER_SIM_FILE=${SIM_FILE} #export JUGGLER_REC_FILE=${REC_FILE} -#xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ -# gaudirun.py options/tracker_reconstruction.py +#gaudirun.py options/tracker_reconstruction.py ## on-error, first retry running juggler again as there is still a random ## crash we need to address FIXME #if [ "$?" -ne "0" ] ; then # echo "Juggler crashed, retrying..." -# xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ -# gaudirun.py options/tracker_reconstruction.py \ +# gaudirun.py options/tracker_reconstruction.py \ # 2>&1 > ${REC_LOG} # if [ "$?" -ne "0" ] ; then # echo "ERROR running juggler, both attempts failed" diff --git a/benchmarks/dis/dis.sh b/benchmarks/dis/dis.sh index 4d59b2a78e68f767a78c35b3294ee8219a1a632e..de9537f635700e0950d8c3021f58147e95cdc389 100755 --- a/benchmarks/dis/dis.sh +++ b/benchmarks/dis/dis.sh @@ -88,7 +88,6 @@ for rec in options/*.py ; do unset tag [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ - xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ gaudirun.py ${rec} done if [ "$?" -ne "0" ] ; then diff --git a/benchmarks/dvcs/dvcs.sh b/benchmarks/dvcs/dvcs.sh index dbb667adfc893767d171981d7bfee1936147fbb0..ac7e7a220bc1fdb72dc34fef73a66dbb56e3bb11 100644 --- a/benchmarks/dvcs/dvcs.sh +++ b/benchmarks/dvcs/dvcs.sh @@ -119,7 +119,6 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then unset tag [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ - xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ gaudirun.py ${rec} done if [[ "$?" -ne "0" ]] ; then diff --git a/benchmarks/dvmp/dvmp.sh b/benchmarks/dvmp/dvmp.sh index e9d608e1e00aa71c81446a2b383448e7535965de..1c02ef8852e7d59949e2a55945176065e73b063d 100755 --- a/benchmarks/dvmp/dvmp.sh +++ b/benchmarks/dvmp/dvmp.sh @@ -88,7 +88,6 @@ for rec in options/*.py ; do unset tag [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ - xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ gaudirun.py ${rec} done if [ "$?" -ne "0" ] ; then diff --git a/benchmarks/synchrotron/synchrotron.sh b/benchmarks/synchrotron/synchrotron.sh index 43ce7782b49e4ae9dfe38dc2cf5faa35bd63415e..fe271ae2b4d074e15a1e78e6d0eb194ff0c95c0f 100644 --- a/benchmarks/synchrotron/synchrotron.sh +++ b/benchmarks/synchrotron/synchrotron.sh @@ -120,7 +120,6 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then unset tag [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ - xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ gaudirun.py ${rec} done if [[ "$?" -ne "0" ]] ; then diff --git a/benchmarks/tcs/tcs.sh b/benchmarks/tcs/tcs.sh index 760cae53660b5156d94e14a3f814f5b76a8db722..d2c6e879ed15f915655e38225c6a8e36ee456d0f 100644 --- a/benchmarks/tcs/tcs.sh +++ b/benchmarks/tcs/tcs.sh @@ -140,7 +140,6 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then unset tag [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ - xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ gaudirun.py ${rec} || [ $? -eq 4 ] done diff --git a/benchmarks/u_omega/u_omega.sh b/benchmarks/u_omega/u_omega.sh index 17634195f7ae2f6e3fc3dc9a63cf55d536dc2ae5..28e0943ff73af9df611c5b153cf6e5214d892929 100644 --- a/benchmarks/u_omega/u_omega.sh +++ b/benchmarks/u_omega/u_omega.sh @@ -118,7 +118,6 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then unset tag [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ - xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \ gaudirun.py ${rec} done if [[ "$?" -ne "0" ]] ; then