From bf0a22d56167dfd74763fc4903e88418def88f5d Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Tue, 20 Apr 2021 21:16:33 -0500
Subject: [PATCH] 	modified:   .gitlab-ci.yml 	modified:  
 benchmarks/barrel_ecal/config.yml 	modified:  
 benchmarks/crystal_calorimeter/config.yml 	modified:  
 benchmarks/zdc/config.yml

---
 .gitlab-ci.yml                            |  5 ++---
 benchmarks/barrel_ecal/config.yml         | 20 ++++++++++++++------
 benchmarks/crystal_calorimeter/config.yml |  8 ++++++++
 benchmarks/zdc/config.yml                 |  9 ++++++++-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37aa8b76..ee3327a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ stages:
   - data_init
   - simulate
   - benchmarks
+  - collect
   - deploy
 
 env:
@@ -79,9 +80,7 @@ include:
 deploy_results:
   stage: deploy
   needs:
-    - ["bench:zdc_benchmark_info_histogram"]
-  tags:
-    - silicon
+    - ["collect_results:zdc","collect_results:barrel_ecal","collect_results:crystal_calorimeter"]
   script:
     - echo "deploy results!"
 
diff --git a/benchmarks/barrel_ecal/config.yml b/benchmarks/barrel_ecal/config.yml
index cedd1e03..81e69293 100644
--- a/benchmarks/barrel_ecal/config.yml
+++ b/benchmarks/barrel_ecal/config.yml
@@ -1,29 +1,37 @@
-cal_sim:emcal_barrel_pions:
+sim:emcal_barrel_pions:
   extends: .det_benchmark
   stage: simulate
   script:
     - bash benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
 
-cal_sim:emcal_barrel_electrons:
+sim:emcal_barrel_electrons:
   extends: .det_benchmark
   stage: simulate
   script:
     - bash benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
 
-cal_bench:emcal_barrel_pions:
+bench:emcal_barrel_pions:
   extends: .det_benchmark
   stage: benchmarks
   needs:
-    - ["cal_sim:emcal_barrel_pions"]
+    - ["sim:emcal_barrel_pions"]
   script:
     - root -b -q benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx+
 
-cal_bench:emcal_barrel_electrons:
+bench:emcal_barrel_electrons:
   extends: .det_benchmark
   stage: benchmarks
   needs:
-    - ["cal_sim:emcal_barrel_electrons"]
+    - ["sim:emcal_barrel_electrons"]
   script:
     - rootls -t sim_output/sim_emcal_barrel_uniform_electrons.root
     - root -b -q benchmarks/barrel_ecal/scripts/emcal_barrel_electrons_analysis.cxx+
 
+collect_results:barrel_ecal:
+  extends: .det_benchmark
+  stage: collect
+  needs: 
+    - ["bench:emcal_barrel_pions","sim:emcal_barrel_electrons"]
+  script:
+    - ls -lrht
+
diff --git a/benchmarks/crystal_calorimeter/config.yml b/benchmarks/crystal_calorimeter/config.yml
index d4d66996..3b9b2988 100644
--- a/benchmarks/crystal_calorimeter/config.yml
+++ b/benchmarks/crystal_calorimeter/config.yml
@@ -19,4 +19,12 @@ cal_bench:crystal_benchmark:
     - rootls -t sim_output/output_emcal_electrons.root
     - echo " Not yet complete"
       #- root -b -q benchmarks/cryxtal_calorimeter/simple_checking_crystal.cxx+
+      #
+collect_results:crystal_calorimeter:
+  extends: .det_benchmark
+  stage: collect
+  needs: 
+    - ["cal_bench:crystal_benchmark"]
+  script:
+    - ls -lrht
 
diff --git a/benchmarks/zdc/config.yml b/benchmarks/zdc/config.yml
index 54c1e32d..46bd6e79 100644
--- a/benchmarks/zdc/config.yml
+++ b/benchmarks/zdc/config.yml
@@ -13,7 +13,7 @@ zdc_neutrons:
     - echo " Not yet complete"
       #- root -b -q benchmarks/zdc/zdc_neutrons_reader.cxx
 
-zdc_benchmark:
+bench:zdc_benchmark:
   extends: .det_benchmark
   stage: benchmarks
   needs: 
@@ -30,3 +30,10 @@ bench:zdc_benchmark_info_histogram:
   script:
     - root -b -q benchmarks/zdc/simple_info_plot_histograms.cxx+
 
+collect_results:zdc:
+  extends: .det_benchmark
+  stage: collect
+  needs: 
+    - ["bench:zdc_benchmark","bench:zdc_benchmark_info_histogram"]
+  script:
+    - ls -lrht
-- 
GitLab