Remove xenv references

benchmarks/clustering/full_cal_clusters.sh

@@ -120,8 +120,7 @@ mkdir -p results
 
 # Run Juggler
 FULL_CAL_OPTION_DIR=benchmarks/clustering/options
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-    gaudirun.py ${FULL_CAL_OPTION_DIR}/full_cal_reco.py
+gaudirun.py ${FULL_CAL_OPTION_DIR}/full_cal_reco.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running digitization (juggler)"
   exit 1

benchmarks/ecal/run_emcal_benchmarks.py

@@ -98,10 +98,8 @@ if 'rec' in procs:
     os.environ['JUGGLER_COMPACT_PATH'] = args.compact
     os.environ['JUGGLER_N_EVENTS'] = '{}'.format(args.nev)
 
-    juggler_xenv = os.path.join(os.environ.get('JUGGLER_INSTALL_PREFIX', '../local'), 'Juggler.xenv')
-
     for opt in opt_scripts:
-        rec_cmd = ['xenv', '-x', juggler_xenv, 'gaudirun.py', os.path.join(sdir, 'options', opt)]
+        rec_cmd = ['gaudirun.py', os.path.join(sdir, 'options', opt)]
         return_code = subprocess.run(rec_cmd).returncode
         if return_code is not None and return_code < 0:
             print('ERROR running juggler ({})!'.format(opt))

benchmarks/far_forward/far_forward_protons.sh

@@ -96,7 +96,7 @@ rootls -t ${JUGGLER_SIM_FILE}
 if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
-  xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/far_forward/options/far_forward_reconstruction.py
+  gaudirun.py benchmarks/far_forward/options/far_forward_reconstruction.py
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running juggler"
     exit 1

benchmarks/imaging_ecal/run_emcal_barrel.sh

@@ -105,8 +105,7 @@ mkdir -p results
 
 CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
 # Run Juggler
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-    gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py
+gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py
 # gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running juggler"

benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh

@@ -106,8 +106,7 @@ mkdir -p results
 
 CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
 # Run Juggler
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-    gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py
+gaudirun.py ${CB_EMCAL_OPTION_DIR}/hybrid_cluster.py
 # gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running juggler"

benchmarks/imaging_ecal/run_imcal_pion0.sh

@@ -101,8 +101,7 @@ mkdir -p results
 
 CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
 # Run Juggler
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-    gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_2dcluster.py
+gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_2dcluster.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running juggler"
   exit 1

benchmarks/imaging_shower_ML/sim_rec_tag.py

@@ -84,9 +84,7 @@ if 'rec' in procs:
         'IMCAL_ML_COMBINE': str(args.combine_method),
     })
 
-    juggler_xenv = os.path.join(os.environ.get('JUGGLER_INTALL_PREFIX', '../local'), 'Juggler.xenv')
     rec_cmd = [
-        'xenv', '-x', juggler_xenv,   # v35+ do not need xenv anymore
         'gaudirun.py', os.path.join(sdir, 'options', 'imaging_ml_data.py')
     ]
     return_code = subprocess.run(rec_cmd, env=run_env).returncode

benchmarks/rich/forward_hadrons.sh

@@ -71,8 +71,7 @@ if [[ "$?" -ne "0" ]] ; then
 fi
 
 # @TODO changeable simulation file name and detector xml file name
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-  gaudirun.py benchmarks/rich/options/rich_reco.py
+gaudirun.py benchmarks/rich/options/rich_reco.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running juggler"
   exit 1

benchmarks/track_finding/multiple_tracks.sh

@@ -80,7 +80,7 @@ rootls -t ${JUGGLER_SIM_FILE}
 if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
-  xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_finding/options/track_reconstruction.py
+  gaudirun.py benchmarks/track_finding/options/track_reconstruction.py
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running juggler"
     exit 1

benchmarks/track_fitting/single_tracks.sh

@@ -83,7 +83,7 @@ rootls -t ${JUGGLER_SIM_FILE}
 if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
-  xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py
+  gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running juggler"
     exit 1

benchmarks/tracking/central_pions.sh

@@ -96,7 +96,7 @@ rootls -t ${JUGGLER_SIM_FILE}
 if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
-  xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/tracking/options/track_reconstruction.py
+  gaudirun.py benchmarks/tracking/options/track_reconstruction.py
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running juggler"
     exit 1