Typo in reconstruction.py; actually fail jobs when gaudirun fails

benchmarks/dis/dis.sh

@@ -92,11 +92,11 @@ for rec in options/*.py ; do
   [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
   JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
     gaudirun.py ${rec}
+  if [ "$?" -ne "0" ] ; then
+    echo "ERROR running juggler"
+    exit 1
+  fi
 done
-if [ "$?" -ne "0" ] ; then
-  echo "ERROR running juggler"
-  exit 1
-fi
 
 ## =============================================================================
 ## Step 4: Analysis

benchmarks/dvcs/dvcs.sh

@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
     [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
     JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
       gaudirun.py ${rec}
+    if [[ "$?" -ne "0" ]] ; then
+      echo "ERROR running juggler"
+      exit 1
+    fi
   done
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
-    exit 1
-  fi
 
   root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
   if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then 

benchmarks/dvmp/dvmp.sh

@@ -90,11 +90,11 @@ for rec in options/*.py ; do
   [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
   JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
     gaudirun.py ${rec}
+  if [ "$?" -ne "0" ] ; then
+    echo "ERROR running juggler, both attempts failed"
+    exit 1
+  fi
 done
-if [ "$?" -ne "0" ] ; then
-  echo "ERROR running juggler, both attempts failed"
-  exit 1
-fi
 
 ## =============================================================================
 ## Step 4: Analysis

benchmarks/synchrotron/synchrotron.sh

@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
     [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
     JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
       gaudirun.py ${rec}
+    if [[ "$?" -ne "0" ]] ; then
+      echo "ERROR running juggler"
+      exit 1
+    fi
   done
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
-    exit 1
-  fi
 
   root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
   if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then 

benchmarks/u_omega/u_omega.sh

@@ -120,11 +120,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
     [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
     JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
       gaudirun.py ${rec}
+    if [[ "$?" -ne "0" ]] ; then
+      echo "ERROR running juggler"
+      exit 1
+    fi
   done
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
-    exit 1
-  fi
 
   root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
   if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then 

options/reconstruction.py

@@ -886,35 +886,35 @@ if 'acadia' in detector_version:
 incl_kin_electron = InclusiveKinematicsElectron("incl_kin_electron",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsElectron"
 )
 algorithms.append(incl_kin_electron)
 incl_kin_jb = InclusiveKinematicsJB("incl_kin_jb",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsJB"
 )
 algorithms.append(incl_kin_jb)
 incl_kin_da = InclusiveKinematicsDA("incl_kin_da",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsDA"
 )
 algorithms.append(incl_kin_da)
 incl_kin_sigma = InclusiveKinematicsSigma("incl_kin_sigma",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsSigma"
 )
 algorithms.append(incl_kin_sigma)
 incl_kin_esigma = InclusiveKinematicseSigma("incl_kin_esigma",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicseSigma"
 )
 algorithms.append(incl_kin_esigma)