From 3b037e8df498b65773b92c13ab68aa35b6ecdf5d Mon Sep 17 00:00:00 2001
From: Maria <zurek@anl.gov>
Date: Mon, 9 Aug 2021 14:13:44 -0500
Subject: [PATCH] Add energy scan at process stage
---
.gitlab-ci.yml | 2 +-
benchmarks/imaging_ecal/config.yml | 28 ++++++++++-----------
benchmarks/imaging_ecal/run_emcal_barrel.sh | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b77aaf45..0e632e59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ common:detector:
- ln -s "${LOCAL_DATA_PATH}/datasets/data" data
- ls -lrtha
- curl -sL https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks/-/jobs/artifacts/master/raw/results/emcal_barrel_calibration.json?job=collect_results:barrel_ecal --output config/emcal_barrel_calibration.json
- # - ls -lhtR sim_output/
+ - ls -lhtR sim_output/
interruptible: true
include:
diff --git a/benchmarks/imaging_ecal/config.yml b/benchmarks/imaging_ecal/config.yml
index 1b319ea0..b277b997 100644
--- a/benchmarks/imaging_ecal/config.yml
+++ b/benchmarks/imaging_ecal/config.yml
@@ -30,8 +30,8 @@ imaging_ecal_energy_scan:
extends: .rec_benchmark
stage: run
timeout: 24 hours
- rules:
- - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"'
+ # rules:
+ # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"'
script:
- bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 100 -p "${PARTICLE}" -e "${ENERGY}"
parallel:
@@ -39,18 +39,18 @@ imaging_ecal_energy_scan:
- ENERGY: ["1", "2", "5"]
PARTICLE: [electron, photon]
-# imaging_ecal_energy_scan_analysis:
-# extends: .rec_benchmark
-# stage: process
-# timeout: 24 hours
-# # rules:
-# # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"'
-# needs:
-# - ["imaging_ecal_energy_scan"]
-# script:
-# - ls -lhtR sim_output/
-# - rootls -t sim_output/rec_emcal_barrel_photon_5.root
-# # - root -b -q 'benchmarks/imaging_ecal/scripts/energy_scan_analysis.cxx+'
+imaging_ecal_energy_scan_analysis:
+ extends: .rec_benchmark
+ stage: process
+ timeout: 24 hours
+ # rules:
+ # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"'
+ needs:
+ - ["imaging_ecal_energy_scan"]
+ script:
+ - ls -lhtR sim_output/
+ - rootls -t sim_output/rec_emcal_barrel_photon_5.root
+ - root -b -q 'benchmarks/imaging_ecal/scripts/energy_scan_analysis.cxx+'
imaging_ecal:results:
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh
index 954ab121..d12837ed 100644
--- a/benchmarks/imaging_ecal/run_emcal_barrel.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel.sh
@@ -163,4 +163,4 @@ if [[ "${CB_EMCAL_NUMEV}" -lt "500" ]] ; then
cp ${CB_EMCAL_REC_FILE} results/.
fi
fi
-# cp ${CB_EMCAL_REC_FILE} sim_output/.
+cp ${CB_EMCAL_REC_FILE} sim_output/.
--
GitLab