diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12b0445f844e58c3601149489e9a6697b2ab0dd9..429384c8440663c17fcc0eab2d97442def259812 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 1471658e9a2ac929e5d620f74dbcad62b73d9925..a98c4c5faef12db9f49f995ae30bd5982245cfe2 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 df97c7b21e3132f4dd923faca8826b5f1e2765ba..0ff0121dc4091a3616fee50eaf0fe70f33f1b3e4 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 7d463d7f8fe95043f8e7eec5b21e9dde973ab96a..940379cba6b7b91cd4ee5a7c5d1f780e22991ba7 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 cdcc583ac6e7e6f9414d9bfea306d0c0bf8da7b0..b1c4d31d2423f34706285b059712147a1ef918d6 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 5e394a6f26d07abac807791684e0d05f070c7759..8aa933d0231365468720929ad79d2d4a31554160 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 a42b7aedb13d74cfad63d0a1a9f85542cc42d929..a973d333a86a67814efde6d5b0e05915dba6276b 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 b145f3c41e7ef895a6c0e137a3556ecd00749a2e..3b83c1a361634e71c870c79dabfe6fe916a7be02 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 46edf99c40235699b80584d99da065b167d9678f..c1901eca943660db29292c3ca6b5cd528455a439 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 86cf835a261b2e74d7794d7ca9d872716496a7e2..2a0d494e2004adab220b15d75bbd30afaad14d7d 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 bbd7b728d4e7cc61a9420d4663764e93cd5e1dd8..f6fe3af736b8e978f3dfe02523b010fe28099231 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 96b1accd6f67592e4a70eecc085ef526a5134b91..a4243d3cfa8a0a6a74d52409c75b94600227564e 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 0d1104d1b34b13e4f8de5088ffbf2015b2e17be8..35e9deadf45015c3500dc5fefe0df46856251406 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 5bef64db1a2e8d013ea8c9d6451ecf0b518026fa..56b453f217993d312df0cacd396bac12f044182d 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 bc5d9971f76425f1cce80cdfa8a8dca82b996bcd..8a0f0a4e8b739f343ef1cd0c504ee53de327a5b5 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 a5809796445184e3f21ef69f85bc5d995053a40b..810185f45806a93954c5bc929f5de6ca04675c9b 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 e0aba39f417beecf31f0cf1c628899e7a0345b94..34476340a9118bed1e0e3e67dde9088d6eecadec 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 cc883487d315bd34db69ad5ff4e0fa5e70f21bc0..fc811e0fb2db67baab4049e5c5a3fe91f5981e2d 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 049c1bd8f9763e7ad8d25e0fef624e2af8dc1c54..feb0ef3aec52b84dac8909e4da6d5e382a122f64 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}