History

We need this MR to discuss details and technicalities of this branch.

The code approval procedure is described in the wiki: Code approval procedure wiki

• The MR is without WIP (work in progress) status
• Make sure the most recent CI jobs (config, quality, build_test_example) all run fine with no failures
  • if "check clang-format" failed: the code contributor has to run ./do-clang-format.py --apply eventually with the --all option
  • if "check copyright" failed the code contributor has to run./do-copyright.py --add=20xy
• Make sure also the jobs with label ready for code review succeed. This includes the optional jobs, in particular 'coverage', 'release-clang-8", "release-u-18.04" and make sure no problems occur
• Check in the "coverage" job output that the coverage did not decreases. It should always stay, or increase. If it decreased --> ask contributor to add further needed unit tests, and check coverage report.
• On the MR page, open the "Open in Web IDE" tool
  • Check if the provided solution solves the Issue, discuss on gitlab
  • Check that all changes are actually related to the issue
  • There are no debug statements left, not even commented out
  • Check all changes for coding rules and guidelines
• When all above is done:
  • Add MR label "Code Review Finished"

Framework/Cascade/testCascade.h

@@ -9,23 +9,28 @@
 #pragma once
 
 #include <corsika/environment/Environment.h>
-#include <corsika/setup/SetupStack.h>
+
+#include <corsika/stack/CombinedStack.h>
+#include <corsika/stack/SecondaryView.h>
+#include <corsika/stack/node/GeometryNodeStackExtension.h>
+#include <corsika/stack/nuclear_extension/NuclearStackExtension.h>
 
 using TestEnvironmentType =
     corsika::environment::Environment<corsika::environment::IMediumModel>;
 
 template <typename T>
-using SetupGeometryDataInterface = GeometryDataInterface<T, TestEnvironmentType>;
+using SetupGeometryDataInterface =
+    corsika::stack::node::GeometryDataInterface<T, TestEnvironmentType>;
 
 // combine particle data stack with geometry information for tracking
 template <typename StackIter>
 using StackWithGeometryInterface = corsika::stack::CombinedParticleInterface<
-    corsika::setup::detail::ParticleDataStack::PIType, SetupGeometryDataInterface,
-    StackIter>;
+    corsika::stack::nuclear_extension::ParticleDataStack::MPIType,
+    SetupGeometryDataInterface, StackIter>;
 
 using TestCascadeStack = corsika::stack::CombinedStack<
-    typename corsika::setup::detail::ParticleDataStack::StackImpl,
-    GeometryData<TestEnvironmentType>, StackWithGeometryInterface>;
+    typename corsika::stack::nuclear_extension::ParticleDataStack::StackImpl,
+    corsika::stack::node::GeometryData<TestEnvironmentType>, StackWithGeometryInterface>;
 
 /*
   See also Issue 161