From 2593969507e5ccd8f409b670540c3d6f6836f76e Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 27 Mar 2022 22:26:21 +0000
Subject: [PATCH] Typo in reconstruction.py; actually fail jobs when gaudirun
fails
---
benchmarks/dis/dis.sh | 8 ++++----
benchmarks/dvcs/dvcs.sh | 8 ++++----
benchmarks/dvmp/dvmp.sh | 8 ++++----
benchmarks/synchrotron/synchrotron.sh | 8 ++++----
benchmarks/u_omega/u_omega.sh | 8 ++++----
options/reconstruction.py | 10 +++++-----
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/benchmarks/dis/dis.sh b/benchmarks/dis/dis.sh
index a31c8afa..f34e543c 100755
--- a/benchmarks/dis/dis.sh
+++ b/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
diff --git a/benchmarks/dvcs/dvcs.sh b/benchmarks/dvcs/dvcs.sh
index 2e762a36..4b26aef0 100644
--- a/benchmarks/dvcs/dvcs.sh
+++ b/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
diff --git a/benchmarks/dvmp/dvmp.sh b/benchmarks/dvmp/dvmp.sh
index 5efb7ed3..304e792c 100755
--- a/benchmarks/dvmp/dvmp.sh
+++ b/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
diff --git a/benchmarks/synchrotron/synchrotron.sh b/benchmarks/synchrotron/synchrotron.sh
index c80b72a0..9de437b8 100644
--- a/benchmarks/synchrotron/synchrotron.sh
+++ b/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
diff --git a/benchmarks/u_omega/u_omega.sh b/benchmarks/u_omega/u_omega.sh
index cea2af37..8382606f 100644
--- a/benchmarks/u_omega/u_omega.sh
+++ b/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
diff --git a/options/reconstruction.py b/options/reconstruction.py
index d32c20de..81be1839 100644
--- a/options/reconstruction.py
+++ b/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)
--
GitLab