Merge branch 'wdconinc-main-patch-42707' into 'main'

feat: remove juggler reconstruction

See merge request !22

.gitlab-ci.yml

@@ -17,7 +17,6 @@ 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.eicrecon.tree.edm4eic.root
 
 run_hepmc3_local_0001:
@@ -26,7 +25,6 @@ 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.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3:
@@ -34,7 +32,6 @@ 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.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3_0001:
@@ -42,7 +39,6 @@ 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.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3_gz:
@@ -50,7 +46,6 @@ 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.eicrecon.tree.edm4eic.root
 
 run_hepmc3_s3_gz_0001:
@@ -58,5 +53,4 @@ 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.eicrecon.tree.edm4eic.root

scripts/run.sh

@@ -177,13 +177,9 @@ fi
 {
 date
 
-# Test reconstruction before simulation
 export JUGGLER_N_EVENTS=2147483647
 export JUGGLER_SIM_FILE="${FULL_TEMP}/${TASKNAME}.edm4hep.root"
 export JUGGLER_REC_FILE="${RECO_TEMP}/${TASKNAME}.edm4eic.root"
-for rec in ${RECONSTRUCTION_PATH:-/opt/benchmarks/physics_benchmarks/options}/${RECONSTRUCTION:-reconstruction.py} ; do
-  python ${rec}
-done
 
 # Retrieve input file if S3_ACCESS_KEY and S3_SECRET_KEY in environment
 if [ ! -f ${INPUT_FILE} ] ; then
@@ -265,20 +261,6 @@ if [ "${COPYFULL:-false}" == "true" ] ; then
   ls -al ${FULL_DIR}/${TASKNAME}.edm4hep.root
 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
-
 # Run eicrecon reconstruction
 date
 /usr/bin/time -v \