diff --git a/benchmarks/ecal/run_emcal_benchmarks.py b/benchmarks/ecal/run_emcal_benchmarks.py index 24a277f5d701caf6f5cf93ec239387a27b5eb533..96bc27d1fb94e45db0475a05a214f7e84bf406a8 100755 --- a/benchmarks/ecal/run_emcal_benchmarks.py +++ b/benchmarks/ecal/run_emcal_benchmarks.py @@ -99,12 +99,12 @@ if 'rec' in procs: os.environ['JUGGLER_COMPACT_PATH'] = args.compact os.environ['JUGGLER_N_EVENTS'] = '{}'.format(args.nev) - for opt in opt_scripts: - 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)) - exit(1) + os.environ['JANA_HOME'] = '/usr/local/lib/EICrecon' + rec_cmd = ['eicrecon', f'-Ppodio:output_file={rec_file}'] + return_code = subprocess.run(rec_cmd).returncode + if return_code is not None and return_code < 0: + print('ERROR running eicrecon ({})!'.format(opt)) + exit(1) process = subprocess.run(['rootls', '-t', rec_file]) diff --git a/benchmarks/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh index fc1c19c1e3cacd5dbb677be5a1d808a38efdf759..387d6086713acdd6f8fd697bfb3780d36aafdf99 100644 --- a/benchmarks/track_finding/multiple_tracks.sh +++ b/benchmarks/track_finding/multiple_tracks.sh @@ -80,10 +80,9 @@ rootls -t ${JUGGLER_SIM_FILE} if [[ -z "${ANALYSIS_ONLY}" ]] ; then - # Need to figure out how to pass file name to juggler from the commandline - gaudirun.py benchmarks/track_finding/options/track_reconstruction.py - if [[ "$?" -ne "0" ]] ; then - echo "ERROR running juggler" + JANA_HOME=/usr/local/lib/EICrecon eicrecon -Ppodio:output_file=${JUGGLER_REC_FILE} ${JUGGLER_SIM_FILE} + if [ "$?" -ne "0" ] ; then + echo "ERROR running eicrecon" exit 1 fi fi diff --git a/benchmarks/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh index 89b8f2ccb1ec60abd4a51ea475435218f9eb014a..a4aa83a400cb497e26459364aae20ed4a0f6b534 100644 --- a/benchmarks/track_fitting/single_tracks.sh +++ b/benchmarks/track_fitting/single_tracks.sh @@ -83,10 +83,9 @@ rootls -t ${JUGGLER_SIM_FILE} if [[ -z "${ANALYSIS_ONLY}" ]] ; then - # Need to figure out how to pass file name to juggler from the commandline - gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py - if [[ "$?" -ne "0" ]] ; then - echo "ERROR running juggler" + JANA_HOME=/usr/local/lib/EICrecon eicrecon -Ppodio:output_file=${JUGGLER_REC_FILE} ${JUGGLER_SIM_FILE} + if [ "$?" -ne "0" ] ; then + echo "ERROR running eicrecon" exit 1 fi fi