From efbdd4ca978fb717d9842850d155279536e97873 Mon Sep 17 00:00:00 2001
From: Felix Riehn <felix@matilda>
Date: Tue, 4 Dec 2018 12:56:08 +0000
Subject: [PATCH] fixed rebase
---
Documentation/Examples/cascade_example.cc | 6 +++---
Framework/Units/PhysicalUnits.h | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index 2152ec81..a37ced7d 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -339,7 +339,7 @@ public:
void Init() {}
template <typename Particle>
- double MinStepLength(Particle& p) const {
+ double MinStepLength(Particle& p, setup::Trajectory&) const {
EnergyType E = p.GetEnergy();
MassType m = corsika::particles::GetMass(p.GetPID());
// env.GetDensity();
@@ -374,8 +374,8 @@ public:
void DoDiscrete(Particle& p, Stack& s) const {
}
- template <typename Particle, typename Trajectory, typename Stack>
- EProcessReturn DoContinuous(Particle&, Trajectory&, Stack&) const {
+ template <typename Particle, typename Stack>
+ EProcessReturn DoContinuous(Particle&, setup::Trajectory&, Stack&) const {
return EProcessReturn::eOk;
}
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index 0f6c82c2..8a9e9d6f 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -53,7 +53,8 @@ namespace corsika::units::si {
using MassType = phys::units::quantity<phys::units::mass_d, double>;
using MassDensityType = phys::units::quantity<phys::units::mass_density_d, double>;
using CrossSectionType = phys::units::quantity<sigma_d, double>;
-
+ using MomentumType = phys::units::quantity<momentum_d, double>;
+
} // end namespace corsika::units::si
/**
--
GitLab