From 792d7e1f714a5fe7a936e96c16410d5426f78e5b Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 21 Feb 2022 21:57:48 -0600
Subject: [PATCH] Use ddsim instead of npsim
---
benchmarks/clustering/full_cal_clusters.sh | 3 ++-
benchmarks/ecal/run_emcal_benchmarks.py | 3 ++-
benchmarks/far_forward/far_forward_protons.sh | 3 ++-
benchmarks/far_forward/run_zdc_neutrons.sh | 3 ++-
benchmarks/far_forward/run_zdc_photons.sh | 3 ++-
benchmarks/imaging_ecal/run_emcal_barrel.sh | 3 ++-
benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh | 3 ++-
benchmarks/imaging_ecal/run_imcal_pion0.sh | 3 ++-
benchmarks/imaging_shower_ML/sim_rec_tag.py | 3 ++-
benchmarks/rich/forward_hadrons.sh | 3 ++-
benchmarks/track_finding/multiple_tracks.sh | 3 ++-
benchmarks/track_fitting/single_tracks.sh | 3 ++-
benchmarks/tracking/central_pions.sh | 3 ++-
benchmarks/tracking/multiple_tracks.sh | 3 ++-
benchmarks/tracking/run_tracking_benchmarks.py | 3 ++-
15 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/benchmarks/clustering/full_cal_clusters.sh b/benchmarks/clustering/full_cal_clusters.sh
index 91673818..9d7f8864 100644
--- a/benchmarks/clustering/full_cal_clusters.sh
+++ b/benchmarks/clustering/full_cal_clusters.sh
@@ -100,9 +100,10 @@ fi
ls -lh ${JUGGLER_GEN_FILE}
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy "1*TeV" \
+ --filter.tracker edep0 \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${compact_path} \
--inputFiles ${JUGGLER_GEN_FILE} \
diff --git a/benchmarks/ecal/run_emcal_benchmarks.py b/benchmarks/ecal/run_emcal_benchmarks.py
index fb85a8f0..e44c455d 100755
--- a/benchmarks/ecal/run_emcal_benchmarks.py
+++ b/benchmarks/ecal/run_emcal_benchmarks.py
@@ -74,9 +74,10 @@ if 'sim' in procs:
'--particles', args.particles]
subprocess.run(gen_cmd)
# simulation
- sim_cmd = ['npsim',
+ sim_cmd = ['ddsim',
'--part.minimalKineticEnergy', '1*TeV',
'--numberOfEvents', '{}'.format(args.nev),
+ '--filter.tracker', 'edep0',
'--runType', 'batch',
'--inputFiles', gen_file,
'--outputFile', sim_file,
diff --git a/benchmarks/far_forward/far_forward_protons.sh b/benchmarks/far_forward/far_forward_protons.sh
index 55c2afe6..8b6bf299 100644
--- a/benchmarks/far_forward/far_forward_protons.sh
+++ b/benchmarks/far_forward/far_forward_protons.sh
@@ -78,8 +78,9 @@ 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/far_forward/run_zdc_neutrons.sh b/benchmarks/far_forward/run_zdc_neutrons.sh
index b321cda1..9c54b656 100644
--- a/benchmarks/far_forward/run_zdc_neutrons.sh
+++ b/benchmarks/far_forward/run_zdc_neutrons.sh
@@ -88,8 +88,9 @@ then
fi
echo "Running Geant4 simulation"
- npsim --runType batch \
+ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*MeV \
+ --filter.tracker edep0 \
-v WARNING \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
diff --git a/benchmarks/far_forward/run_zdc_photons.sh b/benchmarks/far_forward/run_zdc_photons.sh
index 6362b1c5..ef22e2ab 100644
--- a/benchmarks/far_forward/run_zdc_photons.sh
+++ b/benchmarks/far_forward/run_zdc_photons.sh
@@ -88,8 +88,9 @@ then
fi
echo "Running Geant4 simulation"
- npsim --runType batch \
+ ddsim --runType batch \
--part.minimalKineticEnergy 0.5*MeV \
+ --filter.tracker edep0 \
-v WARNING \
--numberOfEvents ${JUGGLER_N_EVENTS} \
--compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh
index 69e31f1d..d8153954 100644
--- a/benchmarks/imaging_ecal/run_emcal_barrel.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel.sh
@@ -85,9 +85,10 @@ fi
ls -lh ${CB_EMCAL_GEN_FILE}
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy "0.5*MeV" \
+ --filter.tracker edep0 \
--numberOfEvents ${CB_EMCAL_NUMEV} \
--compactFile ${CB_EMCAL_COMPACT_PATH} \
--inputFiles ${CB_EMCAL_GEN_FILE} \
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh b/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
index 68d73566..a3e21fb7 100755
--- a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
@@ -85,9 +85,10 @@ fi
ls -lh ${CB_EMCAL_GEN_FILE}
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy "0.5*MeV" \
+ --filter.tracker edep0 \
--numberOfEvents ${CB_EMCAL_NUMEV} \
--compactFile ${CB_EMCAL_COMPACT_PATH} \
--inputFiles ${CB_EMCAL_GEN_FILE} \
diff --git a/benchmarks/imaging_ecal/run_imcal_pion0.sh b/benchmarks/imaging_ecal/run_imcal_pion0.sh
index e270d33a..2866daea 100644
--- a/benchmarks/imaging_ecal/run_imcal_pion0.sh
+++ b/benchmarks/imaging_ecal/run_imcal_pion0.sh
@@ -81,9 +81,10 @@ fi
ls -lh ${CB_EMCAL_GEN_FILE}
# Run geant4 simulations
-npsim --runType batch \
+ddsim --runType batch \
-v WARNING \
--part.minimalKineticEnergy "0.5*MeV" \
+ --filter.tracker edep0 \
--numberOfEvents ${CB_EMCAL_NUMEV} \
--compactFile ${CB_EMCAL_COMPACT_PATH} \
--inputFiles ${CB_EMCAL_GEN_FILE} \
diff --git a/benchmarks/imaging_shower_ML/sim_rec_tag.py b/benchmarks/imaging_shower_ML/sim_rec_tag.py
index 8bc6bc05..e7425a61 100755
--- a/benchmarks/imaging_shower_ML/sim_rec_tag.py
+++ b/benchmarks/imaging_shower_ML/sim_rec_tag.py
@@ -52,8 +52,9 @@ if 'sim' in procs:
'--particles', args.particles]
subprocess.run(gen_cmd)
# simulation
- sim_cmd = ['npsim',
+ sim_cmd = ['ddsim',
'--part.minimalKineticEnergy', '1*TeV',
+ '--filter.tracker', 'edep0',
'--numberOfEvents', '{}'.format(args.nev),
'--runType', 'batch',
# '--physics.list', args.physics_list,
diff --git a/benchmarks/rich/forward_hadrons.sh b/benchmarks/rich/forward_hadrons.sh
index 087e56ed..08de28e9 100644
--- a/benchmarks/rich/forward_hadrons.sh
+++ b/benchmarks/rich/forward_hadrons.sh
@@ -58,8 +58,9 @@ fi
exit 0
-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/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh
index e18230a4..67ef180e 100644
--- a/benchmarks/track_finding/multiple_tracks.sh
+++ b/benchmarks/track_finding/multiple_tracks.sh
@@ -63,8 +63,9 @@ fi
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/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh
index 7c4ba79a..e5f3313a 100644
--- a/benchmarks/track_fitting/single_tracks.sh
+++ b/benchmarks/track_fitting/single_tracks.sh
@@ -66,8 +66,9 @@ fi
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/tracking/central_pions.sh b/benchmarks/tracking/central_pions.sh
index 365ea439..2db8a7b9 100644
--- a/benchmarks/tracking/central_pions.sh
+++ b/benchmarks/tracking/central_pions.sh
@@ -78,8 +78,9 @@ 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/tracking/multiple_tracks.sh b/benchmarks/tracking/multiple_tracks.sh
index a782b768..a4b432ab 100644
--- a/benchmarks/tracking/multiple_tracks.sh
+++ b/benchmarks/tracking/multiple_tracks.sh
@@ -79,8 +79,9 @@ 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/tracking/run_tracking_benchmarks.py b/benchmarks/tracking/run_tracking_benchmarks.py
index 93c00577..d4660c5e 100755
--- a/benchmarks/tracking/run_tracking_benchmarks.py
+++ b/benchmarks/tracking/run_tracking_benchmarks.py
@@ -56,8 +56,9 @@ if 'sim' in procs:
'--particles', args.particles]
subprocess.run(gen_cmd)
# simulation
- sim_cmd = ['npsim',
+ sim_cmd = ['ddsim',
'--part.minimalKineticEnergy', '1*TeV',
+ '--filter.tracker', 'edep0',
'--numberOfEvents', '{}'.format(args.nev),
'--runType', 'batch',
'--inputFiles', gen_file,
--
GitLab