From 4d9d3a12615b8e7f5d8852f68873d36a6c1bc31e Mon Sep 17 00:00:00 2001
From: Felix Riehn <felix@matilda>
Date: Thu, 30 Apr 2020 17:00:11 +0100
Subject: [PATCH] getter for all_particles
---
Documentation/Examples/particle_list_example.cc | 2 +-
Framework/Particles/ParticleProperties.h | 4 ++++
Processes/Sibyll/ParticleConversion.cc | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/Examples/particle_list_example.cc b/Documentation/Examples/particle_list_example.cc
index 8ba18fa3c..c9fc8812d 100644
--- a/Documentation/Examples/particle_list_example.cc
+++ b/Documentation/Examples/particle_list_example.cc
@@ -38,7 +38,7 @@ int main() {
<< " | " << std::setw(18) << "SIBYLL-mass (GeV)"
<< " | " << endl;
cout << std::setw(104) << std::setfill('-') << "-" << endl;
- for (auto p : corsika::particles::detail::all_particles) {
+ for (auto p : getAllParticles()) {
if (!IsNucleus(p)) {
auto const sib_id = static_cast<int>(corsika::process::sibyll::ConvertToSibyll(p));
auto const sib_mass = corsika::process::sibyll::GetSibyllMass(p) / 1_GeV;
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index dbac43ac4..baafb57e7 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -152,6 +152,10 @@ namespace corsika::particles {
return Proton::GetMass() * vZ + (vA - vZ) * Neutron::GetMass();
}
+ std::initializer_list<Code> constexpr getAllParticles() {
+ return detail::all_particles;
+ }
+
} // namespace corsika::particles
#endif
diff --git a/Processes/Sibyll/ParticleConversion.cc b/Processes/Sibyll/ParticleConversion.cc
index 96cf2fa21..f35bead59 100644
--- a/Processes/Sibyll/ParticleConversion.cc
+++ b/Processes/Sibyll/ParticleConversion.cc
@@ -25,4 +25,3 @@ corsika::units::si::HEPMassType corsika::process::sibyll::GetSibyllMass(
else
return sqrt(get_sibyll_mass2(sCode)) * 1_GeV;
}
-
--
GitLab