From 4b28369d3acd82c1d748a62f6e5fdc24b0ddaf38 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 7 Jan 2021 10:16:20 +0100
Subject: [PATCH] cleanup, closed some issues
---
.../detail/framework/stack/CombinedStack.inl | 2 +-
.../detail/framework/stack/SecondaryView.inl | 2 +-
corsika/detail/framework/stack/Stack.inl | 2 +-
corsika/detail/framework/utility/COMBoost.inl | 2 +-
.../LayeredSphericalAtmosphereBuilder.inl | 2 +-
corsika/detail/media/ShowerAxis.inl | 4 ++--
corsika/detail/modules/LongitudinalProfile.inl | 4 ++--
corsika/detail/modules/conex/CONEXhybrid.inl | 4 ++--
.../modules/energy_loss/BetheBlochPDG.inl | 2 +-
.../modules/proposal/ContinuousProcess.inl | 2 +-
.../modules/sibyll/NuclearInteraction.inl | 2 +-
corsika/detail/modules/tracking/Intersect.inl | 2 +-
.../tracking/TrackingLeapFrogCurved.inl | 2 +-
.../modules/tracking/TrackingStraight.inl | 2 +-
corsika/detail/stack/NuclearStackExtension.inl | 2 +-
.../stack/{SimpleStack.inl => VectorStack.inl} | 10 +++++-----
corsika/framework/core/Cascade.hpp | 2 +-
.../framework/{logging => core}/Logging.hpp | 0
.../framework/geometry/CoordinateSystem.hpp | 2 +-
corsika/framework/random/RNGManager.hpp | 2 +-
corsika/framework/stack/CombinedStack.hpp | 2 +-
corsika/framework/stack/SecondaryView.hpp | 2 +-
corsika/framework/stack/Stack.hpp | 2 +-
corsika/framework/utility/COMBoost.hpp | 2 +-
corsika/modules/tracking/Intersect.hpp | 2 +-
.../tracking/TrackingLeapFrogCurved.hpp | 2 +-
corsika/modules/tracking/TrackingStraight.hpp | 2 +-
corsika/stack/GeometryNodeStackExtension.hpp | 2 +-
corsika/stack/NuclearStackExtension.hpp | 8 ++++----
.../stack/{SimpleStack.hpp => VectorStack.hpp} | 18 +++++++++---------
corsika/stack/history/Event.hpp | 2 +-
.../stack/history/HistorySecondaryProducer.hpp | 2 +-
.../stack/history/HistoryStackExtension.hpp | 2 +-
examples/boundary_example.cpp | 2 +-
examples/cascade_example.cpp | 2 +-
examples/cascade_proton_example.cpp | 2 +-
examples/em_shower.cpp | 2 +-
examples/geometry_example.cpp | 2 +-
examples/hybrid_MC.cpp | 2 +-
examples/stack_example.cpp | 8 ++++----
examples/vertical_EAS.cpp | 2 +-
tests/framework/testLogging.cpp | 2 +-
tests/framework/testSecondaryView.cpp | 2 +-
tests/stack/CMakeLists.txt | 2 +-
tests/stack/testHistoryView.cpp | 2 +-
tests/stack/testNuclearStackExtension.cpp | 6 +++---
...testSimpleStack.cpp => testVectorStack.cpp} | 8 ++++----
47 files changed, 72 insertions(+), 72 deletions(-)
rename corsika/detail/stack/{SimpleStack.inl => VectorStack.inl} (90%)
rename corsika/framework/{logging => core}/Logging.hpp (100%)
rename corsika/stack/{SimpleStack.hpp => VectorStack.hpp} (91%)
rename tests/stack/{testSimpleStack.cpp => testVectorStack.cpp} (92%)
diff --git a/corsika/detail/framework/stack/CombinedStack.inl b/corsika/detail/framework/stack/CombinedStack.inl
index 4ead3b9b8..0c95ad15e 100644
--- a/corsika/detail/framework/stack/CombinedStack.inl
+++ b/corsika/detail/framework/stack/CombinedStack.inl
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/core/ParticleProperties.hpp>
#include <corsika/framework/stack/Stack.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
diff --git a/corsika/detail/framework/stack/SecondaryView.inl b/corsika/detail/framework/stack/SecondaryView.inl
index 5e22a8fef..33160aa08 100644
--- a/corsika/detail/framework/stack/SecondaryView.inl
+++ b/corsika/detail/framework/stack/SecondaryView.inl
@@ -9,7 +9,7 @@
#pragma once
#include <corsika/framework/stack/Stack.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <stdexcept>
#include <vector>
diff --git a/corsika/detail/framework/stack/Stack.inl b/corsika/detail/framework/stack/Stack.inl
index df175bd27..30c7c7460 100644
--- a/corsika/detail/framework/stack/Stack.inl
+++ b/corsika/detail/framework/stack/Stack.inl
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/stack/StackIteratorInterface.hpp>
#include <stdexcept>
diff --git a/corsika/detail/framework/utility/COMBoost.inl b/corsika/detail/framework/utility/COMBoost.inl
index ed6a9c1be..54d1162c3 100644
--- a/corsika/detail/framework/utility/COMBoost.inl
+++ b/corsika/detail/framework/utility/COMBoost.inl
@@ -15,7 +15,7 @@
#include <corsika/framework/geometry/CoordinateSystem.hpp>
#include <corsika/framework/geometry/FourVector.hpp>
#include <corsika/framework/geometry/Vector.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
namespace corsika {
diff --git a/corsika/detail/media/LayeredSphericalAtmosphereBuilder.inl b/corsika/detail/media/LayeredSphericalAtmosphereBuilder.inl
index f8421ab06..e42310da2 100644
--- a/corsika/detail/media/LayeredSphericalAtmosphereBuilder.inl
+++ b/corsika/detail/media/LayeredSphericalAtmosphereBuilder.inl
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/media/FlatExponential.hpp>
#include <corsika/media/HomogeneousMedium.hpp>
diff --git a/corsika/detail/media/ShowerAxis.inl b/corsika/detail/media/ShowerAxis.inl
index f15e5fb7d..1be5d40a6 100644
--- a/corsika/detail/media/ShowerAxis.inl
+++ b/corsika/detail/media/ShowerAxis.inl
@@ -7,7 +7,7 @@
*/
#include <corsika/framework/core/PhysicalUnits.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <string>
@@ -114,4 +114,4 @@ namespace corsika {
Point const& ShowerAxis::getStart() const { return pointStart_; }
-} // namespace corsika
\ No newline at end of file
+} // namespace corsika
diff --git a/corsika/detail/modules/LongitudinalProfile.inl b/corsika/detail/modules/LongitudinalProfile.inl
index f3e46bd5e..592f71464 100644
--- a/corsika/detail/modules/LongitudinalProfile.inl
+++ b/corsika/detail/modules/LongitudinalProfile.inl
@@ -7,7 +7,7 @@
*/
#include <corsika/framework/core/ParticleProperties.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/modules/LongitudinalProfile.hpp>
@@ -71,4 +71,4 @@ namespace corsika {
f << std::endl;
}
}
-} // namespace corsika
\ No newline at end of file
+} // namespace corsika
diff --git a/corsika/detail/modules/conex/CONEXhybrid.inl b/corsika/detail/modules/conex/CONEXhybrid.inl
index 53df3d4d3..f722440d3 100644
--- a/corsika/detail/modules/conex/CONEXhybrid.inl
+++ b/corsika/detail/modules/conex/CONEXhybrid.inl
@@ -6,7 +6,7 @@
* the license.
*/
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/modules/conex/CONEXhybrid.hpp>
#include <corsika/modules/conex/CONEX_f.hpp>
#include <corsika/framework/random/RNGManager.hpp>
@@ -291,4 +291,4 @@ namespace corsika {
fitout.close();
}
-} // namespace corsika
\ No newline at end of file
+} // namespace corsika
diff --git a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl
index c530afe13..fbde1729c 100644
--- a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl
+++ b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl
@@ -14,7 +14,7 @@
#include <corsika/setup/SetupTrajectory.hpp>
#include <corsika/framework/geometry/Line.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <cmath>
#include <fstream>
diff --git a/corsika/detail/modules/proposal/ContinuousProcess.inl b/corsika/detail/modules/proposal/ContinuousProcess.inl
index e9cb61c02..16d419b0b 100644
--- a/corsika/detail/modules/proposal/ContinuousProcess.inl
+++ b/corsika/detail/modules/proposal/ContinuousProcess.inl
@@ -13,7 +13,7 @@
#include <corsika/modules/proposal/Interaction.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <corsika/framework/utility/COMBoost.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/setup/SetupEnvironment.hpp>
#include <corsika/setup/SetupStack.hpp>
diff --git a/corsika/detail/modules/sibyll/NuclearInteraction.inl b/corsika/detail/modules/sibyll/NuclearInteraction.inl
index 1aad71bef..4470ea28a 100644
--- a/corsika/detail/modules/sibyll/NuclearInteraction.inl
+++ b/corsika/detail/modules/sibyll/NuclearInteraction.inl
@@ -16,7 +16,7 @@
#include <corsika/framework/geometry/FourVector.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <corsika/framework/utility/COMBoost.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/setup/SetupEnvironment.hpp>
#include <corsika/setup/SetupStack.hpp>
diff --git a/corsika/detail/modules/tracking/Intersect.inl b/corsika/detail/modules/tracking/Intersect.inl
index 9c30ff87d..fef16a955 100644
--- a/corsika/detail/modules/tracking/Intersect.inl
+++ b/corsika/detail/modules/tracking/Intersect.inl
@@ -9,7 +9,7 @@
#pragma once
#include <corsika/framework/core/PhysicalUnits.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/geometry/Intersections.hpp>
#include <limits>
diff --git a/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl b/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl
index 3ddd6d6ce..8545d2bbd 100644
--- a/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl
+++ b/corsika/detail/modules/tracking/TrackingLeapFrogCurved.inl
@@ -18,7 +18,7 @@
#include <corsika/framework/core/ParticleProperties.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <corsika/framework/utility/QuarticSolver.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/modules/tracking/Intersect.hpp>
#include <type_traits>
diff --git a/corsika/detail/modules/tracking/TrackingStraight.inl b/corsika/detail/modules/tracking/TrackingStraight.inl
index 33ad57ede..2c284b4d0 100644
--- a/corsika/detail/modules/tracking/TrackingStraight.inl
+++ b/corsika/detail/modules/tracking/TrackingStraight.inl
@@ -15,7 +15,7 @@
#include <corsika/framework/geometry/Vector.hpp>
#include <corsika/framework/geometry/StraightTrajectory.hpp>
#include <corsika/framework/geometry/Intersections.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/modules/tracking/Intersect.hpp>
#include <type_traits>
diff --git a/corsika/detail/stack/NuclearStackExtension.inl b/corsika/detail/stack/NuclearStackExtension.inl
index b1fe9ba1c..728647ca0 100644
--- a/corsika/detail/stack/NuclearStackExtension.inl
+++ b/corsika/detail/stack/NuclearStackExtension.inl
@@ -13,7 +13,7 @@
#include <corsika/framework/stack/Stack.hpp>
#include <corsika/framework/geometry/Point.hpp>
#include <corsika/framework/geometry/Vector.hpp>
-#include <corsika/stack/SimpleStack.hpp>
+#include <corsika/stack/VectorStack.hpp>
#include <algorithm>
#include <tuple>
diff --git a/corsika/detail/stack/SimpleStack.inl b/corsika/detail/stack/VectorStack.inl
similarity index 90%
rename from corsika/detail/stack/SimpleStack.inl
rename to corsika/detail/stack/VectorStack.inl
index 4b0e13ecb..44384a131 100644
--- a/corsika/detail/stack/SimpleStack.inl
+++ b/corsika/detail/stack/VectorStack.inl
@@ -43,7 +43,7 @@ namespace corsika {
this->setTime(std::get<4>(v));
}
- inline void SimpleStackImpl::clear() {
+ inline void VectorStackImpl::clear() {
dataPID_.clear();
dataE_.clear();
momentum_.clear();
@@ -51,7 +51,7 @@ namespace corsika {
time_.clear();
}
- inline void SimpleStackImpl::copy(size_t i1, size_t i2) {
+ inline void VectorStackImpl::copy(size_t i1, size_t i2) {
dataPID_[i2] = dataPID_[i1];
dataE_[i2] = dataE_[i1];
momentum_[i2] = momentum_[i1];
@@ -59,7 +59,7 @@ namespace corsika {
time_[i2] = time_[i1];
}
- inline void SimpleStackImpl::swap(size_t i1, size_t i2) {
+ inline void VectorStackImpl::swap(size_t i1, size_t i2) {
std::swap(dataPID_[i2], dataPID_[i1]);
std::swap(dataE_[i2], dataE_[i1]);
std::swap(momentum_[i2], momentum_[i1]);
@@ -67,7 +67,7 @@ namespace corsika {
std::swap(time_[i2], time_[i1]);
}
- inline void SimpleStackImpl::incrementSize() {
+ inline void VectorStackImpl::incrementSize() {
dataPID_.push_back(Code::Unknown);
dataE_.push_back(0 * electronvolt);
@@ -80,7 +80,7 @@ namespace corsika {
time_.push_back(0 * second);
}
- inline void SimpleStackImpl::decrementSize() {
+ inline void VectorStackImpl::decrementSize() {
if (dataE_.size() > 0) {
dataPID_.pop_back();
dataE_.pop_back();
diff --git a/corsika/framework/core/Cascade.hpp b/corsika/framework/core/Cascade.hpp
index d7d3bbe08..64c4c065e 100644
--- a/corsika/framework/core/Cascade.hpp
+++ b/corsika/framework/core/Cascade.hpp
@@ -16,7 +16,7 @@
#include <corsika/framework/random/UniformRealDistribution.hpp>
#include <corsika/framework/stack/SecondaryView.hpp>
#include <corsika/media/Environment.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
/* see Issue 161, we need to include SetupStack only because we need
to globally define StackView. This is clearly not nice and should
diff --git a/corsika/framework/logging/Logging.hpp b/corsika/framework/core/Logging.hpp
similarity index 100%
rename from corsika/framework/logging/Logging.hpp
rename to corsika/framework/core/Logging.hpp
diff --git a/corsika/framework/geometry/CoordinateSystem.hpp b/corsika/framework/geometry/CoordinateSystem.hpp
index 32fbba52e..ed9c81848 100644
--- a/corsika/framework/geometry/CoordinateSystem.hpp
+++ b/corsika/framework/geometry/CoordinateSystem.hpp
@@ -14,7 +14,7 @@
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <corsika/framework/geometry/QuantityVector.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <Eigen/Dense>
#include <stdexcept>
diff --git a/corsika/framework/random/RNGManager.hpp b/corsika/framework/random/RNGManager.hpp
index 9fb217f24..2dd6160e9 100644
--- a/corsika/framework/random/RNGManager.hpp
+++ b/corsika/framework/random/RNGManager.hpp
@@ -14,7 +14,7 @@
#include <string>
#include <corsika/framework/utility/Singleton.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
/*!
* With this class modules can register streams of random numbers.
diff --git a/corsika/framework/stack/CombinedStack.hpp b/corsika/framework/stack/CombinedStack.hpp
index 5dfbbfe12..d452d8f8b 100644
--- a/corsika/framework/stack/CombinedStack.hpp
+++ b/corsika/framework/stack/CombinedStack.hpp
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/core/ParticleProperties.hpp>
#include <corsika/framework/stack/Stack.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
diff --git a/corsika/framework/stack/SecondaryView.hpp b/corsika/framework/stack/SecondaryView.hpp
index 515c0f57c..e18531b31 100644
--- a/corsika/framework/stack/SecondaryView.hpp
+++ b/corsika/framework/stack/SecondaryView.hpp
@@ -9,7 +9,7 @@
#pragma once
#include <corsika/framework/stack/Stack.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <stdexcept>
#include <vector>
diff --git a/corsika/framework/stack/Stack.hpp b/corsika/framework/stack/Stack.hpp
index 4a6f09056..e72dc94db 100644
--- a/corsika/framework/stack/Stack.hpp
+++ b/corsika/framework/stack/Stack.hpp
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/stack/StackIteratorInterface.hpp>
#include <stdexcept>
diff --git a/corsika/framework/utility/COMBoost.hpp b/corsika/framework/utility/COMBoost.hpp
index 0d4d14ebe..63b8f0a44 100644
--- a/corsika/framework/utility/COMBoost.hpp
+++ b/corsika/framework/utility/COMBoost.hpp
@@ -12,7 +12,7 @@
#include <corsika/framework/geometry/FourVector.hpp>
#include <corsika/framework/geometry/PhysicalGeometry.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <Eigen/Dense>
diff --git a/corsika/modules/tracking/Intersect.hpp b/corsika/modules/tracking/Intersect.hpp
index 459cef850..1e7a07d84 100644
--- a/corsika/modules/tracking/Intersect.hpp
+++ b/corsika/modules/tracking/Intersect.hpp
@@ -9,7 +9,7 @@
#pragma once
#include <corsika/framework/core/PhysicalUnits.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/geometry/Intersections.hpp>
#include <limits>
diff --git a/corsika/modules/tracking/TrackingLeapFrogCurved.hpp b/corsika/modules/tracking/TrackingLeapFrogCurved.hpp
index 883f96dbc..dff4bc18e 100644
--- a/corsika/modules/tracking/TrackingLeapFrogCurved.hpp
+++ b/corsika/modules/tracking/TrackingLeapFrogCurved.hpp
@@ -18,7 +18,7 @@
#include <corsika/framework/core/ParticleProperties.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <corsika/framework/utility/QuarticSolver.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/modules/tracking/Intersect.hpp>
#include <type_traits>
diff --git a/corsika/modules/tracking/TrackingStraight.hpp b/corsika/modules/tracking/TrackingStraight.hpp
index c595a75a5..b77f8fd21 100644
--- a/corsika/modules/tracking/TrackingStraight.hpp
+++ b/corsika/modules/tracking/TrackingStraight.hpp
@@ -15,7 +15,7 @@
#include <corsika/framework/geometry/Vector.hpp>
#include <corsika/framework/geometry/StraightTrajectory.hpp>
#include <corsika/framework/geometry/Intersections.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/modules/tracking/Intersect.hpp>
#include <type_traits>
diff --git a/corsika/stack/GeometryNodeStackExtension.hpp b/corsika/stack/GeometryNodeStackExtension.hpp
index 3450dc2ac..b3a15854f 100644
--- a/corsika/stack/GeometryNodeStackExtension.hpp
+++ b/corsika/stack/GeometryNodeStackExtension.hpp
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/stack/Stack.hpp>
#include <tuple>
diff --git a/corsika/stack/NuclearStackExtension.hpp b/corsika/stack/NuclearStackExtension.hpp
index bcd187c05..5d8d573ed 100644
--- a/corsika/stack/NuclearStackExtension.hpp
+++ b/corsika/stack/NuclearStackExtension.hpp
@@ -14,7 +14,7 @@
#include <corsika/framework/geometry/Point.hpp>
#include <corsika/framework/geometry/Vector.hpp>
#include <corsika/framework/geometry/PhysicalGeometry.hpp>
-#include <corsika/stack/SimpleStack.hpp>
+#include <corsika/stack/VectorStack.hpp>
#include <algorithm>
#include <tuple>
@@ -27,7 +27,7 @@ namespace corsika::nuclear_stack {
* Define ParticleInterface for NuclearStackExtension Stack derived from
* ParticleInterface of Inner stack class
*
- * Add A and Z data to existing stack (currently SimpleStack) of particle
+ * Add A and Z data to existing stack (currently VectorStack) of particle
* properties. This is done via inheritance, not via CombinedStack since the nuclear
* data is stored ONLY when needed (for nuclei) and not for all particles. Thus, this is
* a new, derived Stack object.
@@ -210,11 +210,11 @@ namespace corsika::nuclear_stack {
//
template <typename TStackIter>
using ExtendedParticleInterfaceType =
- NuclearParticleInterface<SimpleStack::pi_type, TStackIter>;
+ NuclearParticleInterface<VectorStack::pi_type, TStackIter>;
// the particle data stack with extra nuclear information:
using ParticleDataStack =
- NuclearStackExtension<SimpleStack, ExtendedParticleInterfaceType>;
+ NuclearStackExtension<VectorStack, ExtendedParticleInterfaceType>;
} // namespace corsika::nuclear_stack
diff --git a/corsika/stack/SimpleStack.hpp b/corsika/stack/VectorStack.hpp
similarity index 91%
rename from corsika/stack/SimpleStack.hpp
rename to corsika/stack/VectorStack.hpp
index 57c3c2ee3..7877469ee 100644
--- a/corsika/stack/SimpleStack.hpp
+++ b/corsika/stack/VectorStack.hpp
@@ -98,7 +98,7 @@ namespace corsika {
*
*/
- class SimpleStackImpl {
+ class VectorStackImpl {
public:
typedef std::vector<Code> code_vector_type;
@@ -107,15 +107,15 @@ namespace corsika {
typedef std::vector<TimeType> time_vector_type;
typedef std::vector<MomentumVector> momentum_vector_type;
- SimpleStackImpl() = default;
+ VectorStackImpl() = default;
- SimpleStackImpl(SimpleStackImpl const& other) = default;
+ VectorStackImpl(VectorStackImpl const& other) = default;
- SimpleStackImpl(SimpleStackImpl&& other) = default;
+ VectorStackImpl(VectorStackImpl&& other) = default;
- SimpleStackImpl& operator=(SimpleStackImpl const& other) = default;
+ VectorStackImpl& operator=(VectorStackImpl const& other) = default;
- SimpleStackImpl& operator=(SimpleStackImpl&& other) = default;
+ VectorStackImpl& operator=(VectorStackImpl&& other) = default;
void dump() const {}
@@ -167,10 +167,10 @@ namespace corsika {
point_vector_type position_;
time_vector_type time_;
- }; // end class SimpleStackImpl
+ }; // end class VectorStackImpl
- typedef Stack<SimpleStackImpl, ParticleInterface> SimpleStack;
+ typedef Stack<VectorStackImpl, ParticleInterface> VectorStack;
} // namespace corsika
-#include <corsika/detail/stack/SimpleStack.inl>
+#include <corsika/detail/stack/VectorStack.inl>
diff --git a/corsika/stack/history/Event.hpp b/corsika/stack/history/Event.hpp
index 1a450883b..4ac1ccdc8 100644
--- a/corsika/stack/history/Event.hpp
+++ b/corsika/stack/history/Event.hpp
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/core/ParticleProperties.hpp>
#include <corsika/stack/history/EventType.hpp>
#include <corsika/stack/history/SecondaryParticle.hpp>
diff --git a/corsika/stack/history/HistorySecondaryProducer.hpp b/corsika/stack/history/HistorySecondaryProducer.hpp
index f7317a22b..cf7ef2e4d 100644
--- a/corsika/stack/history/HistorySecondaryProducer.hpp
+++ b/corsika/stack/history/HistorySecondaryProducer.hpp
@@ -11,7 +11,7 @@
#include <corsika/framework/stack/SecondaryView.hpp>
#include <corsika/stack/history/Event.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <boost/type_index.hpp>
diff --git a/corsika/stack/history/HistoryStackExtension.hpp b/corsika/stack/history/HistoryStackExtension.hpp
index 2d79af4c4..9d517b0ac 100644
--- a/corsika/stack/history/HistoryStackExtension.hpp
+++ b/corsika/stack/history/HistoryStackExtension.hpp
@@ -8,7 +8,7 @@
#pragma once
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/stack/Stack.hpp>
#include <memory>
diff --git a/examples/boundary_example.cpp b/examples/boundary_example.cpp
index a45a9af89..da4d76d3e 100644
--- a/examples/boundary_example.cpp
+++ b/examples/boundary_example.cpp
@@ -12,7 +12,7 @@
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <corsika/framework/random/RNGManager.hpp>
#include <corsika/framework/utility/CorsikaFenv.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/setup/SetupEnvironment.hpp>
#include <corsika/setup/SetupStack.hpp>
diff --git a/examples/cascade_example.cpp b/examples/cascade_example.cpp
index 171990459..65366853f 100644
--- a/examples/cascade_example.cpp
+++ b/examples/cascade_example.cpp
@@ -13,7 +13,7 @@
#include <corsika/framework/geometry/Sphere.hpp>
#include <corsika/framework/utility/CorsikaFenv.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/media/Environment.hpp>
#include <corsika/media/HomogeneousMedium.hpp>
diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp
index 554d50532..d7ed42c34 100644
--- a/examples/cascade_proton_example.cpp
+++ b/examples/cascade_proton_example.cpp
@@ -13,7 +13,7 @@
#include <corsika/framework/geometry/Sphere.hpp>
#include <corsika/framework/utility/CorsikaFenv.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/media/Environment.hpp>
#include <corsika/media/HomogeneousMedium.hpp>
diff --git a/examples/em_shower.cpp b/examples/em_shower.cpp
index f34df8b54..4bd457b8d 100644
--- a/examples/em_shower.cpp
+++ b/examples/em_shower.cpp
@@ -15,7 +15,7 @@
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <corsika/framework/utility/CorsikaFenv.hpp>
#include <corsika/framework/process/InteractionCounter.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/media/Environment.hpp>
#include <corsika/media/LayeredSphericalAtmosphereBuilder.hpp>
diff --git a/examples/geometry_example.cpp b/examples/geometry_example.cpp
index 8c471cb60..b752d52ca 100644
--- a/examples/geometry_example.cpp
+++ b/examples/geometry_example.cpp
@@ -11,7 +11,7 @@
#include <corsika/framework/geometry/Sphere.hpp>
#include <corsika/framework/geometry/Vector.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <cstdlib>
#include <typeinfo>
diff --git a/examples/hybrid_MC.cpp b/examples/hybrid_MC.cpp
index 7ff8daa6f..410c5bf1c 100644
--- a/examples/hybrid_MC.cpp
+++ b/examples/hybrid_MC.cpp
@@ -14,7 +14,7 @@
/* clang-format on */
#include <corsika/framework/geometry/Plane.hpp>
#include <corsika/framework/geometry/Sphere.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/process/ProcessSequence.hpp>
#include <corsika/framework/process/SwitchProcessSequence.hpp>
#include <corsika/framework/process/InteractionCounter.hpp>
diff --git a/examples/stack_example.cpp b/examples/stack_example.cpp
index 196efa5c9..277b68760 100644
--- a/examples/stack_example.cpp
+++ b/examples/stack_example.cpp
@@ -7,7 +7,7 @@
*/
#include <corsika/framework/core/ParticleProperties.hpp>
-#include <corsika/stack/SimpleStack.hpp>
+#include <corsika/stack/VectorStack.hpp>
#include <corsika/framework/geometry/Point.hpp>
#include <corsika/framework/geometry/RootCoordinateSystem.hpp>
@@ -19,7 +19,7 @@
using namespace corsika;
using namespace std;
-void fill(SimpleStack& s) {
+void fill(VectorStack& s) {
CoordinateSystemPtr const& rootCS = get_root_CoordinateSystem();
for (int i = 0; i < 11; ++i) {
s.addParticle(std::make_tuple(Code::Electron, 1.5_GeV * i,
@@ -28,7 +28,7 @@ void fill(SimpleStack& s) {
}
}
-void read(SimpleStack& s) {
+void read(VectorStack& s) {
assert(s.getEntries() == 11); // stack has 11 particles
HEPEnergyType total_energy;
@@ -44,7 +44,7 @@ void read(SimpleStack& s) {
int main() {
std::cout << "stack_example" << std::endl;
- SimpleStack s;
+ VectorStack s;
fill(s);
read(s);
return 0;
diff --git a/examples/vertical_EAS.cpp b/examples/vertical_EAS.cpp
index 44e7b865b..9dfbfb11d 100644
--- a/examples/vertical_EAS.cpp
+++ b/examples/vertical_EAS.cpp
@@ -14,7 +14,7 @@
/* clang-format on */
#include <corsika/framework/geometry/Plane.hpp>
#include <corsika/framework/geometry/Sphere.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <corsika/framework/process/ProcessSequence.hpp>
#include <corsika/framework/process/SwitchProcessSequence.hpp>
#include <corsika/framework/process/InteractionCounter.hpp>
diff --git a/tests/framework/testLogging.cpp b/tests/framework/testLogging.cpp
index 0d55c4259..9c06a18fa 100644
--- a/tests/framework/testLogging.cpp
+++ b/tests/framework/testLogging.cpp
@@ -6,7 +6,7 @@
* the license.
*/
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <catch2/catch.hpp>
diff --git a/tests/framework/testSecondaryView.cpp b/tests/framework/testSecondaryView.cpp
index a2a161bd8..db14cdd8a 100644
--- a/tests/framework/testSecondaryView.cpp
+++ b/tests/framework/testSecondaryView.cpp
@@ -10,7 +10,7 @@
#include <corsika/framework/stack/SecondaryView.hpp>
#include <corsika/framework/stack/Stack.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <testTestStack.hpp> // for testing: simple stack. This is a
// test-build, and inluce file is obtained from CMAKE_CURRENT_SOURCE_DIR
diff --git a/tests/stack/CMakeLists.txt b/tests/stack/CMakeLists.txt
index ffb635624..8fe1070f1 100644
--- a/tests/stack/CMakeLists.txt
+++ b/tests/stack/CMakeLists.txt
@@ -4,7 +4,7 @@ set (test_stack_sources
testHistoryView.cpp
testGeometryNodeStackExtension.cpp
testDummyStack.cpp
- testSimpleStack.cpp
+ testVectorStack.cpp
testNuclearStackExtension.cpp
)
diff --git a/tests/stack/testHistoryView.cpp b/tests/stack/testHistoryView.cpp
index 284cbf7eb..ce09e81e3 100644
--- a/tests/stack/testHistoryView.cpp
+++ b/tests/stack/testHistoryView.cpp
@@ -14,7 +14,7 @@
#include <corsika/stack/DummyStack.hpp>
#include <corsika/stack/NuclearStackExtension.hpp>
-#include <corsika/framework/logging/Logging.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <catch2/catch.hpp>
diff --git a/tests/stack/testNuclearStackExtension.cpp b/tests/stack/testNuclearStackExtension.cpp
index 13a3ec18c..c00fb2fe6 100644
--- a/tests/stack/testNuclearStackExtension.cpp
+++ b/tests/stack/testNuclearStackExtension.cpp
@@ -22,7 +22,7 @@ TEST_CASE("NuclearStackExtension", "[stack]") {
CoordinateSystemPtr const& dummyCS = get_root_CoordinateSystem();
SECTION("write non nucleus") {
- nuclear_stack::NuclearStackExtension<SimpleStack,
+ nuclear_stack::NuclearStackExtension<VectorStack,
nuclear_stack::ExtendedParticleInterfaceType>
s;
s.addParticle(std::make_tuple(
@@ -33,7 +33,7 @@ TEST_CASE("NuclearStackExtension", "[stack]") {
SECTION("write nucleus") {
- nuclear_stack::NuclearStackExtension<SimpleStack,
+ nuclear_stack::NuclearStackExtension<VectorStack,
nuclear_stack::ExtendedParticleInterfaceType>
s;
s.addParticle(std::make_tuple(
@@ -212,7 +212,7 @@ TEST_CASE("NuclearStackExtension", "[stack]") {
SECTION("not allowed") {
- nuclear_stack::NuclearStackExtension<SimpleStack,
+ nuclear_stack::NuclearStackExtension<VectorStack,
nuclear_stack::ExtendedParticleInterfaceType>
s;
diff --git a/tests/stack/testSimpleStack.cpp b/tests/stack/testVectorStack.cpp
similarity index 92%
rename from tests/stack/testSimpleStack.cpp
rename to tests/stack/testVectorStack.cpp
index 7aa764359..420a0232a 100644
--- a/tests/stack/testSimpleStack.cpp
+++ b/tests/stack/testVectorStack.cpp
@@ -9,7 +9,7 @@
#define protected public // to also test the internal state of objects
#include <corsika/framework/geometry/RootCoordinateSystem.hpp>
-#include <corsika/stack/SimpleStack.hpp>
+#include <corsika/stack/VectorStack.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
#include <catch2/catch.hpp>
@@ -17,13 +17,13 @@
using namespace corsika;
using namespace std;
-TEST_CASE("SimpleStack", "[stack]") {
+TEST_CASE("VectorStack", "[stack]") {
const CoordinateSystemPtr& dummyCS = get_root_CoordinateSystem();
SECTION("read+write") {
- SimpleStack s;
+ VectorStack s;
s.addParticle(std::make_tuple(
Code::Electron, 1.5_GeV, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
@@ -39,7 +39,7 @@ TEST_CASE("SimpleStack", "[stack]") {
SECTION("write+delete") {
- SimpleStack s;
+ VectorStack s;
for (int i = 0; i < 99; ++i)
s.addParticle(std::make_tuple(
--
GitLab