From a1ffb1ff12d20aa53900c35a3ad8105c608212c7 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 2 Apr 2019 12:33:21 +0200
Subject: [PATCH] comments
---
Framework/Cascade/Cascade.h | 5 +++--
Framework/StackInterface/Stack.h | 9 ++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index 2d5088ed..f47266e9 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -230,14 +230,15 @@ namespace corsika::cascade {
auto const assertion = [&] {
auto const* numericalNodeAfterStep =
- fEnvironment.GetUniverse()->GetContainingNode(particle.GetPosition());
+ fEnvironment.GetUniverse()->GetContainingNode(particle.GetPosition());
return numericalNodeAfterStep == currentLogicalNode;
};
assert(assertion()); // numerical and logical nodes don't match
- } else { // boundary crossing
+ } else { // boundary crossing, step is limited by volume boundary
std::cout << "boundary crossing! next node = " << nextVol << std::endl;
particle.SetNode(nextVol);
+ // DoBoundary may delete the particle (or not)
fProcessSequence.DoBoundaryCrossing(particle, *currentLogicalNode, *nextVol);
}
}
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index 9d259e1c..8deb9d51 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -33,8 +33,8 @@ namespace corsika::stack {
<b>Important:</b> ParticleInterface must inherit from ParticleBase !
*/
- template <typename> //, bool>
- class ParticleInterface; // forward decl
+ template <typename>
+ class ParticleInterface;
/**
The Stack class provides (and connects) the main particle data storage machinery.
@@ -98,8 +98,8 @@ namespace corsika::stack {
typedef StackDataType
StackImpl; ///< this is the type of the user-provided data structure
- template <typename SI> //, bool IsBase>
- using PIType = ParticleInterface<SI>; //, IsBase>;
+ template <typename SI>
+ using PIType = ParticleInterface<SI>;
/**
* Via the StackIteratorInterface and ConstStackIteratorInterface
@@ -209,7 +209,6 @@ namespace corsika::stack {
}
if (p.GetIndex() < GetSize() - 1) fData.Copy(GetSize() - 1, p.GetIndex());
DeleteLast();
- // p.SetInvalid();
}
/**
* delete this particle
--
GitLab