Merge branch 'wrong_usage_of_bethe' into 'master'

Wrong configuration of electromagnetic models in examples

Closes #539

See merge request !470

corsika/detail/framework/process/SwitchProcessSequence.inl

@@ -233,7 +233,7 @@ namespace corsika {
           return A_.getCrossSection(projectile, projectile.getPID(),
                                     {projectile.getEnergy(), projectile.getMomentum()});
         }
-      } else if (process1_type::is_process_sequence) {
+      } else if constexpr (process1_type::is_process_sequence) {
         return A_.getCrossSection(projectile, targetId, targetP4);
       }
 
@@ -252,7 +252,7 @@ namespace corsika {
         } else {
           return B_.getCrossSection(projectile, targetId, targetP4);
         }
-      } else if (process2_type::is_process_sequence) {
+      } else if constexpr (process2_type::is_process_sequence) {
         return B_.getCrossSection(projectile, targetId, targetP4);
       }
     }

examples/corsika.cpp

@@ -325,13 +325,20 @@ int main(int argc, char** argv) {
   // energy threshold for high energy hadronic model. Affects LE/HE switch for
   // hadron interactions and the hadronic photon model in proposal
   HEPEnergyType heHadronModelThreshold = 63.1_GeV;
+
   corsika::proposal::Interaction emCascade(
       env, sophia, sibyll.getHadronInteractionModel(), heHadronModelThreshold);
-  // NOT available for PROPOSAL due to interface trouble:
-  // InteractionCounter emCascadeCounted(emCascade);
-  // corsika::proposal::ContinuousProcess<SubWriter<decltype(dEdX)>>
-  // emContinuous(env);
-  BetheBlochPDG<SubWriter<decltype(dEdX)>> emContinuous{dEdX};
+
+  // use BetheBlochPDG for hadronic continuous losses, and proposal otherwise
+  corsika::proposal::ContinuousProcess<SubWriter<decltype(dEdX)>> emContinuousProposal(
+      env, dEdX);
+  BetheBlochPDG<SubWriter<decltype(dEdX)>> emContinuousBethe{dEdX};
+  struct EMHadronSwitch {
+    EMHadronSwitch() = default;
+    bool operator()(const Particle& p) const { return is_hadron(p.getPID()); }
+  };
+  auto emContinuous =
+      make_select(EMHadronSwitch(), emContinuousBethe, emContinuousProposal);
 
   LongitudinalWriter profile{showerAxis, 200, 10_g / square(1_cm)};
   output.add("profile", profile);

examples/mars.cpp

@@ -355,14 +355,21 @@ int main(int argc, char** argv) {
   // energy threshold for high energy hadronic model. Affects LE/HE switch for
   // hadron interactions and the hadronic photon model in proposal
   HEPEnergyType heHadronModelThreshold = 63.1_GeV;
+
   corsika::sophia::InteractionModel sophia;
   corsika::proposal::Interaction emCascade(
       env, sophia, sibyll.getHadronInteractionModel(), heHadronModelThreshold);
-  // NOT possible right now, due to interface difference for PROPOSAL:
-  //  InteractionCounter emCascadeCounted(emCascade);
-  // corsika::proposal::ContinuousProcess<SubWriter<decltype(dEdX)>>
-  // emContinuous(env,dEdX);
-  BetheBlochPDG<SubWriter<decltype(dEdX)>> emContinuous{dEdX};
+
+  // use BetheBlochPDG for hadronic continuous losses, and proposal otherwise
+  corsika::proposal::ContinuousProcess<SubWriter<decltype(dEdX)>> emContinuousProposal(
+      env, dEdX);
+  BetheBlochPDG<SubWriter<decltype(dEdX)>> emContinuousBethe{dEdX};
+  struct EMHadronSwitch {
+    EMHadronSwitch() = default;
+    bool operator()(const Particle& p) const { return is_hadron(p.getPID()); }
+  };
+  auto emContinuous =
+      make_select(EMHadronSwitch(), emContinuousBethe, emContinuousProposal);
 
   LongitudinalWriter longprof{showerAxis};
   output.add("profile", longprof);