diff --git a/benchmarks/zdc/config.yml b/benchmarks/zdc/config.yml index 2c29936666b371358518ef7a9c9eaf0b77b4a7a8..e034392590ab61ff3983e03fe780ff3abfe905ab 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 c3339ce7bf63668dc2354a5c97244708551f7a53..5002691808752727a3d0cc6e521675b48ab1247e 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