From 0cf20b502962d2b671f62ed7f782de26a642fc6b Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 25 Dec 2021 23:41:11 +0000
Subject: [PATCH] Remove xenv references
---
benchmarks/dis/analysis-only.sh | 6 ++----
benchmarks/dis/dis.sh | 1 -
benchmarks/dvcs/dvcs.sh | 1 -
benchmarks/dvmp/dvmp.sh | 1 -
benchmarks/synchrotron/synchrotron.sh | 1 -
benchmarks/tcs/tcs.sh | 1 -
benchmarks/u_omega/u_omega.sh | 1 -
7 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/benchmarks/dis/analysis-only.sh b/benchmarks/dis/analysis-only.sh
index 42b94679..b2ba7094 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 4d59b2a7..de9537f6 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 dbb667ad..ac7e7a22 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 e9d608e1..1c02ef88 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 43ce7782..fe271ae2 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 760cae53..d2c6e879 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 17634195..28e0943f 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
--
GitLab