Split calorimeter subsystems into their own benchmark directories.

.gitlab-ci.yml

@@ -23,6 +23,7 @@ stages:
   - data_init
   - simulate
   - benchmarks
+  - collect
   - deploy
 
 env:
@@ -76,98 +77,16 @@ get_data:
 
 
 include: 
-  - local: 'benchmarks/trackers/config.yml'
-  - local: 'benchmarks/calorimeters/config.yml'
+  - local: 'benchmarks/barrel_ecal/config.yml'
+  - local: 'benchmarks/roman_pots/config.yml'
+  - local: 'benchmarks/zdc/config.yml'
+  - local: 'benchmarks/crystal_calorimeter/config.yml'
   - local: 'benchmarks/pid/config.yml'
 
-    #roman_pot_simu:
-    #  stage: simulate
-    #  needs: 
-    #    - ["get_data","detector"]
-    #  script:
-    #    - bash benchmarks/trackers/roman_pot_simu.sh
-    #
-    #roman_pot_nhits:
-    #  stage: benchmarks
-    #  needs:
-    #    - ["roman_pot_simu","detector"]
-    #  script:
-    #    - root -b -q benchmarks/trackers/simple_tracking.cxx+
-    #  allow_failure: true
-    #
-    #roman_pot_eta:
-    #  stage: benchmarks
-    #  needs:
-    #    - ["roman_pot_simu","detector"]
-    #  script:
-    #    - root -b -q benchmarks/trackers/roman_pot_hit_eta.cxx+
-    #  allow_failure: true
-    #
-    #zdc_simulation:
-    #  stage: simulate
-    #  needs: 
-    #    - ["get_data","detector"]
-    #  script:
-    #    - bash benchmarks/calorimeters/run_simulation_zdc.sh
-    #
-    #cal_test_3_zdc_neutrons_reader:
-    #  stage: benchmarks
-    #  needs: 
-    #    - ["zdc_simulation","detector"]
-    #  script:
-    #    - root -b -q benchmarks/calorimeters/zdc_neutrons_reader.cxx
-    #  allow_failure: true
-    #
-    #
-    #zdc_benchmark:
-    #  stage: benchmarks
-    #  needs: 
-    #    - ["zdc_simulation","detector"]
-    #  script:
-    #    - ls -lrth sim_output
-    #    - root -b -q benchmarks/calorimeters/simple_checking.cxx+
-    #  allow_failure: true
-    #
-    #zdc_benchmark_info_histogram:
-    #  stage: benchmarks
-    #  needs: 
-    #    - ["zdc_simulation","detector"]
-    #  script:
-    #    - root -b -q benchmarks/calorimeters/simple_info_plot_histograms.cxx+
-    #  allow_failure: true
-    #
-    #crystal_emcal_simulation:
-    #  stage: simulate
-    #  needs: 
-    #    - ["get_data"]
-    #  script:
-    #     bash benchmarks/calorimeters/run_simulation_crystal.sh
-    #
-    #crystal_benchmark:
-    #  stage: benchmarks
-    #  needs:
-    #    - ["crystal_emcal_simulation","detector"]
-    #  script:
-    #    - ls -lrth sim_output
-    #    - root -b -q benchmarks/calorimeters/simple_checking_crystal.cxx+
-    #  allow_failure: true
-    #
-    #crystal_pion_simulation:
-    #  stage: simulate
-    #  needs:
-    #    - ["get_data","detector"]
-    #  tags:
-    #    - silicon
-    #  script:
-    #    - source options/env.sh
-    #    - npsim --runType batch --numberOfEvents 100 --compactFile ${DETECTOR_PATH}/topside.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.root
-
 deploy_results:
   stage: deploy
   needs:
-    - ["cal_bench:zdc_benchmark"]
-  tags:
-    - silicon
+    - ["collect_results:zdc","collect_results:barrel_ecal","collect_results:crystal_calorimeter"]
   script:
     - echo "deploy results!"
 

README.md

@@ -9,8 +9,6 @@ Detector benchmarks are meant to test for regressions in individual detector sub
 The analysis is meant to avoid a reconstruction step. 
 So this precludes using [juggler](https://eicweb.phy.anl.gov/EIC/juggler) for processing the events.
 
-
-
 ## Adding new benchmarks
 
 ### Pass/Fail tests

benchmarks/barrel_ecal/config.yml

+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:
+    - bash benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
+
+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
+  stage: benchmarks
+  needs:
+    - ["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
+

benchmarks/calorimeters/run_emcal_barrel_electrons.sh → benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh

@@ -27,13 +27,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events
-root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_electrons.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/barrel_ecal/scripts/emcal_barrel_electrons.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: generating input events"
   exit 1
 fi
 # Plot the input events
-root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_electrons_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/barrel_ecal/scripts/emcal_barrel_electrons_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: plotting input events"
   exit 1

benchmarks/calorimeters/run_emcal_barrel_pions.sh → benchmarks/barrel_ecal/run_emcal_barrel_pions.sh

@@ -30,13 +30,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events
-root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_pions.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/barrel_ecal/scripts/emcal_barrel_pions.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: generating input events"
   exit 1
 fi
 # Plot the input events
-root -b -q "benchmarks/calorimeters/scripts/emcal_barrel_pions_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+root -b -q "benchmarks/barrel_ecal/scripts/emcal_barrel_pions_reader.cxx(${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running script: plotting input events"
   exit 1

benchmarks/calorimeters/.rootrc

-#.rootrc file
-Rint.Logon: ./rootlogon.C

benchmarks/calorimeters/config.yml

-#####################
-# Simulations
-# - Generate datasets
-# - Run Geant4
-# - Run Juggler
-#####################
-
-cal_sim:emcal_barrel_pions:
-  extends: .det_benchmark
-  stage: simulate
-  script:
-    - bash benchmarks/calorimeters/run_emcal_barrel_pions.sh
-
-cal_sim:emcal_barrel_electrons:
-  extends: .det_benchmark
-  stage: simulate
-  script:
-    - bash benchmarks/calorimeters/run_emcal_barrel_electrons.sh
-
-cal_sim:crystal_emcal:
-  extends: .det_benchmark
-  stage: simulate
-  script:
-    - bash benchmarks/calorimeters/run_simulation_crystal.sh
-
-cal_sim:crystal_pion:
-  extends: .det_benchmark
-  stage: simulate
-  script:
-    - npsim --runType batch --numberOfEvents 100 --compactFile ${DETECTOR_PATH}/topside.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.root
-
-cal_sim:zdc:
-  extends: .det_benchmark
-  stage: simulate
-  script:
-    - bash benchmarks/calorimeters/run_simulation_zdc.sh
-
-###################
-# Benchmarks
-###################
-
-cal_bench:emcal_barrel_pions:
-  extends: .det_benchmark
-  stage: benchmarks
-  needs:
-    - ["cal_sim:emcal_barrel_pions"]
-  script:
-    - root -b -q benchmarks/calorimeters/scripts/emcal_barrel_pions_analysis.cxx+
-
-cal_bench:emcal_barrel_electrons:
-  extends: .det_benchmark
-  stage: benchmarks
-  needs:
-    - ["cal_sim:emcal_barrel_electrons"]
-  script:
-    - rootls -t sim_output/sim_emcal_barrel_uniform_electrons.root
-    - root -b -q benchmarks/calorimeters/scripts/emcal_barrel_electrons_analysis.cxx+
-
-cal_bench:crystal_benchmark:
-  extends: .det_benchmark
-  stage: benchmarks
-  needs:
-    - ["cal_sim:crystal_emcal"]
-  script:
-    - rootls -t sim_output/output_emcal_electrons.root
-    - echo " Not yet complete"
-      #- root -b -q benchmarks/calorimeters/simple_checking_crystal.cxx+
-
-    #cal_test_3_zdc_neutrons_reader:
-    #stage: benchmarks
-    #tags:
-    #- sodium
-    #script:
-    #- root -b -q benchmarks/calorimeters/zdc_neutrons_reader.cxx
-      #artifact:
-      #  paths: 
-      #    - results/
-      #allow_failure: true
-
-cal_bench:zdc_benchmark:
-  extends: .det_benchmark
-  stage: benchmarks
-  needs: 
-    - ["cal_sim:zdc"]
-  script:
-    - echo " Not yet complete"
-    #- root -b -q benchmarks/calorimeters/simple_checking.cxx+
-
-cal_bench:zdc_benchmark_info_histogram:
-  extends: .det_benchmark
-  stage: benchmarks
-  needs: 
-    - ["cal_sim:zdc"]
-  script:
-    - root -b -q benchmarks/calorimeters/simple_info_plot_histograms.cxx+
-

benchmarks/crystal_calorimeter/config.yml

+cal_sim:crystal_emcal:
+  extends: .det_benchmark
+  stage: simulate
+  script:
+    - bash benchmarks/crystal_calorimeter/run_simulation_crystal.sh
+
+cal_sim:crystal_pion:
+  extends: .det_benchmark
+  stage: simulate
+  script:
+    - npsim --runType batch --numberOfEvents 100 --compactFile ${DETECTOR_PATH}/topside.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.root
+
+cal_bench:crystal_benchmark:
+  extends: .det_benchmark
+  stage: benchmarks
+  needs:
+    - ["cal_sim:crystal_emcal"]
+  script:
+    - 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
+