From 4caa603438bcdae007a8e42daf84d14e01fffb0b Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 14 Feb 2024 21:17:14 +0000
Subject: [PATCH] fix: use [EH]calFarForwardZDCHits
---
benchmarks/zdc/config.yml | 5 +----
benchmarks/zdc/scripts/analysis_zdc_particles.cxx | 12 ++++++------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/benchmarks/zdc/config.yml b/benchmarks/zdc/config.yml
index 2c299366..e0343925 100644
--- a/benchmarks/zdc/config.yml
+++ b/benchmarks/zdc/config.yml
@@ -6,7 +6,6 @@ sim:zdc:
parallel:
matrix:
- PARTICLE: ["neutron", "photon"]
- allow_failure: true
bench:zdc_benchmark:
extends: .det_benchmark
@@ -14,11 +13,10 @@ bench:zdc_benchmark:
needs:
- ["sim:zdc"]
script:
- - root -b -q benchmarks/zdc/scripts/zdc_analysis.cxx+
+ - root -b -q 'benchmarks/zdc/scripts/zdc_analysis.cxx+("sim_output/sim_zdc_'${PARTICLE}'.edm4hep.root", "results/far_forward/zdc/'${PARTICLE}'")'
parallel:
matrix:
- PARTICLE: ["neutron", "photon"]
- allow_failure: true
collect_results:zdc:
extends: .det_benchmark
@@ -27,4 +25,3 @@ collect_results:zdc:
- ["bench:zdc_benchmark"]
script:
- ls -lrht
- allow_failure: true
diff --git a/benchmarks/zdc/scripts/analysis_zdc_particles.cxx b/benchmarks/zdc/scripts/analysis_zdc_particles.cxx
index c3339ce7..50026918 100644
--- a/benchmarks/zdc/scripts/analysis_zdc_particles.cxx
+++ b/benchmarks/zdc/scripts/analysis_zdc_particles.cxx
@@ -89,14 +89,14 @@ void analysis_zdc_particles(
// Define variables
auto d1 = d0
.Define("Ethr", Ethr, {"MCParticles"})
- .Define("nhits_Ecal", nhits, {"ZDCEcalHits"})
- .Define("Esim_Ecal", Esim, {"ZDCEcalHits"})
+ .Define("nhits_Ecal", nhits, {"EcalFarForwardZDCHits"})
+ .Define("Esim_Ecal", Esim, {"EcalFarForwardZDCHits"})
.Define("fsam_Ecal", fsam, {"Esim_Ecal", "Ethr"})
- .Define("nhits_Hcal", nhits, {"ZDCHcalHits"})
- .Define("Esim_Hcal", Esim, {"ZDCHcalHits"})
+ .Define("nhits_Hcal", nhits, {"HcalFarForwardZDCHits"})
+ .Define("Esim_Hcal", Esim, {"HcalFarForwardZDCHits"})
.Define("fsam_Hcal", fsam, {"Esim_Hcal", "Ethr"})
- .Define("hit_x_position", hit_x_position, {"ZDCHcalHits"})
- .Define("hit_y_position", hit_y_position, {"ZDCHcalHits"})
+ .Define("hit_x_position", hit_x_position, {"HcalFarForwardZDCHits"})
+ .Define("hit_y_position", hit_y_position, {"HcalFarForwardZDCHits"})
;
// Define Histograms
--
GitLab