Merge branch 'reenable-juggler' into 'main'

fix: re-enable juggler

See merge request !20

.gitlab-ci.yml

@@ -17,7 +17,7 @@ run_hepmc3_local:
     - mkdir -p EVGEN/CI/ && cp -f test/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc EVGEN/CI/
     - COPYRECO=true RECONSTRUCTION=*.py scripts/run.sh EVGEN/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc 20
     - ls -al RECO/*/*/CI/
-    #- test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.juggler.tree.edm4eic.root
+    - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.juggler.tree.edm4eic.root
     - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.eicrecon.tree.edm4eic.root
 
 run_hepmc3_local_0001:
@@ -26,7 +26,7 @@ run_hepmc3_local_0001:
     - mkdir -p EVGEN/CI/ && cp -f test/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc EVGEN/CI/
     - COPYRECO=true RECONSTRUCTION=*.py scripts/run.sh EVGEN/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc 20 1
     - ls -al RECO/*/*/CI/
-    #- test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.juggler.tree.edm4eic.root
+    - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.juggler.tree.edm4eic.root
     - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3:
@@ -34,7 +34,7 @@ run_hepmc3_s3:
   script:
     - COPYRECO=true RECONSTRUCTION=*.py scripts/run.sh EVGEN/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc 20
     - ls -al RECO/*/*/CI/
-    #- test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.juggler.tree.edm4eic.root
+    - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.juggler.tree.edm4eic.root
     - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3_0001:
@@ -42,7 +42,7 @@ run_hepmc3_s3_0001:
   script:
     - COPYRECO=true RECONSTRUCTION=*.py scripts/run.sh EVGEN/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc 20 1
     - ls -al RECO/*/*/CI/
-    #- test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.juggler.tree.edm4eic.root
+    - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.juggler.tree.edm4eic.root
     - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3_gz:
@@ -50,7 +50,7 @@ run_hepmc3_s3_gz:
   script:
     - COPYRECO=true RECONSTRUCTION=*.py scripts/run.sh EVGEN/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc.gz 20
     - ls -al RECO/*/*/CI/
-    #- test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.juggler.tree.edm4eic.root
+    - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.juggler.tree.edm4eic.root
     - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3_gz_0001:
@@ -58,5 +58,5 @@ run_hepmc3_s3_gz_0001:
   script:
     - COPYRECO=true RECONSTRUCTION=*.py scripts/run.sh EVGEN/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.hepmc.gz 20 1
     - ls -al RECO/*/*/CI/
-    #- test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.juggler.tree.edm4eic.root
+    - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.juggler.tree.edm4eic.root
     - test -f RECO/*/*/CI/pythia8NCDIS_5x41_minQ2=1_beamEffects_xAngle=-0.025_hiDiv_1_20ev.0001.eicrecon.tree.edm4eic.root

scripts/run.sh

@@ -266,18 +266,18 @@ if [ "${COPYFULL:-false}" == "true" ] ; then
 fi
 
 # Run reconstruction
-# date
-# for rec in ${RECONSTRUCTION_PATH:-/opt/benchmarks/physics_benchmarks/options}/${RECONSTRUCTION:-reconstruction.py} ; do
-#   unset tag
-#   [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
-#   export JUGGLER_REC_FILE="${RECO_TEMP}/${TASKNAME}${tag:-}.juggler.tree.edm4eic.root"
-#   /usr/bin/time -v \
-#     gaudirun.py ${rec} \
-#     || [ $? -eq 4 ]
-#   # FIXME why $? = 4
-#   ls -al ${JUGGLER_REC_FILE}
-# done
-# ls -al ${RECO_TEMP}/${TASKNAME}*.juggler.tree.edm4eic.root
+date
+for rec in ${RECONSTRUCTION_PATH:-/opt/benchmarks/physics_benchmarks/options}/${RECONSTRUCTION:-reconstruction.py} ; do
+  unset tag
+  [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
+  export JUGGLER_REC_FILE="${RECO_TEMP}/${TASKNAME}${tag:-}.juggler.tree.edm4eic.root"
+  /usr/bin/time -v \
+    gaudirun.py ${rec} \
+    || [ $? -eq 4 ]
+  # FIXME why $? = 4
+  ls -al ${JUGGLER_REC_FILE}
+done
+ls -al ${RECO_TEMP}/${TASKNAME}*.juggler.tree.edm4eic.root
 
 # Run eicrecon reconstruction
 date