fix: allow gaudirun return code 4 (ScheduledStop)

benchmarks/clustering/full_cal_clusters.sh

@@ -122,8 +122,9 @@ mkdir -p results
 # Run Juggler
 FULL_CAL_OPTION_DIR=benchmarks/clustering/options
 gaudirun.py ${FULL_CAL_OPTION_DIR}/full_cal_reco.py
-if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR running digitization (juggler)"
+status=$?
+if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+  echo "ERROR running juggler, got $status"
   exit 1
 fi
 

benchmarks/far_forward/far_forward_protons.sh

@@ -98,8 +98,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
   gaudirun.py benchmarks/far_forward/options/far_forward_reconstruction.py
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
+  status=$?
+  if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+    echo "ERROR running juggler, got $status"
     exit 1
   fi
 fi

benchmarks/far_forward/run_zdc.sh

@@ -117,8 +117,9 @@ rootls -t ${JUGGLER_SIM_FILE}
 if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   gaudirun.py benchmarks/far_forward/options/zdc_reconstruction.py
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
+  status=$?
+  if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+    echo "ERROR running juggler, got $status"
     exit 1
   fi
 fi

benchmarks/imaging_ecal/run_emcal_barrel.sh

@@ -108,8 +108,9 @@ CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
 # Run Juggler
 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"
+status=$?
+if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+  echo "ERROR running juggler, got $status"
   exit 1
 fi
 

benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh

@@ -109,8 +109,9 @@ CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
 # Run Juggler
 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"
+status=$?
+if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+  echo "ERROR running juggler, got $status"
   exit 1
 fi
 

benchmarks/imaging_ecal/run_imcal_pion0.sh

@@ -103,8 +103,9 @@ mkdir -p results
 CB_EMCAL_OPTION_DIR=benchmarks/imaging_ecal/options
 # Run Juggler
 gaudirun.py ${CB_EMCAL_OPTION_DIR}/imaging_2dcluster.py
-if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR running juggler"
+status=$?
+if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+  echo "ERROR running juggler, got $status"
   exit 1
 fi
 

benchmarks/rich/forward_hadrons.sh

@@ -73,8 +73,9 @@ fi
 
 # @TODO changeable simulation file name and detector xml file name
 gaudirun.py benchmarks/rich/options/rich_reco.py
-if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR running juggler"
+status=$?
+if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+  echo "ERROR running juggler, got $status"
   exit 1
 fi
 

benchmarks/track_finding/multiple_tracks.sh

@@ -82,8 +82,9 @@ 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"
+  status=$?
+  if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+    echo "ERROR running juggler, got $status"
     exit 1
   fi
 fi

benchmarks/track_fitting/single_tracks.sh

@@ -85,8 +85,9 @@ 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"
+  status=$?
+  if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+    echo "ERROR running juggler, got $status"
     exit 1
   fi
 fi

benchmarks/tracking/central_electrons.sh

@@ -99,8 +99,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
   gaudirun.py benchmarks/tracking/options/track_reconstruction.py
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
+  status=$?
+  if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+    echo "ERROR running juggler, got $status"
     exit 1
   fi
 fi

benchmarks/tracking/central_pions.sh

@@ -98,8 +98,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
   gaudirun.py benchmarks/tracking/options/track_reconstruction.py
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
+  status=$?
+  if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+    echo "ERROR running juggler, got $status"
     exit 1
   fi
 fi

benchmarks/tracking/multiple_tracks.sh

@@ -99,8 +99,9 @@ if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
   gaudirun.py benchmarks/tracking/options/track_reconstruction.py
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
+  status=$?
+  if [[ "$status" -ne "0" && "$status" -ne "4" ]] ; then
+    echo "ERROR running juggler, got $status"
     exit 1
   fi
 fi

benchmarks/tracking/run_tracking_benchmarks.py

@@ -83,7 +83,7 @@ if 'rec' in procs:
 
     rec_cmd = ['gaudirun.py', os.path.join(sdir, 'options', option_script)]
     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))
         exit(1)
     process = subprocess.run(['rootls', '-t', rec_file], check=True)