From 7a3f337a3e6fc3a9822996ede5698ed05c8583cd Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@tu-dortmund.de>
Date: Fri, 20 Nov 2020 13:33:04 +0100
Subject: [PATCH] update modules usage of get_PDG()
---
corsika/detail/modules/ObservationPlane.inl | 2 +-
corsika/detail/modules/TrackWriter.inl | 2 +-
corsika/detail/modules/pythia8/Decay.inl | 6 +++---
corsika/detail/modules/pythia8/Interaction.inl | 14 +++++++-------
corsika/detail/modules/urqmd/UrQMD.inl | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl
index ff998e0aa..a63fc3588 100644
--- a/corsika/detail/modules/ObservationPlane.inl
+++ b/corsika/detail/modules/ObservationPlane.inl
@@ -35,7 +35,7 @@ namespace corsika::observation_plane {
return corsika::EProcessReturn::eOk;
}
- outputStream_ << static_cast<int>(corsika::PDG(particle.GetPID())) << ' '
+ outputStream_ << static_cast<int>(corsika::get_PDG(particle.GetPID())) << ' '
<< particle.GetEnergy() * (1 / 1_eV) << ' '
<< (trajectory.GetPosition(1) - plane_.GetCenter()).norm() / 1_m
<< std::endl;
diff --git a/corsika/detail/modules/TrackWriter.inl b/corsika/detail/modules/TrackWriter.inl
index e9f232a49..bb6cb9689 100644
--- a/corsika/detail/modules/TrackWriter.inl
+++ b/corsika/detail/modules/TrackWriter.inl
@@ -35,7 +35,7 @@ namespace corsika::track_writer {
const TTrack& vT) {
auto const start = vT.GetPosition(0).GetCoordinates();
auto const delta = vT.GetPosition(1).GetCoordinates() - start;
- auto const pdg = static_cast<int>(corsika::PDG(vP.GetPID()));
+ auto const pdg = static_cast<int>(corsika::get_PDG(vP.GetPID()));
// clang-format off
fFile << std::setw(7) << pdg
diff --git a/corsika/detail/modules/pythia8/Decay.inl b/corsika/detail/modules/pythia8/Decay.inl
index 6352f2d88..a8315ee82 100644
--- a/corsika/detail/modules/pythia8/Decay.inl
+++ b/corsika/detail/modules/pythia8/Decay.inl
@@ -50,12 +50,12 @@ namespace corsika::pythia8 {
void Decay::SetUnstable(const corsika::Code pCode) {
std::cout << "Pythia::Decay: setting " << pCode << " unstable.." << std::endl;
- fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), true);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), true);
}
void Decay::SetStable(const corsika::Code pCode) {
std::cout << "Pythia::Decay: setting " << pCode << " stable.." << std::endl;
- fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), false);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), false);
}
template <typename TParticle>
@@ -93,7 +93,7 @@ namespace corsika::pythia8 {
Decay::SetUnstable(vP.GetPID());
// input particle PDG
- auto const pdgCode = static_cast<int>(corsika::PDG(vP.GetPID()));
+ auto const pdgCode = static_cast<int>(corsika::get_PDG(vP.GetPID()));
auto const pcomp = vP.GetMomentum().GetComponents();
double px = pcomp[0] / 1_GeV;
diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl
index 65fa5de07..dd92d06a6 100644
--- a/corsika/detail/modules/pythia8/Interaction.inl
+++ b/corsika/detail/modules/pythia8/Interaction.inl
@@ -77,12 +77,12 @@ namespace corsika::pythia8 {
void Interaction::SetUnstable(const corsika::Code pCode) {
std::cout << "Pythia::Interaction: setting " << pCode << " unstable.." << std::endl;
- fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), true);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), true);
}
void Interaction::SetStable(const corsika::Code pCode) {
std::cout << "Pythia::Interaction: setting " << pCode << " stable.." << std::endl;
- fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), false);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), false);
}
void Interaction::ConfigureLabFrameCollision(const corsika::Code BeamId,
@@ -93,15 +93,15 @@ namespace corsika::pythia8 {
// set beam
// beam id for pythia
- auto const pdgBeam = static_cast<int>(corsika::PDG(BeamId));
+ auto const pdgBeam = static_cast<int>(corsika::get_PDG(BeamId));
std::stringstream stBeam;
stBeam << "Beams:idA = " << pdgBeam;
fPythia.readString(stBeam.str());
// set target
- auto pdgTarget = static_cast<int>(corsika::PDG(TargetId));
+ auto pdgTarget = static_cast<int>(corsika::get_PDG(TargetId));
// replace hydrogen with proton, otherwise pythia goes into heavy ion mode!
if (TargetId == corsika::Code::Hydrogen)
- pdgTarget = static_cast<int>(corsika::PDG(corsika::Code::Proton));
+ pdgTarget = static_cast<int>(corsika::get_PDG(corsika::Code::Proton));
std::stringstream stTarget;
stTarget << "Beams:idB = " << pdgTarget;
fPythia.readString(stTarget.str());
@@ -131,8 +131,8 @@ namespace corsika::pythia8 {
if (TargetId == corsika::Code::Proton || TargetId == corsika::Code::Hydrogen) {
if (CanInteract(BeamId) && ValidCoMEnergy(CoMenergy)) {
// input particle PDG
- auto const pdgCodeBeam = static_cast<int>(corsika::PDG(BeamId));
- auto const pdgCodeTarget = static_cast<int>(corsika::PDG(TargetId));
+ auto const pdgCodeBeam = static_cast<int>(corsika::get_PDG(BeamId));
+ auto const pdgCodeTarget = static_cast<int>(corsika::get_PDG(TargetId));
const double ecm = CoMenergy / 1_GeV;
// calculate cross section
diff --git a/corsika/detail/modules/urqmd/UrQMD.inl b/corsika/detail/modules/urqmd/UrQMD.inl
index 558b44d74..f292ccce9 100644
--- a/corsika/detail/modules/urqmd/UrQMD.inl
+++ b/corsika/detail/modules/urqmd/UrQMD.inl
@@ -310,7 +310,7 @@ namespace corsika::urqmd {
{443, {135, 0}}, // jpsi
};
- return mapPDGToUrQMD.at(static_cast<int>(PDG(code)));
+ return mapPDGToUrQMD.at(static_cast<int>(get_PDG(code)));
}
} // namespace corsika::urqmd
--
GitLab