diff --git a/benchmarks/barrel_ecal/config.yml b/benchmarks/barrel_ecal/config.yml index cf010c09bf1083e1227a79006cf4855d3042d300..9ab153840d29151bf98e19e48d3b18ea8d45d2bb 100644 --- a/benchmarks/barrel_ecal/config.yml +++ b/benchmarks/barrel_ecal/config.yml @@ -1,33 +1,30 @@ -# sim:emcal_barrel_pions: -# extends: .det_benchmark -# stage: simulate -# script: -# - bash benchmarks/barrel_ecal/run_emcal_barrel_pions.sh +sim:emcal_barrel_pions: + extends: .det_benchmark + stage: simulate + script: + - bash benchmarks/barrel_ecal/run_emcal_barrel_pions.sh sim:emcal_barrel_electrons: extends: .det_benchmark stage: simulate script: - # energy_scan should run first to avoid overwriting the non-scan sim file - bash benchmarks/barrel_ecal/run_emcal_barrel_energy_scan.sh electron - #- bash benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh - bash benchmarks/barrel_ecal/run_emcal_barrel_particles.sh electron sim:emcal_barrel_photons: extends: .det_benchmark stage: simulate script: - # energy_scan should run first to avoid overwriting the non-scan sim file - bash benchmarks/barrel_ecal/run_emcal_barrel_energy_scan.sh photon - bash benchmarks/barrel_ecal/run_emcal_barrel_particles.sh photon -# bench:emcal_barrel_pions: -# extends: .det_benchmark -# stage: benchmarks -# needs: -# - ["sim:emcal_barrel_pions"] -# script: -# - root -b -q benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx+ +bench:emcal_barrel_pions: + extends: .det_benchmark + stage: benchmarks + needs: + - ["sim:emcal_barrel_pions"] + script: + - root -b -q benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx+ bench:emcal_barrel_electrons: extends: .det_benchmark diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_energy_scan.sh b/benchmarks/barrel_ecal/run_emcal_barrel_energy_scan.sh index 43103de035312efb56e4ee742e532693c449199c..4282ce3653c664f398cc6a96df8ad096f11cc770 100644 --- a/benchmarks/barrel_ecal/run_emcal_barrel_energy_scan.sh +++ b/benchmarks/barrel_ecal/run_emcal_barrel_energy_scan.sh @@ -9,7 +9,6 @@ for E in 0.25 0.5 1 2 3 4 7 15 20 do export E_START="$E" export E_END="$E" - export JUGGLER_N_EVENTS="750" bash benchmarks/barrel_ecal/run_emcal_barrel_particles.sh "${PARTICLE}" && echo "$E" >> "$E_file" || exit 1 path_rootfiles="sim_output/energy_scan/${E}/" path_plots="results/energy_scan/${E}/"