corsika/detail/framework/geometry/Path.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once
 
 #include <deque>
-#include <corsika/framework/geometry/Point.hpp>
 
 namespace corsika {
 
-  Path::Path(Point const& point) { points_.push_front(point); }
+  inline Path::Path(Point const& point) { points_.push_front(point); }
 
-  Path::Path(std::deque<Point> const& points)
+  inline Path::Path(std::deque<Point> const& points)
       : points_(points) {
     int dequesize_ = points.size();
     if (dequesize_ == 0 || dequesize_ == 1) {
@@ -51,15 +49,21 @@ namespace corsika {
 
   inline LengthType Path::getLength() const { return length_; }
 
-  inline Point Path::getStart() const { return points_.front(); }
+  inline Point const& Path::getStart() const { return points_.front(); }
 
-  inline Point Path::getEnd() const { return points_.back(); }
+  inline Point const& Path::getEnd() const { return points_.back(); }
 
-  inline Point Path::getPoint(std::size_t const index) const { return points_.at(index); }
+  inline Point const& Path::getPoint(std::size_t const index) const {
+    return points_.at(index);
+  }
+
+  inline Path::const_iterator Path::begin() const { return points_.cbegin(); }
+
+  inline Path::const_iterator Path::end() const { return points_.cend(); }
 
-  inline auto Path::begin() { return points_.begin(); }
+  inline Path::iterator Path::begin() { return points_.begin(); }
 
-  inline auto Path::end() { return points_.end(); }
+  inline Path::iterator Path::end() { return points_.end(); }
 
   inline int Path::getNSegments() const { return points_.size() - 1; }
 

corsika/detail/framework/geometry/Plane.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/geometry/Point.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once
@@ -24,46 +23,22 @@ namespace corsika {
   }
 
   inline LengthType Point::getX(CoordinateSystemPtr const& pCS) const {
-    CoordinateSystemPtr const& cs = BaseVector<length_d>::getCoordinateSystem();
-    if (*pCS == *cs) {
-      return BaseVector<length_d>::getQuantityVector().getX();
-    } else {
-      return QuantityVector<length_d>(
-                 get_transformation(*cs.get(), *pCS.get()) *
-                 BaseVector<length_d>::getQuantityVector().eigenVector_)
-          .getX();
-    }
+    return getCoordinates(pCS).getX();
   }
 
   inline LengthType Point::getY(CoordinateSystemPtr const& pCS) const {
-    CoordinateSystemPtr const& cs = BaseVector<length_d>::getCoordinateSystem();
-    if (*pCS == *cs) {
-      return BaseVector<length_d>::getQuantityVector().getY();
-    } else {
-      return QuantityVector<length_d>(
-                 get_transformation(*cs.get(), *pCS.get()) *
-                 BaseVector<length_d>::getQuantityVector().eigenVector_)
-          .getY();
-    }
+    return getCoordinates(pCS).getY();
   }
 
   inline LengthType Point::getZ(CoordinateSystemPtr const& pCS) const {
-    CoordinateSystemPtr const& cs = BaseVector<length_d>::getCoordinateSystem();
-    if (*pCS == *cs) {
-      return BaseVector<length_d>::getQuantityVector().getZ();
-    } else {
-      return QuantityVector<length_d>(
-                 get_transformation(*cs.get(), *pCS.get()) *
-                 BaseVector<length_d>::getQuantityVector().eigenVector_)
-          .getZ();
-    }
+    return getCoordinates(pCS).getZ();
   }
 
   /// this always returns a QuantityVector as triple
   inline QuantityVector<length_d> Point::getCoordinates(
       CoordinateSystemPtr const& pCS) const {
     CoordinateSystemPtr const& cs = BaseVector<length_d>::getCoordinateSystem();
-    if (*pCS == *cs) {
+    if (pCS == cs) {
       return BaseVector<length_d>::getQuantityVector();
     } else {
       return QuantityVector<length_d>(
@@ -74,7 +49,7 @@ namespace corsika {
 
   /// this always returns a QuantityVector as triple
   inline QuantityVector<length_d>& Point::getCoordinates(CoordinateSystemPtr const& pCS) {
-    if (*pCS != *BaseVector<length_d>::getCoordinateSystem()) { rebase(pCS); }
+    if (pCS != BaseVector<length_d>::getCoordinateSystem()) { rebase(pCS); }
     return BaseVector<length_d>::getQuantityVector();
   }
 
@@ -91,11 +66,15 @@ namespace corsika {
     return Point(cs, getCoordinates() + pVec.getComponents(cs));
   }
 
+  inline Point Point::operator-(Vector<length_d> const& pVec) const {
+    CoordinateSystemPtr const& cs = BaseVector<length_d>::getCoordinateSystem();
+    return Point(cs, getCoordinates() - pVec.getComponents(cs));
+  }
+
   inline Vector<length_d> Point::operator-(Point const& pB) const {
     CoordinateSystemPtr const& cs = BaseVector<length_d>::getCoordinateSystem();
     return Vector<length_d>(cs, getCoordinates() - pB.getCoordinates(cs));
   }
-
   inline std::ostream& operator<<(std::ostream& os, corsika::Point const& p) {
     auto const& qv = p.getCoordinates();
     os << qv << " (ref:" << fmt::ptr(p.getCoordinateSystem()) << ")";
@@ -106,4 +85,4 @@ namespace corsika {
     return (p1 - p2).getNorm();
   }
 
-} // namespace corsika
\ No newline at end of file
+} // namespace corsika

corsika/detail/framework/geometry/QuantityVector.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/geometry/SeparationPlane.inl

+/*
+ * (c) Copyright 2023 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
+ */
+
+#pragma once
+
+namespace corsika {
+
+  inline SeparationPlane::SeparationPlane(Plane const& plane)
+      : plane_(plane) {}
+
+  inline bool SeparationPlane::contains(Point const& p) const {
+    return !plane_.isAbove(p);
+  }
+
+  inline std::string SeparationPlane::asString() const { return plane_.asString(); }
+
+} // namespace corsika
\ No newline at end of file

corsika/detail/framework/geometry/Sphere.inl

 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once
@@ -25,4 +24,14 @@ namespace corsika {
 
   inline void Sphere::setRadius(LengthType const r) { radius_ = r; }
 
+  inline CoordinateSystemPtr const Sphere::getCoordinateSystem() const {
+    return center_.getCoordinateSystem();
+  }
+
+  inline std::string Sphere::asString() const {
+    std::ostringstream txt;
+    txt << "center=" << center_ << ", radius=" << radius_;
+    return txt.str();
+  }
+
 } // namespace corsika

corsika/detail/framework/geometry/StraightTrajectory.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/geometry/Vector.inl

 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once
@@ -27,7 +26,7 @@ namespace corsika {
   template <typename TDimension>
   inline QuantityVector<TDimension> Vector<TDimension>::getComponents(
       CoordinateSystemPtr const& pCS) const {
-    if (*pCS == *BaseVector<TDimension>::getCoordinateSystem()) {
+    if (pCS == BaseVector<TDimension>::getCoordinateSystem()) {
       return BaseVector<TDimension>::getQuantityVector();
     } else {
       return QuantityVector<TDimension>(

corsika/detail/framework/process/BoundaryCrossingProcess.hpp

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/CascadeEquationsProcess.hpp

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/ContinuousProcess.hpp

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/DecayProcess.hpp

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/InteractionCounter.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/InteractionHistogram.hpp

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/InteractionHistogram.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/InteractionLengthModifier.inl

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/InteractionProcess.hpp

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/ProcessSequence.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once
@@ -21,6 +20,7 @@
 #include <corsika/framework/process/SecondariesProcess.hpp>
 #include <corsika/framework/process/StackProcess.hpp>
 #include <corsika/framework/process/CascadeEquationsProcess.hpp>
+#include <corsika/framework/core/Step.hpp>
 
 #include <cmath>
 #include <limits>
@@ -95,10 +95,10 @@ namespace corsika {
 
   template <typename TProcess1, typename TProcess2, int IndexStart, int IndexProcess1,
             int IndexProcess2>
-  template <typename TParticle, typename TTrack>
+  template <typename TParticle>
   inline ProcessReturn
   ProcessSequence<TProcess1, TProcess2, IndexStart, IndexProcess1, IndexProcess2>::
-      doContinuous(TParticle& particle, TTrack& vT,
+      doContinuous(Step<TParticle>& step,
                    [[maybe_unused]] ContinuousProcessIndex const limitId) {
     ProcessReturn ret = ProcessReturn::Ok;
 
@@ -106,44 +106,46 @@ namespace corsika {
                                                  // errors if process1_type is invalid
       if constexpr (process1_type::is_process_sequence) {
 
-        ret |= A_.doContinuous(particle, vT, limitId);
+        ret |= A_.doContinuous(step, limitId);
       } else if constexpr (is_continuous_process_v<process1_type>) {
 
         // interface checking on TProcess1
-        static_assert(
-            has_method_doContinuous_v<TProcess1, ProcessReturn, TParticle&, TTrack&> ||
-                has_method_doContinuous_v<TProcess1, ProcessReturn, TParticle&,
-                                          TTrack const&> ||
-                has_method_doContinuous_v<TProcess1, ProcessReturn, TParticle const&,
-                                          TTrack const&>,
-            "TDerived has no method with correct signature \"ProcessReturn "
-            "doContinuous(TParticle [const]&,TTrack [const]&,bool)\" required for "
-            "ContinuousProcess<TDerived>. ");
-
-        ret |= A_.doContinuous(particle, vT,
-                               limitId == ContinuousProcessIndex(IndexProcess1));
+        //~ static_assert(
+        //~ has_method_doContinuous_v<TProcess1, ProcessReturn, TParticle&, TTrack&> ||
+        //~ has_method_doContinuous_v<TProcess1, ProcessReturn, TParticle&,
+        //~ TTrack const&> ||
+        //~ has_method_doContinuous_v<TProcess1, ProcessReturn, TParticle const&,
+        //~ TTrack const&>,
+        //~ "TDerived has no method with correct signature \"ProcessReturn "
+        //~ "doContinuous(TParticle [const]&,TTrack [const]&,bool)\" required for "
+        //~ "ContinuousProcess<TDerived>. ");
+
+        ret |= A_.doContinuous(
+            step, limitId == ContinuousProcessIndex(
+                                 static_cast<void const*>(std::addressof(A_))));
       }
     }
 
     if constexpr (is_process_v<process2_type>) { // to protect from further compiler
                                                  // errors if process2_type is invalid
       if constexpr (process2_type::is_process_sequence) {
-        ret |= B_.doContinuous(particle, vT, limitId);
+        ret |= B_.doContinuous(step, limitId);
       } else if constexpr (is_continuous_process_v<process2_type>) {
 
         // interface checking on TProcess2
-        static_assert(
-            has_method_doContinuous_v<TProcess2, ProcessReturn, TParticle&, TTrack&> ||
-                has_method_doContinuous_v<TProcess2, ProcessReturn, TParticle&,
-                                          TTrack const&> ||
-                has_method_doContinuous_v<TProcess2, ProcessReturn, TParticle const&,
-                                          TTrack const&>,
-            "TDerived has no method with correct signature \"ProcessReturn "
-            "doContinuous(TParticle [const]&,TTrack [const]&,bool)\" required for "
-            "ContinuousProcess<TDerived>. ");
-
-        ret |= B_.doContinuous(particle, vT,
-                               limitId == ContinuousProcessIndex(IndexProcess2));
+        //~ static_assert(
+        //~ has_method_doContinuous_v<TProcess2, ProcessReturn, TParticle&, TTrack&> ||
+        //~ has_method_doContinuous_v<TProcess2, ProcessReturn, TParticle&,
+        //~ TTrack const&> ||
+        //~ has_method_doContinuous_v<TProcess2, ProcessReturn, TParticle const&,
+        //~ TTrack const&>,
+        //~ "TDerived has no method with correct signature \"ProcessReturn "
+        //~ "doContinuous(TParticle [const]&,TTrack [const]&,bool)\" required for "
+        //~ "ContinuousProcess<TDerived>. ");
+
+        ret |= B_.doContinuous(
+            step, limitId == ContinuousProcessIndex(
+                                 static_cast<void const*>(std::addressof(B_))));
       }
     }
 
@@ -280,8 +282,9 @@ namespace corsika {
                       "getMaxStepLength(TParticle const&, TTrack const&)\" required for "
                       "ContinuousProcess<TDerived>. ");
 
-        ContinuousProcessStepLength const step(A_.getMaxStepLength(particle, vTrack),
-                                               ContinuousProcessIndex(IndexProcess1));
+        ContinuousProcessStepLength const step(
+            A_.getMaxStepLength(particle, vTrack),
+            ContinuousProcessIndex(static_cast<void const*>(std::addressof(A_))));
         max_length = std::min(max_length, step);
       }
     }
@@ -300,8 +303,9 @@ namespace corsika {
                       "getMaxStepLength(TParticle const&, TTrack const&)\" required for "
                       "ContinuousProcess<TDerived>. ");
 
-        ContinuousProcessStepLength const step(B_.getMaxStepLength(particle, vTrack),
-                                               ContinuousProcessIndex(IndexProcess2));
+        ContinuousProcessStepLength const step(
+            B_.getMaxStepLength(particle, vTrack),
+            ContinuousProcessIndex(static_cast<void const*>(std::addressof(B_))));
         max_length = std::min(max_length, step);
       }
     }
@@ -509,7 +513,7 @@ namespace corsika {
         }
 
         // check if we should execute THIS process and then EXIT
-        if (cx_select <= cx_sum) {
+        if (cx_select < cx_sum) {
 
           if constexpr (has_signature_cx1) {
             // now also sample targetId from weighted cross sections
@@ -595,7 +599,7 @@ namespace corsika {
         }
 
         // check if we should execute THIS process and then EXIT
-        if (cx_select <= cx_sum) {
+        if (cx_select < cx_sum) {
 
           if constexpr (has_signature_cx1) {
 
@@ -679,8 +683,8 @@ namespace corsika {
         // if this is not a ContinuousProcess --> evaluate probability
         decay_inv_sum += A_.getInverseLifetime(view.parent());
         // check if we should execute THIS process and then EXIT
-        if (decay_inv_select <= decay_inv_sum) { // more pedagogical: rndm_select <
-                                                 // decay_inv_sum / decay_inv_tot
+        if (decay_inv_select < decay_inv_sum) { // more pedagogical: rndm_select <
+                                                // decay_inv_sum / decay_inv_tot
           // interface checking on TProcess1
           static_assert(has_method_doDecay_v<TProcess1, void, TSecondaryView&>,
                         "TDerived has no method with correct signature \"void "
@@ -702,7 +706,7 @@ namespace corsika {
         // if this is not a ContinuousProcess --> evaluate probability
         decay_inv_sum += B_.getInverseLifetime(view.parent());
         // check if we should execute THIS process and then EXIT
-        if (decay_inv_select <= decay_inv_sum) {
+        if (decay_inv_select < decay_inv_sum) {
 
           // interface checking on TProcess1
           static_assert(has_method_doDecay_v<TProcess2, void, TSecondaryView&>,

corsika/detail/framework/process/SecondariesProcess.hpp

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/process/StackProcess.hpp

 /*
  * (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once