From 0b6aecc540dc2f2d16d71811bce63c72fbfd6e2a Mon Sep 17 00:00:00 2001
From: Maria <zurek@anl.gov>
Date: Sun, 8 Aug 2021 21:51:08 -0500
Subject: [PATCH] merge all outputs together
---
benchmarks/imaging_ecal/config.yml | 9 ++++++++-
benchmarks/imaging_ecal/run_emcal_barrel.sh | 8 ++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/benchmarks/imaging_ecal/config.yml b/benchmarks/imaging_ecal/config.yml
index 340b6c96..51929403 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 52b2bc40..c3f35b5b 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
--
GitLab