From 2e05132f26e7848e67b155d3b1a1ff8c625ad69b Mon Sep 17 00:00:00 2001 From: Marshall Scott <mbscott@anl.gov> Date: Fri, 7 May 2021 14:01:53 -0400 Subject: [PATCH] Changed pid function --- .../scripts/emcal_barrel_pions_electrons.cxx | 11 ++--------- .../scripts/emcal_barrel_pions_electrons_analysis.cxx | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons.cxx index 4aff5843..1bdfaea7 100644 --- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons.cxx +++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons.cxx @@ -79,17 +79,10 @@ void emcal_barrel_pions_electrons(int n_events = 1e6, double e_start = 0.0, doub GenVertexPtr v2 = std::make_shared<GenVertex>(); v1->add_particle_in(p1); v1->add_particle_in(p2); - v1->add_particle_out(p3); - v2->add_particle_in(p1); - v2->add_particle_in(p2); - v2->add_particle_out(p4); -/* - if (phi <= M_PI) {v1->add_particle_out(p3);} - if (phi > M_PI) {v1->add_particle_out(p4);} - */ + v1->add_particle_out(p3); + v1->add_particle_out(p4); evt.add_vertex(v1); - evt.add_vertex(v2); if (events_parsed == 0) { std::cout << "First event: " << std::endl; diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx index 140c6c95..fbb52837 100644 --- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx +++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx @@ -70,7 +70,7 @@ void emcal_barrel_pions_electrons_analysis(const char* input_fname = "sim_output // Returns the pdgID of the particle auto getpid = [](std::vector<dd4pod::Geant4ParticleData> const& input) { - return input[2].pdgID; + return {input[2].pdgID, input[3].pdgID}; }; // Returns number of particle daughters -- GitLab