Skip to content
Snippets Groups Projects
Commit 8096e970 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Split calorimeter subsystems into their own benchmark directories.

parent 1dc555dc
Branches
No related tags found
1 merge request!22Resolve "Split subsystems into their own directories."
This commit is part of merge request !22. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 77 additions and 191 deletions
.gitlab-ci.yml
+ 6
− 87
View file @ 8096e970
...@@ -23,6 +23,7 @@ stages: ...@@ -23,6 +23,7 @@ stages:
- data_init - data_init
- simulate - simulate
- benchmarks - benchmarks
- collect
- deploy - deploy
env: env:
...@@ -76,98 +77,16 @@ get_data: ...@@ -76,98 +77,16 @@ get_data:
include: include:
- local: 'benchmarks/trackers/config.yml' - local: 'benchmarks/barrel_ecal/config.yml'
- local: 'benchmarks/calorimeters/config.yml' - local: 'benchmarks/roman_pots/config.yml'
- local: 'benchmarks/zdc/config.yml'
- local: 'benchmarks/crystal_calorimeter/config.yml'
- local: 'benchmarks/pid/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: deploy_results:
stage: deploy stage: deploy
needs: needs:
- ["cal_bench:zdc_benchmark"] - ["collect_results:zdc","collect_results:barrel_ecal","collect_results:crystal_calorimeter"]
tags:
- silicon
script: script:
- echo "deploy results!" - echo "deploy results!"
......
README.md
+ 0
− 2
View file @ 8096e970
...@@ -9,8 +9,6 @@ Detector benchmarks are meant to test for regressions in individual detector sub ...@@ -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. 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. So this precludes using [juggler](https://eicweb.phy.anl.gov/EIC/juggler) for processing the events.
## Adding new benchmarks ## Adding new benchmarks
### Pass/Fail tests ### Pass/Fail tests
......
benchmarks/calorimeters/.gitignore → benchmarks/barrel_ecal/.gitignore
+ 0
− 0
View file @ 8096e970
File moved
benchmarks/barrel_ecal/config.yml 0 → 100644
+ 37
− 0
View file @ 8096e970
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/rootlogon.C → benchmarks/barrel_ecal/rootlogon.C
+ 0
− 0
View file @ 8096e970
File moved
benchmarks/calorimeters/run_emcal_barrel_electrons.sh → benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
+ 2
− 2
View file @ 8096e970
...@@ -27,13 +27,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}" ...@@ -27,13 +27,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}" echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
# Generate the input events # 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 if [[ "$?" -ne "0" ]] ; then
echo "ERROR running script: generating input events" echo "ERROR running script: generating input events"
exit 1 exit 1
fi fi
# Plot the input events # 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 if [[ "$?" -ne "0" ]] ; then
echo "ERROR running script: plotting input events" echo "ERROR running script: plotting input events"
exit 1 exit 1
......
benchmarks/calorimeters/run_emcal_barrel_pions.sh → benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
+ 2
− 2
View file @ 8096e970
...@@ -30,13 +30,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}" ...@@ -30,13 +30,13 @@ echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}" echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
# Generate the input events # 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 if [[ "$?" -ne "0" ]] ; then
echo "ERROR running script: generating input events" echo "ERROR running script: generating input events"
exit 1 exit 1
fi fi
# Plot the input events # 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 if [[ "$?" -ne "0" ]] ; then
echo "ERROR running script: plotting input events" echo "ERROR running script: plotting input events"
exit 1 exit 1
......
benchmarks/calorimeters/.rootrc deleted 100644 → 0
+ 0
− 2
View file @ 1dc555dc
#.rootrc file
Rint.Logon: ./rootlogon.C
benchmarks/calorimeters/config.yml deleted 100644 → 0
+ 0
− 96
View file @ 1dc555dc
#####################
# 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 0 → 100644
+ 30
− 0
View file @ 8096e970
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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment