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

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

parent fc2b2e09
No related branches found
No related tags found
1 merge request!145Reenable inclusive kinematics
This commit is part of merge request !145. Comments created here will be created in the context of that merge request.
...@@ -92,11 +92,11 @@ for rec in options/*.py ; do ...@@ -92,11 +92,11 @@ for rec in options/*.py ; do
[[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
gaudirun.py ${rec} gaudirun.py ${rec}
if [ "$?" -ne "0" ] ; then
echo "ERROR running juggler"
exit 1
fi
done done
if [ "$?" -ne "0" ] ; then
echo "ERROR running juggler"
exit 1
fi
## ============================================================================= ## =============================================================================
## Step 4: Analysis ## Step 4: Analysis
......
...@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then ...@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
[[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
gaudirun.py ${rec} gaudirun.py ${rec}
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
fi
done done
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
fi
root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}") root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then
......
...@@ -90,11 +90,11 @@ for rec in options/*.py ; do ...@@ -90,11 +90,11 @@ for rec in options/*.py ; do
[[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
gaudirun.py ${rec} gaudirun.py ${rec}
if [ "$?" -ne "0" ] ; then
echo "ERROR running juggler, both attempts failed"
exit 1
fi
done done
if [ "$?" -ne "0" ] ; then
echo "ERROR running juggler, both attempts failed"
exit 1
fi
## ============================================================================= ## =============================================================================
## Step 4: Analysis ## Step 4: Analysis
......
...@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then ...@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
[[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
gaudirun.py ${rec} gaudirun.py ${rec}
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
fi
done done
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
fi
root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}") root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then
......
...@@ -120,11 +120,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then ...@@ -120,11 +120,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
[[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}" [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \ JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
gaudirun.py ${rec} gaudirun.py ${rec}
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
fi
done done
if [[ "$?" -ne "0" ]] ; then
echo "ERROR running juggler"
exit 1
fi
root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}") root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then
......
...@@ -886,35 +886,35 @@ if 'acadia' in detector_version: ...@@ -886,35 +886,35 @@ if 'acadia' in detector_version:
incl_kin_electron = InclusiveKinematicsElectron("incl_kin_electron", incl_kin_electron = InclusiveKinematicsElectron("incl_kin_electron",
inputMCParticles="MCParticles", inputMCParticles="MCParticles",
inputParticles="ReconstructedParticles", inputParticles="ReconstructedParticles",
inputAssociations = "ReconstructedParticlesAssoc" inputAssociations = "ReconstructedParticlesAssoc",
outputData="InclusiveKinematicsElectron" outputData="InclusiveKinematicsElectron"
) )
algorithms.append(incl_kin_electron) algorithms.append(incl_kin_electron)
incl_kin_jb = InclusiveKinematicsJB("incl_kin_jb", incl_kin_jb = InclusiveKinematicsJB("incl_kin_jb",
inputMCParticles="MCParticles", inputMCParticles="MCParticles",
inputParticles="ReconstructedParticles", inputParticles="ReconstructedParticles",
inputAssociations = "ReconstructedParticlesAssoc" inputAssociations = "ReconstructedParticlesAssoc",
outputData="InclusiveKinematicsJB" outputData="InclusiveKinematicsJB"
) )
algorithms.append(incl_kin_jb) algorithms.append(incl_kin_jb)
incl_kin_da = InclusiveKinematicsDA("incl_kin_da", incl_kin_da = InclusiveKinematicsDA("incl_kin_da",
inputMCParticles="MCParticles", inputMCParticles="MCParticles",
inputParticles="ReconstructedParticles", inputParticles="ReconstructedParticles",
inputAssociations = "ReconstructedParticlesAssoc" inputAssociations = "ReconstructedParticlesAssoc",
outputData="InclusiveKinematicsDA" outputData="InclusiveKinematicsDA"
) )
algorithms.append(incl_kin_da) algorithms.append(incl_kin_da)
incl_kin_sigma = InclusiveKinematicsSigma("incl_kin_sigma", incl_kin_sigma = InclusiveKinematicsSigma("incl_kin_sigma",
inputMCParticles="MCParticles", inputMCParticles="MCParticles",
inputParticles="ReconstructedParticles", inputParticles="ReconstructedParticles",
inputAssociations = "ReconstructedParticlesAssoc" inputAssociations = "ReconstructedParticlesAssoc",
outputData="InclusiveKinematicsSigma" outputData="InclusiveKinematicsSigma"
) )
algorithms.append(incl_kin_sigma) algorithms.append(incl_kin_sigma)
incl_kin_esigma = InclusiveKinematicseSigma("incl_kin_esigma", incl_kin_esigma = InclusiveKinematicseSigma("incl_kin_esigma",
inputMCParticles="MCParticles", inputMCParticles="MCParticles",
inputParticles="ReconstructedParticles", inputParticles="ReconstructedParticles",
inputAssociations = "ReconstructedParticlesAssoc" inputAssociations = "ReconstructedParticlesAssoc",
outputData="InclusiveKinematicseSigma" outputData="InclusiveKinematicseSigma"
) )
algorithms.append(incl_kin_esigma) algorithms.append(incl_kin_esigma)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment