Skip to content
Snippets Groups Projects
Commit adcc239b authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: allow gaudirun return code 4 (ScheduledStop)

parent 30a69640
No related branches found
No related tags found
1 merge request!301fix: allow gaudirun return code 4 (ScheduledStop)
This commit is part of merge request !301. Comments created here will be created in the context of that merge request.
Showing
with 37 additions and 25 deletions
...@@ -122,8 +122,9 @@ mkdir -p results ...@@ -122,8 +122,9 @@ mkdir -p results
# Run Juggler # Run Juggler
FULL_CAL_OPTION_DIR=benchmarks/clustering/options FULL_CAL_OPTION_DIR=benchmarks/clustering/options
gaudirun.py ${FULL_CAL_OPTION_DIR}/full_cal_reco.py gaudirun.py ${FULL_CAL_OPTION_DIR}/full_cal_reco.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running digitization (juggler)" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
......
...@@ -98,8 +98,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ; ...@@ -98,8 +98,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
gaudirun.py benchmarks/far_forward/options/far_forward_reconstruction.py gaudirun.py benchmarks/far_forward/options/far_forward_reconstruction.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
fi fi
......
...@@ -117,8 +117,9 @@ rootls -t ${JUGGLER_SIM_FILE} ...@@ -117,8 +117,9 @@ rootls -t ${JUGGLER_SIM_FILE}
if [[ -z "${ANALYSIS_ONLY}" ]] ; if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
gaudirun.py benchmarks/far_forward/options/zdc_reconstruction.py gaudirun.py benchmarks/far_forward/options/zdc_reconstruction.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
fi fi
......
...@@ -108,8 +108,9 @@ CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options ...@@ -108,8 +108,9 @@ CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
# Run Juggler # Run Juggler
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 # gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
......
...@@ -109,8 +109,9 @@ CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options ...@@ -109,8 +109,9 @@ CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
# Run Juggler # Run Juggler
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 # gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_topocluster.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
......
...@@ -103,8 +103,9 @@ mkdir -p results ...@@ -103,8 +103,9 @@ mkdir -p results
CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
# Run Juggler # Run Juggler
gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_2dcluster.py gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_2dcluster.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
......
...@@ -73,8 +73,9 @@ fi ...@@ -73,8 +73,9 @@ fi
# @TODO changeable simulation file name and detector xml file name # @TODO changeable simulation file name and detector xml file name
gaudirun.py benchmarks/rich/options/rich_reco.py gaudirun.py benchmarks/rich/options/rich_reco.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
......
...@@ -82,8 +82,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ; ...@@ -82,8 +82,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
gaudirun.py benchmarks/track_finding/options/track_reconstruction.py gaudirun.py benchmarks/track_finding/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
fi fi
......
...@@ -85,8 +85,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ; ...@@ -85,8 +85,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
fi fi
......
...@@ -99,8 +99,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ; ...@@ -99,8 +99,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
gaudirun.py benchmarks/tracking/options/track_reconstruction.py gaudirun.py benchmarks/tracking/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
fi fi
......
...@@ -98,8 +98,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ; ...@@ -98,8 +98,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
gaudirun.py benchmarks/tracking/options/track_reconstruction.py gaudirun.py benchmarks/tracking/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
fi fi
......
...@@ -99,8 +99,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ; ...@@ -99,8 +99,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
then then
# Need to figure out how to pass file name to juggler from the commandline # Need to figure out how to pass file name to juggler from the commandline
gaudirun.py benchmarks/tracking/options/track_reconstruction.py gaudirun.py benchmarks/tracking/options/track_reconstruction.py
if [[ "$?" -ne "0" ]] ; then status=$?
echo "ERROR running juggler" if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
echo "ERROR running juggler, got $status"
exit 1 exit 1
fi fi
fi fi
......
...@@ -83,7 +83,7 @@ if 'rec' in procs: ...@@ -83,7 +83,7 @@ if 'rec' in procs:
rec_cmd = ['gaudirun.py', os.path.join(sdir, 'options', option_script)] rec_cmd = ['gaudirun.py', os.path.join(sdir, 'options', option_script)]
return_code = subprocess.run(rec_cmd).returncode return_code = subprocess.run(rec_cmd).returncode
if return_code is not None and return_code != 0: if return_code is not None and return_code < 0:
print('ERROR running juggler ({})!'.format(rec_cmd)) print('ERROR running juggler ({})!'.format(rec_cmd))
exit(1) exit(1)
process = subprocess.run(['rootls', '-t', rec_file], check=True) process = subprocess.run(['rootls', '-t', rec_file], check=True)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment