fixed rebase

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;
   }
 

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
 
 /**