renamed base process templates

Framework/ProcessSequence/ContinuousProcess.h

@@ -24,11 +24,21 @@ namespace corsika::process {
    */
 
   template <typename TDerived>
+<<<<<<< HEAD
   class ContinuousProcess : public BaseProcess<TDerived> {
+=======
+  class ContinuousProcess {
+>>>>>>> renamed base process templates
   private:
   protected:
   public:
     using _TDerived = TDerived;
+<<<<<<< HEAD
+=======
+
+    TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+    const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+>>>>>>> renamed base process templates
 
     // here starts the interface part
     // -> enforce TDerived to implement DoContinuous...

Framework/ProcessSequence/InteractionProcess.h

@@ -25,11 +25,25 @@ namespace corsika::process {
    */
 
   template <typename TDerived>
+<<<<<<< HEAD
   class InteractionProcess : public BaseProcess<TDerived> {
     public:
     using _TDerived = TDerived;
     
     using BaseProcess<TDerived>::GetRef;
+=======
+  class InteractionProcess {
+
+    private:
+
+    protected:
+    using _TDerived = TDerived;
+
+    public:
+
+    TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+    const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+>>>>>>> renamed base process templates
 
     /// here starts the interface-definition part
     // -> enforce TDerived to implement DoInteraction...

Framework/ProcessSequence/SecondariesProcess.h

@@ -25,10 +25,23 @@ namespace corsika::process {
    */
 
   template <typename TDerived>
+<<<<<<< HEAD
   class SecondariesProcess : public BaseProcess<TDerived> {
     public:
     using _TDerived = TDerived;
     
+=======
+  class SecondariesProcess {
+
+  private:
+  protected:
+    using _TDerived = TDerived;
+
+  public:
+    TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+    const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+
+>>>>>>> renamed base process templates
     /// here starts the interface-definition part
     // -> enforce TDerived to implement DoSecondaries...
     template <typename TSecondaries>

Framework/ProcessSequence/StackProcess.h

@@ -35,6 +35,12 @@ namespace corsika::process {
     StackProcess(const unsigned int nStep)
         : fNStep(nStep) {}
 
+<<<<<<< HEAD
+=======
+    TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+    const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+
+>>>>>>> renamed base process templates
     /// here starts the interface-definition part
     // -> enforce TDerived to implement DoStack...
     template <typename TStack>