diff --git a/corsika/detail/modules/pythia8/Decay.inl b/corsika/detail/modules/pythia8/Decay.inl
index 8de31e7d57503ce1d5f617317c261f0635765c6d..6352f2d88e537136da4506db1125ca2295023d57 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::GetPDG(pCode)), true);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::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::GetPDG(pCode)), false);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), false);
}
template <typename TParticle>
@@ -66,7 +66,7 @@ namespace corsika::pythia8 {
const double gamma = E / m;
- const TimeType t0 = corsika::GetLifetime(p.GetPID());
+ const TimeType t0 = corsika::lifetime(p.GetPID());
auto const lifetime = gamma * t0;
return lifetime;
@@ -93,14 +93,14 @@ namespace corsika::pythia8 {
Decay::SetUnstable(vP.GetPID());
// input particle PDG
- auto const pdgCode = static_cast<int>(corsika::GetPDG(vP.GetPID()));
+ auto const pdgCode = static_cast<int>(corsika::PDG(vP.GetPID()));
auto const pcomp = vP.GetMomentum().GetComponents();
double px = pcomp[0] / 1_GeV;
double py = pcomp[1] / 1_GeV;
double pz = pcomp[2] / 1_GeV;
double en = vP.GetEnergy() / 1_GeV;
- double m = corsika::GetMass(vP.GetPID()) / 1_GeV;
+ double m = corsika::mass(vP.GetPID()) / 1_GeV;
// add particle to pythia stack
event.append(pdgCode, 1, 0, 0, px, py, pz, en, m);
@@ -117,7 +117,7 @@ namespace corsika::pythia8 {
for (int i = 0; i < event.size(); ++i)
if (event[i].isFinal()) {
auto const pyId =
- corsika::ConvertFromPDG(static_cast<corsika::PDGCode>(event[i].id()));
+ corsika::convert_from_PDG(static_cast<corsika::PDGCode>(event[i].id()));
HEPEnergyType pyEn = event[i].e() * 1_GeV;
MomentumVector pyP(rootCS, {event[i].px() * 1_GeV, event[i].py() * 1_GeV,
event[i].pz() * 1_GeV});
diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl
index 331f151f8f145d167eeaa7f7a111616b3fa2ad94..65fa5de07df6c2050adedc2bf062623fcab51513 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::GetPDG(pCode)), true);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::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::GetPDG(pCode)), false);
+ fPythia.particleData.mayDecay(static_cast<int>(corsika::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::GetPDG(BeamId));
+ auto const pdgBeam = static_cast<int>(corsika::PDG(BeamId));
std::stringstream stBeam;
stBeam << "Beams:idA = " << pdgBeam;
fPythia.readString(stBeam.str());
// set target
- auto pdgTarget = static_cast<int>(corsika::GetPDG(TargetId));
+ auto pdgTarget = static_cast<int>(corsika::PDG(TargetId));
// replace hydrogen with proton, otherwise pythia goes into heavy ion mode!
if (TargetId == corsika::Code::Hydrogen)
- pdgTarget = static_cast<int>(corsika::GetPDG(corsika::Code::Proton));
+ pdgTarget = static_cast<int>(corsika::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::GetPDG(BeamId));
- auto const pdgCodeTarget = static_cast<int>(corsika::GetPDG(TargetId));
+ auto const pdgCodeBeam = static_cast<int>(corsika::PDG(BeamId));
+ auto const pdgCodeTarget = static_cast<int>(corsika::PDG(TargetId));
const double ecm = CoMenergy / 1_GeV;
// calculate cross section
@@ -236,7 +236,7 @@ namespace corsika::pythia8 {
<< "DoInteraction: " << corsikaBeamId << " interaction? "
<< corsika::pythia8::Interaction::CanInteract(corsikaBeamId) << std::endl;
- if (corsika::IsNucleus(corsikaBeamId)) {
+ if (corsika::is_nucleus(corsikaBeamId)) {
// nuclei handled by different process, this should not happen
throw std::runtime_error("Nuclear projectile are not handled by PYTHIA!");
}
@@ -359,7 +359,7 @@ namespace corsika::pythia8 {
if (!p8p.isFinal()) continue;
auto const pyId =
- corsika::ConvertFromPDG(static_cast<corsika::PDGCode>(p8p.id()));
+ corsika::convert_from_PDG(static_cast<corsika::PDGCode>(p8p.id()));
const MomentumVector pyPlab(
rootCS, {p8p.px() * 1_GeV, p8p.py() * 1_GeV, p8p.pz() * 1_GeV});
diff --git a/tests/modules/testPythia8.cpp b/tests/modules/testPythia8.cpp
index 19ab9b0cc0fdbc693dd0a3aa51cac13242a952e3..ea0f3c4c611d954a1c2707bc15811a608234608d 100644
--- a/tests/modules/testPythia8.cpp
+++ b/tests/modules/testPythia8.cpp
@@ -111,7 +111,7 @@ TEST_CASE("pythia process") {
setup::Stack stack;
const HEPEnergyType E0 = 10_GeV;
HEPMomentumType P0 =
- sqrt(E0 * E0 - corsika::PiPlus::GetMass() * corsika::PiPlus::GetMass());
+ sqrt(E0 * E0 - corsika::PiPlus::mass() * corsika::PiPlus::mass());
auto plab = corsika::MomentumVector(cs, {0_GeV, 0_GeV, -P0});
corsika::Point pos(cs, 0_m, 0_m, 0_m);
auto particle = stack.AddParticle(
@@ -139,7 +139,7 @@ TEST_CASE("pythia process") {
setup::Stack stack;
const HEPEnergyType E0 = 100_GeV;
HEPMomentumType P0 =
- sqrt(E0 * E0 - corsika::PiPlus::GetMass() * corsika::PiPlus::GetMass());
+ sqrt(E0 * E0 - corsika::PiPlus::mass() * corsika::PiPlus::mass());
auto plab = corsika::MomentumVector(cs, {0_GeV, 0_GeV, -P0});
corsika::Point pos(cs, 0_m, 0_m, 0_m);
auto particle = stack.AddParticle(