From bf5534100309e48480fef52e52d8a968dd0c4b2e Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 15 Jun 2022 04:18:51 +0000
Subject: [PATCH] JUGGLER_DETECTOR_CONFIG support
---
.gitlab-ci.yml | 9 +++++++++
benchmarks/b0_tracker/forward_protons.sh | 2 +-
benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh | 2 +-
benchmarks/barrel_ecal/run_emcal_barrel_particles.sh | 2 +-
benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh | 2 +-
.../barrel_ecal/run_emcal_barrel_pion_rejection.sh | 2 +-
benchmarks/barrel_ecal/run_emcal_barrel_pions.sh | 2 +-
.../scripts/emcal_barrel_energy_scan_analysis.cxx | 4 ++--
.../scripts/emcal_barrel_particles_analysis.cxx | 4 ++--
.../scripts/emcal_barrel_pion_rejection_analysis.cxx | 6 +++---
benchmarks/barrel_hcal/run_hcal_barrel_particles.sh | 2 +-
benchmarks/crystal_calorimeter/config.yml | 2 +-
benchmarks/material_maps/config.yml | 8 ++++----
benchmarks/others/config.yml | 12 ++++++------
benchmarks/pid/config.yml | 4 ++--
benchmarks/roman_pots/roman_pot_simu.sh | 2 +-
benchmarks/timing/run_timing.sh | 2 +-
benchmarks/tracking_detectors/track_hits.sh | 2 +-
benchmarks/zdc/run_zdc_neutrons.sh | 2 +-
19 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12b0445f..429384c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,8 +49,10 @@ common:setup:
- |
if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+ echo "JUGGLER_DETECTOR_CONFIG = ${JUGGLER_DETECTOR_CONFIG}"
echo "JUGGLER_DETECTOR_VERSION = ${JUGGLER_DETECTOR_VERSION}"
echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
+ echo "JUGGLER_DETECTOR_CONFIG=$JUGGLER_DETECTOR_CONFIG" >> juggler.env
echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
echo "JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME=${DEPLOY_TOKEN_USERNAME}" >> juggler.env
echo "JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD=${DEPLOY_TOKEN_PASSWORD}" >> juggler.env
@@ -59,12 +61,17 @@ common:setup:
if [[ "${JUGGLER_DETECTOR}" == "" ]] ; then
export JUGGLER_DETECTOR="ecce"
fi
+ if [[ "${JUGGLER_DETECTOR_CONFIG}" == "" ]] ; then
+ export JUGGLER_DETECTOR_CONFIG="ecce"
+ fi
if [[ "${JUGGLER_DETECTOR_VERSION}" == "" ]] ; then
export JUGGLER_DETECTOR_VERSION="main"
fi
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+ echo "JUGGLER_DETECTOR_CONFIG = ${JUGGLER_DETECTOR_CONFIG}"
echo "JUGGLER_DETECTOR_VERSION = ${JUGGLER_DETECTOR_VERSION}"
echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
+ echo "JUGGLER_DETECTOR_CONFIG=$JUGGLER_DETECTOR_CONFIG" >> juggler.env
echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
fi
@@ -129,6 +136,7 @@ benchmarks:reconstruction:
stage: trigger
variables:
JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
+ JUGGLER_DETECTOR_CONFIG: "$JUGGLER_DETECTOR_CONFIG"
JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME}"
JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD}"
@@ -142,6 +150,7 @@ benchmarks:physics:
stage: trigger
variables:
JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
+ JUGGLER_DETECTOR_CONFIG: "$JUGGLER_DETECTOR_CONFIG"
JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME}"
JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD}"
diff --git a/benchmarks/b0_tracker/forward_protons.sh b/benchmarks/b0_tracker/forward_protons.sh
index 1471658e..a98c4c5f 100755
--- a/benchmarks/b0_tracker/forward_protons.sh
+++ b/benchmarks/b0_tracker/forward_protons.sh
@@ -28,7 +28,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles ${FILE_NAME_TAG}.hepmc \
--outputFile ${JUGGLER_SIM_FILE}
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh b/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
index df97c7b2..0ff0121d 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
@@ -43,7 +43,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh b/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
index 7d463d7f..940379cb 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
@@ -50,7 +50,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
index cdcc583a..b1c4d31d 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
@@ -48,7 +48,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
index 5e394a6f..8aa933d0 100644
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
@@ -50,7 +50,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
index a42b7aed..a973d333 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
@@ -48,7 +48,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
index b145f3c4..3b83c1a3 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
@@ -272,8 +272,8 @@ void emcal_barrel_energy_scan_analysis(std::string particle_label = "electron")
if(std::getenv("DETECTOR_PATH")) {
detector_path = std::getenv("DETECTOR_PATH");
}
- if(std::getenv("JUGGLER_DETECTOR")) {
- detector_name = std::getenv("JUGGLER_DETECTOR");
+ if(std::getenv("JUGGLER_DETECTOR_CONFIG")) {
+ detector_name = std::getenv("JUGGLER_DETECTOR_CONFIG");
}
dd4hep::Detector& detector = dd4hep::Detector::getInstance();
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
index 46edf99c..c1901eca 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
@@ -70,8 +70,8 @@ void emcal_barrel_particles_analysis(std::string particle_name = "electron", boo
if(std::getenv("DETECTOR_PATH")) {
detector_path = std::getenv("DETECTOR_PATH");
}
- if(std::getenv("JUGGLER_DETECTOR")) {
- detector_name = std::getenv("JUGGLER_DETECTOR");
+ if(std::getenv("JUGGLER_DETECTOR_CONFIG")) {
+ detector_name = std::getenv("JUGGLER_DETECTOR_CONFIG");
}
// Thrown Energy [GeV]
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
index 86cf835a..2a0d494e 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
@@ -81,8 +81,8 @@ void emcal_barrel_pion_rejection_analysis(
if(std::getenv("DETECTOR_PATH")) {
detector_path = std::getenv("DETECTOR_PATH");
}
- if(std::getenv("JUGGLER_DETECTOR")) {
- detector_name = std::getenv("JUGGLER_DETECTOR");
+ if(std::getenv("JUGGLER_DETECTOR_CONFIG")) {
+ detector_name = std::getenv("JUGGLER_DETECTOR_CONFIG");
}
/*
@@ -103,7 +103,7 @@ void emcal_barrel_pion_rejection_analysis(
// DD4HEP interface
dd4hep::Detector& detector = dd4hep::Detector::getInstance();
- detector.fromCompact(fmt::format("{}/{}.xml", detector_path,detector_name));
+ detector.fromCompact(fmt::format("{}/{}.xml", detector_path, detector_name));
auto decoder = detector.readout("EcalBarrelHits").idSpec().decoder();
auto decoderScFi = detector.readout("EcalBarrelScFiHits").idSpec().decoder();
diff --git a/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh b/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
index bbd7b728..f6fe3af7 100755
--- a/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
+++ b/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
@@ -50,7 +50,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/crystal_calorimeter/config.yml b/benchmarks/crystal_calorimeter/config.yml
index 96b1accd..a4243d3c 100644
--- a/benchmarks/crystal_calorimeter/config.yml
+++ b/benchmarks/crystal_calorimeter/config.yml
@@ -8,7 +8,7 @@ cal_sim:crystal_pion:
extends: .det_benchmark
stage: simulate
script:
- - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml --inputFiles data/emcal_electrons.hepmc --outputFile sim_output/output_emcal_electrons.edm4hep.root
+ - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --inputFiles data/emcal_electrons.hepmc --outputFile sim_output/output_emcal_electrons.edm4hep.root
cal_bench:crystal_benchmark:
extends: .det_benchmark
diff --git a/benchmarks/material_maps/config.yml b/benchmarks/material_maps/config.yml
index 0d1104d1..35e9dead 100644
--- a/benchmarks/material_maps/config.yml
+++ b/benchmarks/material_maps/config.yml
@@ -2,18 +2,18 @@ material_maps:
extends: .det_benchmark
stage: simulate
script:
- - ActsExampleGeometryDD4hep -j 1 -n 1 --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml --output-json --output-root --mat-output-file geometry-map --mat-output-allmaterial true --mat-output-sensitives false
+ - ActsExampleGeometryDD4hep -j 1 -n 1 --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --output-json --output-root --mat-output-file geometry-map --mat-output-allmaterial true --mat-output-sensitives false
- test -f geometry-map.json
- python3 benchmarks/material_maps/scripts/writeMapConfig.py geometry-map.json config-map.json
- test -f config-map.json
- python3 benchmarks/material_maps/scripts/configureMap.py geometry-map.json config-map.json
- test -f config-map.json
- - ActsExampleMaterialRecordingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml --output-root
+ - ActsExampleMaterialRecordingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --output-root
- test -f geant4_material_tracks.root
- root -l -b -q -e "TChain T(\"material-tracks\"); T.Add(\"geant4_material_tracks.root\"); cout << T.GetEntries() << \" entries\" << endl; gApplication->Terminate(T.GetEntries()-${JUGGLER_N_EVENTS});"
- - ActsExampleMaterialMappingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml --input-root true --input-files geant4_material_tracks.root --mat-input-type file --mat-input-file geometry-map.json --output-root --output-json --output-cbor --mat-output-file material-maps --mat-mapping-surfaces true --mat-mapping-volumes true --mat-mapping-volume-stepsize 1
+ - ActsExampleMaterialMappingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --input-root true --input-files geant4_material_tracks.root --mat-input-type file --mat-input-file geometry-map.json --output-root --output-json --output-cbor --mat-output-file material-maps --mat-mapping-surfaces true --mat-mapping-volumes true --mat-mapping-volume-stepsize 1
- test -f material-maps.json
- - ActsExampleMaterialValidationDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml --mat-input-type file --mat-input-file material-maps.json --output-root --mat-output-file val-mat-map --prop-z0-sigma 0.0 --prop-d0-sigma 0.0
+ - ActsExampleMaterialValidationDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --mat-input-type file --mat-input-file material-maps.json --output-root --mat-output-file val-mat-map --prop-z0-sigma 0.0 --prop-d0-sigma 0.0
- ls -al
- mkdir -p results/material_maps
- cp *.root *.json *.cbor results/material_maps/
diff --git a/benchmarks/others/config.yml b/benchmarks/others/config.yml
index 5bef64db..56b453f2 100644
--- a/benchmarks/others/config.yml
+++ b/benchmarks/others/config.yml
@@ -16,7 +16,7 @@ bench:materialScanEta:
stage: benchmarks
extends: .det_benchmark
script:
- - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml -interactive
+ - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
- mkdir results/images/
- mv materialScanEta.png results/images/materialScanEta.png
- mv materialScanEta.pdf results/images/materialScanEta.pdf
@@ -25,7 +25,7 @@ bench:materialScanEta:tracking:
stage: benchmarks
extends: .det_benchmark
script:
- - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml -interactive
+ - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
- mkdir results/images/
- mv materialScanEta.png results/images/materialScanEtaTracking.png
- mv materialScanEta.pdf results/images/materialScanEtaTracking.pdf
@@ -34,7 +34,7 @@ bench:materialScanEta:ecal:
stage: benchmarks
extends: .det_benchmark
script:
- - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml -interactive
+ - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
- mkdir results/images/
- mv materialScanEta.png results/images/materialScanEtaEcal.png
- mv materialScanEta.pdf results/images/materialScanEtaEcal.pdf
@@ -43,7 +43,7 @@ bench:materialScanEtaPhi:
stage: benchmarks
extends: .det_benchmark
script:
- - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml -interactive
+ - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
- mkdir results/images/
- mv materialScanEtaPhi.png results/images/materialScanEtaPhi.png
- mv materialScanEtaPhi.pdf results/images/materialScanEtaPhi.pdf
@@ -52,7 +52,7 @@ bench:materialScanEtaPhi:tracking:
stage: benchmarks
extends: .det_benchmark
script:
- - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml -interactive
+ - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
- mkdir results/images/
- mv materialScanEtaPhi.png results/images/materialScanEtaPhiTracking.png
- mv materialScanEtaPhi.pdf results/images/materialScanEtaPhiTracking.pdf
@@ -61,7 +61,7 @@ bench:materialScanEtaPhi:ecal:
stage: benchmarks
extends: .det_benchmark
script:
- - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml -interactive
+ - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
- mkdir results/images/
- mv materialScanEtaPhi.png results/images/materialScanEtaPhiEcal.png
- mv materialScanEtaPhi.pdf results/images/materialScanEtaPhiEcal.pdf
diff --git a/benchmarks/pid/config.yml b/benchmarks/pid/config.yml
index bc5d9971..8a0f0a4e 100644
--- a/benchmarks/pid/config.yml
+++ b/benchmarks/pid/config.yml
@@ -2,7 +2,7 @@ sim:backward:
extends: .det_benchmark
stage: simulate
script:
- - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 130*deg --gun.thetaMax 177*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
+ - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 130*deg --gun.thetaMax 177*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
- rootls -t sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
parallel:
matrix:
@@ -12,7 +12,7 @@ sim:forward:
extends: .det_benchmark
stage: simulate
script:
- - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 3*deg --gun.thetaMax 50*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
+ - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 3*deg --gun.thetaMax 50*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
- rootls -t sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
parallel:
matrix:
diff --git a/benchmarks/roman_pots/roman_pot_simu.sh b/benchmarks/roman_pots/roman_pot_simu.sh
index a5809796..810185f4 100755
--- a/benchmarks/roman_pots/roman_pot_simu.sh
+++ b/benchmarks/roman_pots/roman_pot_simu.sh
@@ -15,6 +15,6 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles ./data/forward_ions.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/timing/run_timing.sh b/benchmarks/timing/run_timing.sh
index e0aba39f..34476340 100755
--- a/benchmarks/timing/run_timing.sh
+++ b/benchmarks/timing/run_timing.sh
@@ -68,7 +68,7 @@ if [[ ! -n "${JUGGLER_INSTALL_PREFIX}" ]] ; then
export JUGGLER_INSTALL_PREFIX="/usr/local"
fi
-compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
echo "DETECTOR_PATH = ${DETECTOR_PATH}"
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
diff --git a/benchmarks/tracking_detectors/track_hits.sh b/benchmarks/tracking_detectors/track_hits.sh
index cc883487..fc811e0f 100644
--- a/benchmarks/tracking_detectors/track_hits.sh
+++ b/benchmarks/tracking_detectors/track_hits.sh
@@ -83,7 +83,7 @@ if [ -z "${ANALYSIS_ONLY}" ] ; then
--filter.tracker edep0 \
-v WARNING \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile ${JUGGLER_SIM_FILE}
if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/zdc/run_zdc_neutrons.sh b/benchmarks/zdc/run_zdc_neutrons.sh
index 049c1bd8..feb0ef3a 100755
--- a/benchmarks/zdc/run_zdc_neutrons.sh
+++ b/benchmarks/zdc/run_zdc_neutrons.sh
@@ -39,7 +39,7 @@ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*GeV \
--filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
- --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+ --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
--outputFile sim_output/${JUGGLER_SIM_FILE}
--
GitLab