diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl index f588eb5f63164d6064c93f6bf44ffbbd94f033f5..ff998e0aaed15f01b449aad56dffdd9b76a2665b 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::GetPDG(particle.GetPID())) << ' ' + outputStream_ << static_cast<int>(corsika::PDG(particle.GetPID())) << ' ' << particle.GetEnergy() * (1 / 1_eV) << ' ' << (trajectory.GetPosition(1) - plane_.GetCenter()).norm() / 1_m << std::endl; @@ -63,4 +63,4 @@ namespace corsika::observation_plane { return (trajectory.GetR0() - pointOfIntersection).norm() * 1.0001; } -} // namespace corsika::observation_plane \ No newline at end of file +} // namespace corsika::observation_plane diff --git a/corsika/detail/modules/TrackWriter.inl b/corsika/detail/modules/TrackWriter.inl index 8a6f1e5c242644691d1cc9b7f481e28aa8811056..e9f232a49466c3a519a486ad00a6e1be553d47a4 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::GetPDG(vP.GetPID())); + auto const pdg = static_cast<int>(corsika::PDG(vP.GetPID())); // clang-format off fFile << std::setw(7) << pdg diff --git a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl index 73ac0566129cc30be971aca344975146dc6fdfbb..a1f36ea07fbef7f0c4e9f0ed1c5cd79789928865 100644 --- a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl +++ b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl @@ -70,7 +70,7 @@ namespace corsika::energy_loss { double const gamma = E / m; int const Z = p.GetChargeNumber(); int const Z2 = Z * Z; - HEPMassType constexpr me = corsika::Electron::GetMass(); + HEPMassType constexpr me = corsika::Electron::mass(); auto const m2 = m * m; auto constexpr me2 = me * me; double const gamma2 = gamma * gamma; diff --git a/tests/modules/testObservationPlane.cpp b/tests/modules/testObservationPlane.cpp index 193daa647ba0b23de470271dba68b21b57fe3fcc..890bd5441d3c30b1a96c9bff7af416092dc09236 100644 --- a/tests/modules/testObservationPlane.cpp +++ b/tests/modules/testObservationPlane.cpp @@ -47,7 +47,7 @@ TEST_CASE("ContinuousProcess interface", "[proccesses][observation_plane]") { std::tuple<Code, HEPEnergyType, corsika::MomentumVector, Point, TimeType>{ Code::NuMu, 1_GeV, corsika::MomentumVector(rootCS, - {0_GeV, 0_GeV, -elab2plab(1_GeV, NuMu::GetMass())}), + {0_GeV, 0_GeV, -elab2plab(1_GeV, NuMu::mass())}), Point(rootCS, {1_m, 1_m, 10_m}), 0_ns}); } auto particle = stack.GetNextParticle();