From ba248ab09bb25f012d6523aa93274d9b302d086d Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Wed, 3 Feb 2021 20:10:23 -1000
Subject: [PATCH] Modify cascade to trigger run & event methods.
---
corsika/detail/framework/core/Cascade.inl | 34 +++++++++++++----------
corsika/framework/core/Cascade.hpp | 6 ++--
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/corsika/detail/framework/core/Cascade.inl b/corsika/detail/framework/core/Cascade.inl
index 8cd5b2e39..26386c42a 100644
--- a/corsika/detail/framework/core/Cascade.inl
+++ b/corsika/detail/framework/core/Cascade.inl
@@ -27,11 +27,14 @@
namespace corsika {
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
typename TStackView>
- void Cascade<TTracking, TProcessList, TStack, TStackView>::run() {
+ void Cascade<TTracking, TProcessList, TOutput, TStack, TStackView>::run() {
setNodes(); // put each particle on stack in correct environment volume
+ // start this event (i.e. this shower)
+ output_.startOfEvent();
+
while (!stack_.isEmpty()) {
while (!stack_.isEmpty()) {
CORSIKA_LOG_TRACE("Stack: {}", stack_.asString());
@@ -52,11 +55,14 @@ namespace corsika {
// thus, the double loop
// doCascadeEquations();
}
+
+ // end this event (i.e. this shower)
+ output_.endOfEvent();
}
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
typename TStackView>
- void Cascade<TTracking, TProcessList, TStack, TStackView>::forceInteraction() {
+ void Cascade<TTracking, TProcessList, TOutput, TStack, TStackView>::forceInteraction() {
CORSIKA_LOG_TRACE("forced interaction!");
setNodes();
auto vParticle = stack_.getNextParticle();
@@ -66,9 +72,9 @@ namespace corsika {
vParticle.erase(); // primary particle is done
}
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
typename TStackView>
- void Cascade<TTracking, TProcessList, TStack, TStackView>::step(Particle& vParticle) {
+ void Cascade<TTracking, TProcessList, TOutput, TStack, TStackView>::step(Particle& vParticle) {
// determine combined total interaction length (inverse)
InverseGrammageType const total_inv_lambda =
@@ -232,9 +238,9 @@ namespace corsika {
}
}
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
typename TStackView>
- ProcessReturn Cascade<TTracking, TProcessList, TStack, TStackView>::decay(
+ ProcessReturn Cascade<TTracking, TProcessList, TOutput, TStack, TStackView>::decay(
TStackView& view) {
CORSIKA_LOG_DEBUG("decay");
InverseTimeType const actual_decay_time = sequence_.getInverseLifetime(view.parent());
@@ -250,9 +256,9 @@ namespace corsika {
return returnCode;
}
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
typename TStackView>
- ProcessReturn Cascade<TTracking, TProcessList, TStack, TStackView>::interaction(
+ ProcessReturn Cascade<TTracking, TProcessList, TOutput, TStack, TStackView>::interaction(
TStackView& view) {
CORSIKA_LOG_DEBUG("collide");
@@ -270,9 +276,9 @@ namespace corsika {
return returnCode;
}
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
typename TStackView>
- void Cascade<TTracking, TProcessList, TStack, TStackView>::setNodes() {
+ void Cascade<TTracking, TProcessList, TOutput, TStack, TStackView>::setNodes() {
std::for_each(stack_.begin(), stack_.end(), [&](auto& p) {
auto const* numericalNode =
environment_.getUniverse()->getContainingNode(p.getPosition());
@@ -280,9 +286,9 @@ namespace corsika {
});
}
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
typename TStackView>
- void Cascade<TTracking, TProcessList, TStack, TStackView>::setEventType(
+ void Cascade<TTracking, TProcessList, TOutput, TStack, TStackView>::setEventType(
TStackView& view, [[maybe_unused]] history::EventType eventType) {
if constexpr (TStackView::has_event) {
for (auto&& sec : view) { sec.getEvent()->setEventType(eventType); }
diff --git a/corsika/framework/core/Cascade.hpp b/corsika/framework/core/Cascade.hpp
index 64c4c065e..99f0c97bd 100644
--- a/corsika/framework/core/Cascade.hpp
+++ b/corsika/framework/core/Cascade.hpp
@@ -57,7 +57,7 @@ namespace corsika {
*
*
*/
- template <typename TTracking, typename TProcessList, typename TStack,
+ template <typename TTracking, typename TProcessList, typename TOutput, typename TStack,
/*
TStackView is needed as explicit template parameter because
of issue 161 and the
@@ -84,10 +84,11 @@ namespace corsika {
~Cascade() = default;
Cascade& operator=(Cascade const&) = default;
Cascade(Environment<MediumInterface> const& env, TTracking& tr, TProcessList& pl,
- TStack& stack)
+ TOutput& out, TStack& stack)
: environment_(env)
, tracking_(tr)
, sequence_(pl)
+ , output_(out)
, stack_(stack) {
CORSIKA_LOG_INFO(c8_ascii_);
if constexpr (TStackView::has_event) {
@@ -136,6 +137,7 @@ namespace corsika {
Environment<MediumInterface> const& environment_;
TTracking& tracking_;
TProcessList& sequence_;
+ TOutput& output_;
TStack& stack_;
default_prng_type& rng_ = RNGManager::getInstance().getRandomStream("cascade");
unsigned int count_ = 0;
--
GitLab