From 844289cd3ca4309ee397c60b034761cdd713a071 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 21 Feb 2022 22:35:30 -0600
Subject: [PATCH] npsim -> ddsim
---
benchmarks/b0_tracker/forward_protons.sh | 3 ++-
benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh | 3 ++-
benchmarks/barrel_ecal/run_emcal_barrel_particles.sh | 3 ++-
benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh | 3 ++-
benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh | 3 ++-
benchmarks/barrel_ecal/run_emcal_barrel_pions.sh | 3 ++-
benchmarks/barrel_hcal/run_hcal_barrel_particles.sh | 3 ++-
benchmarks/crystal_calorimeter/config.yml | 2 +-
.../crystal_calorimeter/run_simulation_crystal_pion.sh | 3 ++-
benchmarks/pid/config.yml | 2 +-
benchmarks/roman_pots/roman_pot_simu.sh | 3 ++-
benchmarks/timing/run_timing.sh | 7 ++++---
benchmarks/tracking_detectors/track_hits.sh | 3 ++-
benchmarks/zdc/run_zdc_neutrons.sh | 3 ++-
14 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/benchmarks/b0_tracker/forward_protons.sh b/benchmarks/b0_tracker/forward_protons.sh
index c2053859..1471658e 100755
--- a/benchmarks/b0_tracker/forward_protons.sh
+++ b/benchmarks/b0_tracker/forward_protons.sh
@@ -23,9 +23,10 @@ if [[ "$?" -ne "0" ]] ; then
fi
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles ${FILE_NAME_TAG}.hepmc \
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh b/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
index 2c00e70b..df97c7b2 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
@@ -38,9 +38,10 @@ if [[ "$?" -ne "0" ]] ; then
fi
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh b/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
index 13e7d3e7..7d463d7f 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
@@ -45,9 +45,10 @@ fi
ls -ltRhL
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
index 8219dcec..cdcc583a 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
@@ -43,9 +43,10 @@ if [[ "$?" -ne "0" ]] ; then
fi
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
index a75438b6..5e394a6f 100644
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
@@ -45,9 +45,10 @@ fi
ls -ltRhL
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
index b4b18644..a42b7aed 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
@@ -43,9 +43,10 @@ if [[ "$?" -ne "0" ]] ; then
fi
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
diff --git a/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh b/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
index 041b736b..bbd7b728 100755
--- a/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
+++ b/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
@@ -45,9 +45,10 @@ fi
ls -ltRhL
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
diff --git a/benchmarks/crystal_calorimeter/config.yml b/benchmarks/crystal_calorimeter/config.yml
index 615ea23b..96b1accd 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:
- - npsim --runType batch --numberOfEvents 100 --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}.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/crystal_calorimeter/run_simulation_crystal_pion.sh b/benchmarks/crystal_calorimeter/run_simulation_crystal_pion.sh
index fc82dbd2..a728fa10 100755
--- a/benchmarks/crystal_calorimeter/run_simulation_crystal_pion.sh
+++ b/benchmarks/crystal_calorimeter/run_simulation_crystal_pion.sh
@@ -1,6 +1,7 @@
#!/bin/bash
-npsim --runType batch --numberOfEvents 10000 \
+ddsim --runType batch --numberOfEvents 10000 \
+ --filter.tracker edep0 \
--compactFile benchmarks/calorimeters/topside.xml \
--inputFiles ./data/emcal_pions_upto1GeV_10kevents.hepmc \
--outputFile ./sim_output/sim_crystal_pion_input.edm4hep.root
diff --git a/benchmarks/pid/config.yml b/benchmarks/pid/config.yml
index d562c1de..6d93582e 100644
--- a/benchmarks/pid/config.yml
+++ b/benchmarks/pid/config.yml
@@ -2,7 +2,7 @@ sim:backward:
extends: .det_benchmark
stage: simulate
script:
- - npsim --runType batch --numberOfEvents 100 --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}.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:
diff --git a/benchmarks/roman_pots/roman_pot_simu.sh b/benchmarks/roman_pots/roman_pot_simu.sh
index ca29f180..a5809796 100755
--- a/benchmarks/roman_pots/roman_pot_simu.sh
+++ b/benchmarks/roman_pots/roman_pot_simu.sh
@@ -10,9 +10,10 @@ fi
ddsim --runType batch -N 300 \
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles ./data/forward_ions.hepmc \
diff --git a/benchmarks/timing/run_timing.sh b/benchmarks/timing/run_timing.sh
index 1904672e..e0aba39f 100755
--- a/benchmarks/timing/run_timing.sh
+++ b/benchmarks/timing/run_timing.sh
@@ -79,11 +79,12 @@ output_file="sim_${nevents}.edm4hep.root"
mkdir -p ${output_dir}
timing_dir="results/timing/${particle}/${energy/\*/}"
timing_file="time_${nevents}events.log"
-npsim_file="npsim_${nevents}events.log"
+ddsim_file="npsim_${nevents}events.log"
mkdir -p ${timing_dir}
/usr/bin/time -v -o ${timing_dir}/time_${nevents}events.log \
- npsim --runType batch \
+ ddsim --runType batch \
--printLevel WARNING \
+ --filter.tracker edep0 \
--numberOfEvents ${nevents} \
--enableGun \
--gun.energy "${energy}" \
@@ -94,7 +95,7 @@ mkdir -p ${timing_dir}
--part.minimalKineticEnergy "1*TeV" \
--compactFile ${compact_path} \
--outputFile ${output_dir}/${output_file} \
- 2>&1 > ${timing_dir}/${npsim_file}
+ 2>&1 > ${timing_dir}/${ddsim_file}
echo "For ${nevents} events:"
cat ${timing_dir}/${timing_file}
diff --git a/benchmarks/tracking_detectors/track_hits.sh b/benchmarks/tracking_detectors/track_hits.sh
index eee822fd..cc883487 100644
--- a/benchmarks/tracking_detectors/track_hits.sh
+++ b/benchmarks/tracking_detectors/track_hits.sh
@@ -78,8 +78,9 @@ if [ -z "${ANALYSIS_ONLY}" ] ; then
echo "Running geant4 simulation"
## run geant4 simulations
- npsim --runType batch \
+ ddsim --runType batch \
--part.minimalKineticEnergy 1000*GeV \
+ --filter.tracker edep0 \
-v WARNING \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
diff --git a/benchmarks/zdc/run_zdc_neutrons.sh b/benchmarks/zdc/run_zdc_neutrons.sh
index 6b547ac3..049c1bd8 100755
--- a/benchmarks/zdc/run_zdc_neutrons.sh
+++ b/benchmarks/zdc/run_zdc_neutrons.sh
@@ -34,9 +34,10 @@ if [[ "$?" -ne "0" ]] ; then
fi
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy 0.5*GeV \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
--inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
--
GitLab