edm4hep updates

.gitlab-ci.yml

@@ -13,6 +13,7 @@ default:
       - .local/bin
       - .local/include
       - .local/share
+      - .local/root_build
       - results
       - config
       - juggler.env
@@ -22,6 +23,7 @@ default:
 stages:
   - config
   - initialize
+  - compile
   - generate
   - process
   - collect
@@ -49,6 +51,12 @@ common:detector:
     - mkdir -p config
     - print_env.sh
 
+.compile_benchmark:
+  needs:
+    - ["common:setup"]
+  before_script:
+    - source .local/bin/env.sh  
+
 .phy_benchmark:
   needs:
     - ["common:detector"]

benchmarks/dis/analysis-only.sh

@@ -3,7 +3,7 @@
 ## =============================================================================
 ## Run the DIS benchmarks in 5 steps:
 ## 1. Parse the command line and setup environment
-## 2. Detector simulation through npsim
+## 2. Detector simulation through ddsim
 ## 3. Digitization and reconstruction through Juggler
 ## 4. Root-based Physics analyses
 ## 5. Finalize
@@ -45,7 +45,7 @@ source benchmarks/dis/env.sh
 ## Get a unique file names based on the configuration options
 GEN_FILE=${INPUT_PATH}/gen-${CONFIG}_${JUGGLER_N_EVENTS}.hepmc
 
-SIM_FILE=${TMP_PATH}/sim-${CONFIG}.root
+SIM_FILE=${TMP_PATH}/sim-${CONFIG}.edm4hep.root
 SIM_LOG=${TMP_PATH}/sim-${CONFIG}.log
 
 
@@ -57,15 +57,16 @@ PLOT_TAG=${CONFIG}
 ## =============================================================================
 ## Step 2: Run the simulation
 echo "Running Geant4 simulation"
-#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 \
 #      --inputFiles ${GEN_FILE} \
 #      --outputFile ${SIM_FILE}
 #if [ "$?" -ne "0" ] ; then
-#  echo "ERROR running npsim"
+#  echo "ERROR running ddsim"
 #  exit 1
 #fi
 

benchmarks/dis/analysis/rec_analysis_raw.cxx

@@ -101,10 +101,10 @@ int rec_analysis_raw(const std::string& config_name)
   auto h_adc_EcalBarrelScFiRawHits = d0.Histo1D({"h_adc_EcalBarrelScFiRawHits", "EcalBarrelScFi; amplitude; counts", 1024, 0, 32768}, "EcalBarrelScFiRawHits.amplitude");
   auto h_adc_EcalEndcapNRawHits = d0.Histo1D({"h_adc_EcalEndcapNRawHits", "EcalEndcapN; amplitude; counts", 1024, 0, 32768}, "EcalEndcapNRawHits.amplitude");
   // Ecal tdc
-  auto h_tdc_EcalEndcapPRawHits = d0.Histo1D({"h_tdc_EcalEndcapPRawHits", "EcalEndcapP; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapPRawHits.time");
-  auto h_tdc_EcalBarrelImagingRawHits = d0.Histo1D({"h_tdc_EcalBarrelImagingRawHits", "EcalBarrelImaging; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelImagingRawHits.time");
-  auto h_tdc_EcalBarrelScFiRawHits = d0.Histo1D({"h_tdc_EcalBarrelScFiRawHits", "EcalBarrelScFi; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelScFiRawHits.time");
-  auto h_tdc_EcalEndcapNRawHits = d0.Histo1D({"h_tdc_EcalEndcapNRawHits", "EcalEndcapN; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapNRawHits.time");
+  auto h_tdc_EcalEndcapPRawHits = d0.Histo1D({"h_tdc_EcalEndcapPRawHits", "EcalEndcapP; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapPRawHits.timeStamp");
+  auto h_tdc_EcalBarrelImagingRawHits = d0.Histo1D({"h_tdc_EcalBarrelImagingRawHits", "EcalBarrelImaging; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelImagingRawHits.timeStamp");
+  auto h_tdc_EcalBarrelScFiRawHits = d0.Histo1D({"h_tdc_EcalBarrelScFiRawHits", "EcalBarrelScFi; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelScFiRawHits.timeStamp");
+  auto h_tdc_EcalEndcapNRawHits = d0.Histo1D({"h_tdc_EcalEndcapNRawHits", "EcalEndcapN; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapNRawHits.timeStamp");
   // Hcal hits
   auto h_n_HcalEndcapPRawHits = d0.Histo1D({"h_n_HcalEndcapPRawHits", "HcalEndcapP; hits; counts", 100, 0, 1000}, "n_HcalEndcapPRawHits");
   auto h_n_HcalBarrelRawHits  = d0.Histo1D({"h_n_HcalBarrelRawHits",  "HcalBarrel; hits; counts", 100, 0, 1000}, "n_HcalBarrelRawHits");
@@ -118,9 +118,9 @@ int rec_analysis_raw(const std::string& config_name)
   auto h_adc_HcalBarrelRawHits  = d0.Histo1D({"h_adc_HcalBarrelRawHits",  "HcalBarrel; hits; counts", 1024, 0, 32768}, "HcalBarrelRawHits.amplitude");
   auto h_adc_HcalEndcapNRawHits = d0.Histo1D({"h_adc_HcalEndcapNRawHits", "HcalEndcapN; hits; counts", 1024, 0, 32768}, "HcalEndcapNRawHits.amplitude");
   // Hcal tdc
-  auto h_tdc_HcalEndcapPRawHits = d0.Histo1D({"h_tdc_HcalEndcapPRawHits", "HcalEndcapP; TDC channel; counts", 1024, 0, 32768}, "HcalEndcapPRawHits.time");
-  auto h_tdc_HcalBarrelRawHits  = d0.Histo1D({"h_tdc_HcalBarrelRawHits",  "HcalBarrel; TDC channel; counts", 1024, 0, 32768}, "HcalBarrelRawHits.time");
-  auto h_tdc_HcalEndcapNRawHits = d0.Histo1D({"h_tdc_HcalEndcapNRawHits", "HcalEndcapN; TDC channel; counts", 1024, 0, 32768}, "HcalEndcapNRawHits.time");
+  auto h_tdc_HcalEndcapPRawHits = d0.Histo1D({"h_tdc_HcalEndcapPRawHits", "HcalEndcapP; TDC channel; counts", 1024, 0, 32768}, "HcalEndcapPRawHits.timeStamp");
+  auto h_tdc_HcalBarrelRawHits  = d0.Histo1D({"h_tdc_HcalBarrelRawHits",  "HcalBarrel; TDC channel; counts", 1024, 0, 32768}, "HcalBarrelRawHits.timeStamp");
+  auto h_tdc_HcalEndcapNRawHits = d0.Histo1D({"h_tdc_HcalEndcapNRawHits", "HcalEndcapN; TDC channel; counts", 1024, 0, 32768}, "HcalEndcapNRawHits.timeStamp");
 
   // other detector stats
   //auto stats_n_B0PreshowerRawHits = d0.Stats("n_B0PreshowerRawHits");

benchmarks/dis/config.yml

+dis:compile:
+  stage: compile
+  extends: .compile_benchmark
+  script:
+    - compile_analyses.py dis
+
 dis:generate:
   stage: generate
   extends: .phy_benchmark
-  needs: ["common:detector"]
+  needs: ["common:detector", "dis:compile"]
   parallel:
     matrix:
       - EBEAM: 5
@@ -17,7 +23,7 @@ dis:generate:
 dis:process:
   stage: process
   extends: .phy_benchmark
-  needs: ["common:detector", "dis:generate"]
+  needs: ["dis:generate"]
   parallel:
     matrix:
       - EBEAM: 5
@@ -28,7 +34,6 @@ dis:process:
         PBEAM: 275
   timeout: 2 hour
   script:
-    - compile_analyses.py dis
     - bash benchmarks/dis/dis.sh --config dis_${EBEAM}x${PBEAM} --ebeam ${EBEAM} --pbeam ${PBEAM}
   retry:
     max: 2

benchmarks/dis/dis.sh

@@ -3,7 +3,7 @@
 ## =============================================================================
 ## Run the DIS benchmarks in 5 steps:
 ## 1. Parse the command line and setup environment
-## 2. Detector simulation through npsim
+## 2. Detector simulation through ddsim
 ## 3. Digitization and reconstruction through Juggler
 ## 4. Root-based Physics analyses
 ## 5. Finalize
@@ -48,7 +48,7 @@ source benchmarks/dis/env.sh
 ## Get a unique file names based on the configuration options
 GEN_FILE=${INPUT_PATH}/gen-${CONFIG}_${JUGGLER_N_EVENTS}.hepmc
 
-SIM_FILE=${TMP_PATH}/sim-${CONFIG}.root
+SIM_FILE=${TMP_PATH}/sim-${CONFIG}.edm4hep.root
 SIM_LOG=${TMP_PATH}/sim-${CONFIG}.log
 
 
@@ -60,17 +60,20 @@ PLOT_TAG=${CONFIG}
 ## =============================================================================
 ## Step 2: Run the simulation
 echo "Running Geant4 simulation"
-npsim --runType batch \
+if [ ! -f ${SIM_FILE} ] ; then
+ddsim --runType batch \
       --part.minimalKineticEnergy 1000*GeV  \
+      --filter.tracker edep0 \
       -v INFO \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
       --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
       --inputFiles ${GEN_FILE} \
       --outputFile ${SIM_FILE}
 if [ "$?" -ne "0" ] ; then
-  echo "ERROR running npsim"
+  echo "ERROR running ddsim"
   exit 1
 fi
+fi
 
 ## =============================================================================
 ## Step 3: Run digitization & reconstruction
@@ -110,11 +113,13 @@ cat << EOF > ${CONFIG}
   "test_tag": "${BEAM_TAG}"
 }
 EOF
-root -b -q "benchmarks/dis/analysis/dis_electrons.cxx+(\"${CONFIG}\")"
-if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR running dis_electron script"
-  exit 1
-fi
+
+#FIXME DIS analysis disabled
+#root -b -q "benchmarks/dis/analysis/dis_electrons.cxx+(\"${CONFIG}\")"
+#if [[ "$?" -ne "0" ]] ; then
+#  echo "ERROR running dis_electron script"
+#  exit 1
+#fi
 
 CONFIG="${TMP_PATH}/${PLOT_TAG}.raw.json"
 cat << EOF > ${CONFIG}

benchmarks/dvcs/config.yml

+dvcs:compile:
+  stage: compile
+  extends: .compile_benchmark
+  script:
+    - compile_analyses.py dvcs
+
 dvcs:process:
   stage: process
   extends: .phy_benchmark
   tags:
     - phy
-  needs: ["common:detector"]
+  needs: ["common:detector", "dvcs:compile"]
   script:
-    - compile_analyses.py dvcs
-    - bash benchmarks/dvcs/dvcs.sh --all
+    #- bash benchmarks/dvcs/dvcs.sh --all
+    - bash benchmarks/dvcs/dvcs.sh --data-init --sim --rec
 
 dvcs:results:
   stage: collect

benchmarks/dvcs/dvcs.sh

@@ -74,7 +74,7 @@ FILE_NAME_TAG="dvcs"
 DATA_URL="S3/eictest/ATHENA/EVGEN/DVCS/DVCS_10x100_2M/DVCS.1.hepmc"
 
 export JUGGLER_MC_FILE="${LOCAL_DATA_PATH}/mc_${FILE_NAME_TAG}.hepmc"
-export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.root"
+export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="${LOCAL_DATA_PATH}/rec_${FILE_NAME_TAG}.root"
 
 echo "FILE_NAME_TAG       = ${FILE_NAME_TAG}"
@@ -100,15 +100,16 @@ fi
 ### Step 2. Run the simulation (geant4)
 if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
   ## run geant4 simulations
-  npsim --runType batch \
+  ddsim --runType batch \
     --part.minimalKineticEnergy 1000*GeV  \
+    --filter.tracker edep0 \
     -v ERROR \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
     --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
     --inputFiles "${JUGGLER_MC_FILE}" \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running npsim"
+    echo "ERROR running ddsim"
     exit 1
   fi
 fi

benchmarks/dvmp/analysis/vm_invar.cxx

@@ -83,7 +83,7 @@ int vm_invar(const std::string& config_name)
 
   // Define analysis flow
   auto d_im = d.Define("p_rec_sorted", momenta_sort_rec, {"ReconstructedParticles"})
-                  .Define("p_sim_sorted", momenta_sort_sim, {"mcparticles"})
+                  .Define("p_sim_sorted", momenta_sort_sim, {"MCParticles"})
                   .Define("N", "p_rec_sorted.size()")
                   .Define("invariant_quantities_rec", util::calc_inv_quant, {"p_rec_sorted"})
                   .Define("invariant_quantities_sim", util::calc_inv_quant, {"p_sim_sorted"})

benchmarks/dvmp/analysis/vm_mass.cxx

@@ -94,11 +94,11 @@ int vm_mass(const std::string& config_name)
     return common_bench::find_decay_pair(parts, vm_mass, decay_mass);
   };
 
-  // common_bench::PrintGeant4(mcparticles);
+  // common_bench::PrintGeant4(MCParticles);
   // Define analysis flow
   auto d_im = d.Define("p_rec", common_bench::momenta_RC, {"ReconstructedParticles"})       //using dummy rc
                   .Define("N", "p_rec.size()")
-                  .Define("p_sim", common_bench::momenta_from_simulation, {"mcparticles"})
+                  .Define("p_sim", common_bench::momenta_from_simulation, {"MCParticles"})
                   .Define("decay_pair_rec", find_decay_pair, {"p_rec"})
                   .Define("decay_pair_sim", find_decay_pair, {"p_sim"})
                   .Define("p_vm_rec", "decay_pair_rec.first + decay_pair_rec.second")

benchmarks/dvmp/config.yml

+dvmp:compile:
+  stage: compile
+  extends: .compile_benchmark
+  script:
+    - compile_analyses.py dvmp
+
 dvmp:generate:
-  needs: ["common:detector"]
+  needs: ["common:detector", "dvmp:compile"]
   image: eicweb.phy.anl.gov:4567/monte_carlo/lager/lager:unstable
   extends: .phy_benchmark
   stage: generate
@@ -14,11 +20,9 @@ dvmp:generate:
 dvmp:process:
   stage: process
   extends: .phy_benchmark
-  needs: ["common:detector", "dvmp:generate"]
+  needs: ["dvmp:generate"]
   timeout: 2 hour
   script:
-    - ls -lrth
-    - compile_analyses.py dvmp
     - ls -lrth
     - run_many.py ./benchmarks/dvmp/dvmp.sh 
           -c jpsi_barrel 

benchmarks/dvmp/dvmp.sh

@@ -3,7 +3,7 @@
 ## =============================================================================
 ## Run the DVMP benchmarks in 5 steps:
 ## 1. Parse the command line and setup environment
-## 2. Detector simulation through npsim
+## 2. Detector simulation through ddsim
 ## 3. Digitization and reconstruction through Juggler
 ## 4. Root-based Physics analyses
 ## 5. Finalize
@@ -44,7 +44,7 @@ source benchmarks/dvmp/env.sh
 ## Get a unique file names based on the configuration options
 GEN_FILE=${INPUT_PATH}/gen-${CONFIG}_${DECAY}_${JUGGLER_N_EVENTS}.hepmc
 
-SIM_FILE=${TMP_PATH}/sim-${CONFIG}_${DECAY}.root
+SIM_FILE=${TMP_PATH}/sim-${CONFIG}_${DECAY}.edm4hep.root
 SIM_LOG=${TMP_PATH}/sim-${CONFIG}_${DECAY}.log
 
 
@@ -60,15 +60,16 @@ ls -lrth
 ls -lrth input
 echo ${TMP_PATH}
 ls -lrth ${TMP_PATH}
-npsim --runType batch \
+ddsim --runType batch \
       --part.minimalKineticEnergy 100*GeV  \
+      --filter.tracker edep0 \
       -v WARNING \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
       --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
       --inputFiles ${GEN_FILE} \
       --outputFile ${SIM_FILE}
 if [ "$?" -ne "0" ] ; then
-  echo "ERROR running npsim"
+  echo "ERROR running ddsim"
   exit 1
 fi
 

benchmarks/single/config.yml

+single:compile:
+  extends: .compile_benchmark
+  stage: compile
+  script:
+    - compile_analyses.py single
+
 single:process:
   extends: .phy_benchmark
   timeout: 24 hours
   stage: process
+  needs: ["common:detector", "single:compile"]
   script:
-    - compile_analyses.py single
     - bash benchmarks/single/single.sh e-_1GeV_45to135deg

benchmarks/single/single.sh

@@ -6,20 +6,21 @@ fi
 
 export JUGGLER_FILE_NAME_TAG="${1:-e-_1GeV_45to135deg}"
 export JUGGLER_GEN_FILE="benchmarks/single/${JUGGLER_FILE_NAME_TAG}.steer"
-export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.root"
+export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 # Simulate
-npsim --runType run \
+ddsim --runType run \
       --printLevel WARNING \
       --enableGun \
       --steeringFile ${JUGGLER_GEN_FILE} \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
       --part.minimalKineticEnergy 1*TeV  \
+      --filter.tracker edep0 \
       --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
       --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then
-  echo "ERROR running npsim"
+  echo "ERROR running ddsim"
   exit 1
 fi
 

benchmarks/synchrotron/analysis/synchrotron_sim.cxx

@@ -20,7 +20,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
 
 #include "eicd/ReconstructedParticleCollection.h"
 
-void synchrotron_sim(const char* fname = "sim_synchrotron.root"){
+void synchrotron_sim(const char* fname = "sim_synchrotron.edm4hep.root"){
 
   fmt::print(fmt::emphasis::bold | fg(fmt::color::forest_green), "Running synchrotron analysis...\n");
 

benchmarks/synchrotron/config.yml

+synchrotron:compile:
+  stage: compile
+  extends: .compile_benchmark
+  script:
+    - compile_analyses.py synchrotron
+
 synchrotron:process:
   stage: process
   extends: .phy_benchmark
   tags:
     - s3
-  needs: ["common:detector"]
+  needs: ["common:detector", "synchrotron:compile"]
   script:
-    - compile_analyses.py synchrotron
     - bash benchmarks/synchrotron/synchrotron.sh --all
 
 synchrotron:results:

benchmarks/synchrotron/synchrotron.sh

@@ -74,7 +74,7 @@ FILE_NAME_TAG="synchrotron"
 DATA_URL="S3/eictest/ATHENA/EVGEN/SR/SR.10GeV_5kVthreshold_hepmc/25098.hepmc"
 
 export JUGGLER_MC_FILE="${LOCAL_DATA_PATH}/mc_${FILE_NAME_TAG}.hepmc"
-export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.root"
+export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="${LOCAL_DATA_PATH}/rec_${FILE_NAME_TAG}.root"
 
 echo "FILE_NAME_TAG       = ${FILE_NAME_TAG}"
@@ -100,7 +100,7 @@ fi
 ### Step 2. Run the simulation (geant4)
 if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
   ## run geant4 simulations
-  npsim --runType batch \
+  ddsim --runType batch \
     --part.minimalKineticEnergy 1000*GeV  \
     --filter.tracker edep0 \
     -v ERROR \
@@ -109,7 +109,7 @@ if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
     --inputFiles ${JUGGLER_MC_FILE} \
     --outputFile ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running npsim"
+    echo "ERROR running ddsim"
     exit 1
   fi
 fi

benchmarks/tcs/analysis/tcs_tests.cxx

@@ -35,8 +35,10 @@ void tcs_tests(const char* fname = "rec_tcs.root"){
   ) -> std::vector<float> {
     std::vector<float> theta;
     for (const auto& p: v)
-      if (p.status == status)
-        theta.push_back(1000. * p.direction.theta);
+      if (p.status == status) {
+        const auto& mom = p.p;
+        theta.push_back(1000. * std::atan2(std::hypot(mom.x, mom.y), mom.z));
+      }
     return theta;
   };
 

benchmarks/tcs/config.yml

+tcs:compile:
+  stage: compile
+  extends: .compile_benchmark
+  script:
+    - compile_analyses.py tcs
+
 tcs:process:
   stage: process
   extends: .phy_benchmark
   tags:
     - phy
-  needs: ["common:detector"]
+  needs: ["common:detector", "tcs:compile"]
   parallel:
     matrix:
       - EBEAM: 5
@@ -16,8 +22,8 @@ tcs:process:
         PBEAM: 275
         TAG: s800
   script:
-    - compile_analyses.py tcs
-    - bash benchmarks/tcs/tcs.sh --all --ebeam ${EBEAM} --pbeam ${PBEAM} --tag ${TAG}
+    #- bash benchmarks/tcs/tcs.sh --all --ebeam ${EBEAM} --pbeam ${PBEAM} --tag ${TAG}
+    - bash benchmarks/tcs/tcs.sh --data-init --sim --rec --ebeam ${EBEAM} --pbeam ${PBEAM} --tag ${TAG}
 
 tcs:results:
   stage: collect

benchmarks/tcs/tcs.sh

@@ -95,7 +95,7 @@ FILE_NAME_TAG="tcs"
 DATA_URL="S3/eictest/ATHENA/EVGEN/EXCLUSIVE/TCS_ABCONV/${EBEAM}x${PBEAM}/hel_minus/TCS_gen_ab_hiAcc_${EBEAM}x${PBEAM}m_${TAG}_novtx.hepmc.gz"
 
 export JUGGLER_MC_FILE="${LOCAL_DATA_PATH}/mc_${FILE_NAME_TAG}.hepmc"
-export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.root"
+export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="${LOCAL_DATA_PATH}/rec_${FILE_NAME_TAG}.root"
 
 echo "FILE_NAME_TAG       = ${FILE_NAME_TAG}"
@@ -121,15 +121,16 @@ fi
 ### Step 2. Run the simulation (geant4)
 if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
   ## run geant4 simulations
-  npsim --runType batch \
+  ddsim --runType batch \
     --part.minimalKineticEnergy 1000*GeV  \
+    --filter.tracker edep0 \
     -v ERROR \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
     --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
     --inputFiles "${JUGGLER_MC_FILE}" \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [ "$?" -ne "0" ] ; then
-    echo "ERROR running npsim"
+    echo "ERROR running ddsim"
     exit 1
   fi
 fi

benchmarks/u_omega/config.yml

+u_omega:compile:
+  stage: compile
+  extends: .compile_benchmark
+  script:
+    - compile_analyses.py u_omega
+
 u_omega:process:
   stage: process
   extends: .phy_benchmark
   tags:
     - phy
-  needs: ["common:detector"]
+  needs: ["common:detector", "u_omega:compile"]
   script:
-    - compile_analyses.py u_omega
-    - bash benchmarks/u_omega/u_omega.sh --all
+    #- bash benchmarks/u_omega/u_omega.sh --all
+    - bash benchmarks/u_omega/u_omega.sh --data-init --sim --rec
 
 u_omega:results:
   stage: collect