From c913d4e026b0665f2f8411a597074c11e0f02987 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 2 Apr 2019 11:32:12 +0200
Subject: [PATCH] fixed NullModel
---
Processes/NullModel/NullModel.cc | 30 +++++++++++++++-------------
Processes/NullModel/NullModel.h | 4 ++--
Processes/NullModel/testNullModel.cc | 2 +-
3 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/Processes/NullModel/NullModel.cc b/Processes/NullModel/NullModel.cc
index c99a464b4..802ee5b4a 100644
--- a/Processes/NullModel/NullModel.cc
+++ b/Processes/NullModel/NullModel.cc
@@ -14,21 +14,23 @@
#include <corsika/setup/SetupTrajectory.h>
using namespace corsika;
-using namespace corsika::process::null_model;
+namespace corsika::process::null_model {
-void corsika::process::null_model::NullModel::Init() {}
+ void NullModel::Init() {}
-NullModel::NullModel(units::si::LengthType maxStepLength)
- : fMaxStepLength(maxStepLength) {}
+ NullModel::NullModel(units::si::LengthType maxStepLength)
+ : fMaxStepLength(maxStepLength) {}
-template <>
-process::EProcessReturn NullModel::DoContinuous(setup::Stack::ParticleType&,
- setup::Trajectory&, setup::Stack&) const {
- return process::EProcessReturn::eOk;
-}
+ template <>
+ process::EProcessReturn NullModel::DoContinuous(setup::Stack::ParticleType&,
+ setup::Trajectory&) const {
+ return process::EProcessReturn::eOk;
+ }
-template <>
-units::si::LengthType NullModel::MaxStepLength(setup::Stack::ParticleType&,
- setup::Trajectory&) const {
- return fMaxStepLength;
-}
+ template <>
+ units::si::LengthType NullModel::MaxStepLength(setup::Stack::ParticleType&,
+ setup::Trajectory&) const {
+ return fMaxStepLength;
+ }
+
+} // namespace corsika::process::null_model
diff --git a/Processes/NullModel/NullModel.h b/Processes/NullModel/NullModel.h
index 5579d69f8..db157b55f 100644
--- a/Processes/NullModel/NullModel.h
+++ b/Processes/NullModel/NullModel.h
@@ -25,8 +25,8 @@ namespace corsika::process::null_model {
void Init();
- template <typename Particle, typename Track, typename Stack>
- process::EProcessReturn DoContinuous(Particle&, Track&, Stack&) const;
+ template <typename Particle, typename Track>
+ process::EProcessReturn DoContinuous(Particle&, Track&) const;
template <typename Particle, typename Track>
corsika::units::si::LengthType MaxStepLength(Particle&, Track&) const;
diff --git a/Processes/NullModel/testNullModel.cc b/Processes/NullModel/testNullModel.cc
index ed639eca4..4ab4c0422 100644
--- a/Processes/NullModel/testNullModel.cc
+++ b/Processes/NullModel/testNullModel.cc
@@ -55,7 +55,7 @@ TEST_CASE("NullModel", "[processes]") {
model.Init();
[[maybe_unused]] const process::EProcessReturn ret =
- model.DoContinuous(particle, track, stack);
+ model.DoContinuous(particle, track);
LengthType const length = model.MaxStepLength(particle, track);
CHECK((length / 10_m) == Approx(1));
--
GitLab