diff --git a/benchmarks/imaging_ecal/config.yml b/benchmarks/imaging_ecal/config.yml index 340b6c963f1466f2d443ad0e7dca367c0b3179d2..51929403204499b38a597544f9acf590aa6cd530 100644 --- a/benchmarks/imaging_ecal/config.yml +++ b/benchmarks/imaging_ecal/config.yml @@ -37,6 +37,13 @@ imaging_ecal_energy_scan: parallel: matrix: - ENERGY: ["1", "2", "5"] - PARTICLE: ["electron", "photon"] + PARTICLE: [electron, photon] + +imaging_ecal:results: + extends: .rec_benchmark + stage: collect + needs: [imaging_ecal_energy_scan, imaging_ecal_pion0, imaging_ecal_pions, imaging_ecal_photons, imaging_ecal_electrons] + script: + - ls -lrth diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh index 52b2bc403f946ff72f749b8945dffd0b49309acf..c3f35b5b3d389c1a805d0d5320d678ba46dba021 100644 --- a/benchmarks/imaging_ecal/run_emcal_barrel.sh +++ b/benchmarks/imaging_ecal/run_emcal_barrel.sh @@ -134,14 +134,14 @@ for iev in "${ADDR[@]}"; do fi python ${CB_EMCAL_SCRIPT_DIR}/draw_cluster_layers.py \ - ${CB_EMCAL_REC_FILE} -e ${iev} --topo-size=1.0 --compact=${CB_EMCAL_COMPACT_PATH} -o results/${particle} + ${CB_EMCAL_REC_FILE} -e ${iev} --topo-size=1.0 --compact=${CB_EMCAL_COMPACT_PATH} -o results/${nametag} if [[ "$?" -ne "0" ]] ; then echo "ERROR running analysis script: draw_cluster_layers" exit 1 fi python ${CB_EMCAL_SCRIPT_DIR}/draw_cluster.py \ - ${CB_EMCAL_REC_FILE} -e ${iev} --topo-size=2.0 --compact=${CB_EMCAL_COMPACT_PATH} -o results/${particle} + ${CB_EMCAL_REC_FILE} -e ${iev} --topo-size=2.0 --compact=${CB_EMCAL_COMPACT_PATH} -o results/${nametag} if [[ "$?" -ne "0" ]] ; then echo "ERROR running analysis script: draw_cluster" exit 1 @@ -149,8 +149,8 @@ for iev in "${ADDR[@]}"; do done python ${CB_EMCAL_SCRIPT_DIR}/energy_profile.py \ - ${CB_EMCAL_REC_FILE} --type=EM --energy=${CB_EMCAL_ENERGY} -o results/${particle} \ - --save=results/profile.csv --color=royalblue + ${CB_EMCAL_REC_FILE} --type=EM --energy=${CB_EMCAL_ENERGY} -o results/${nametag} \ + --save=results/${nametag}/profile.csv --color=royalblue if [[ "$?" -ne "0" ]] ; then echo "ERROR running analysis script: energy_profile" exit 1