diff --git a/benchmarks/clustering/full_cal_clusters.sh b/benchmarks/clustering/full_cal_clusters.sh index ee6d64c6e65404cf16c2388ba525206b2e3c72cd..301373594a0ecb611433d156f0a0b89c2dd6bebf 100644 --- a/benchmarks/clustering/full_cal_clusters.sh +++ b/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 diff --git a/benchmarks/ecal/run_emcal_benchmarks.py b/benchmarks/ecal/run_emcal_benchmarks.py index c70ca0bec892b5aeb5322ebc3df72d8843f7ae3c..f5ef2801d212aac680257b731fa1d8c653b261f1 100755 --- a/benchmarks/ecal/run_emcal_benchmarks.py +++ b/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)) diff --git a/benchmarks/far_forward/far_forward_protons.sh b/benchmarks/far_forward/far_forward_protons.sh index 44da60d2d30a1d7269456f394b38eacdb57ee28e..f91eec96e73deccb298293fd9dd956bd88e3218b 100644 --- a/benchmarks/far_forward/far_forward_protons.sh +++ b/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 diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh index 843e0febdefdd36865aeb1d3951bc36844317ba8..d54844fbd2109ca6631699e838d408986de057bc 100644 --- a/benchmarks/imaging_ecal/run_emcal_barrel.sh +++ b/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" diff --git a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh b/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh index c4adc4013a3296bada2d724cb2c1f74249e222ef..a43aaede64d338bc9a506c8a9b72c4ff7c4bd48c 100755 --- a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh +++ b/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" diff --git a/benchmarks/imaging_ecal/run_imcal_pion0.sh b/benchmarks/imaging_ecal/run_imcal_pion0.sh index cac64c8cf232d5663691ab157c3ac357c7a7b5a5..64cf9d07222d5ed138eb43edf8e864737e81365f 100644 --- a/benchmarks/imaging_ecal/run_imcal_pion0.sh +++ b/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 diff --git a/benchmarks/imaging_shower_ML/sim_rec_tag.py b/benchmarks/imaging_shower_ML/sim_rec_tag.py index 593606290d1834d4c58b3ef0033f1d6abc7871ea..0cd6ce6bb08e330b7b004885c64d1beea0c641d1 100755 --- a/benchmarks/imaging_shower_ML/sim_rec_tag.py +++ b/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 diff --git a/benchmarks/rich/forward_hadrons.sh b/benchmarks/rich/forward_hadrons.sh index 03f83143ab7b0c6aa2d807b6602c4e5f3a122482..d71bcece3dd0e97a10149aaf81e472961de06b57 100644 --- a/benchmarks/rich/forward_hadrons.sh +++ b/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 diff --git a/benchmarks/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh index aca9542875c38f84e1c3c028246919d6fd113f2c..b1a2ffcfea9d08944ad9f82c197fec2e16009a20 100644 --- a/benchmarks/track_finding/multiple_tracks.sh +++ b/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 diff --git a/benchmarks/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh index 0761afed212d5c6a06156f13436ec116d11f7541..85a05d9740b48dec0c773e1b34c4c8de9cefecb0 100644 --- a/benchmarks/track_fitting/single_tracks.sh +++ b/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 diff --git a/benchmarks/tracking/central_pions.sh b/benchmarks/tracking/central_pions.sh index a4b724cf2d44824fd735e877e5c54fa6a18661c1..e006db0f7ae04d292658d0bddee699a1f1336619 100644 --- a/benchmarks/tracking/central_pions.sh +++ b/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