From dadf106e59a17fc9df3e94c1df1ba6ae775b3c64 Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu>
Date: Tue, 17 Nov 2020 13:20:14 +0100
Subject: [PATCH] some processes
---
corsika/detail/modules/ObservationPlane.inl | 4 ++--
corsika/detail/modules/TrackWriter.inl | 2 +-
corsika/detail/modules/energy_loss/BetheBlochPDG.inl | 2 +-
tests/modules/testObservationPlane.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl
index f588eb5f6..ff998e0aa 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 8a6f1e5c2..e9f232a49 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 73ac05661..a1f36ea07 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 193daa647..890bd5441 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();
--
GitLab