From 9c02878c9aa304ded93c07a9a0133103232623e5 Mon Sep 17 00:00:00 2001
From: Nikos Karastathis <n.karastathis@kit.edu>
Date: Sun, 20 Mar 2022 10:25:26 +0100
Subject: [PATCH] get rid of SetupEnvironment
---
corsika/detail/setup/SetupStack.hpp | 8 +++++---
corsika/setup/SetupEnvironment.hpp | 28 ---------------------------
examples/boundary_example.cpp | 1 -
examples/cascade_example.cpp | 1 -
examples/cascade_proton_example.cpp | 1 -
examples/particle_list_example.cpp | 1 -
tests/common/SetupTestEnvironment.hpp | 5 ++++-
tests/common/TestStack.hpp | 6 ++++--
8 files changed, 13 insertions(+), 38 deletions(-)
delete mode 100644 corsika/setup/SetupEnvironment.hpp
diff --git a/corsika/detail/setup/SetupStack.hpp b/corsika/detail/setup/SetupStack.hpp
index bec6c0aa1..2409dd97e 100644
--- a/corsika/detail/setup/SetupStack.hpp
+++ b/corsika/detail/setup/SetupStack.hpp
@@ -14,13 +14,15 @@
#include <corsika/stack/WeightStackExtension.hpp>
#include <corsika/stack/history/HistorySecondaryProducer.hpp>
#include <corsika/stack/history/HistoryStackExtension.hpp>
-
-#include <corsika/setup/SetupEnvironment.hpp>
+#include <corsika/media/Environment.hpp>
+#include <corsika/media/IMagneticFieldModel.hpp>
+#include <corsika/media/IMediumModel.hpp>
+#include <corsika/media/IMediumPropertyModel.hpp>
namespace corsika {
namespace setup::detail {
- template <typename TEnvironment = setup::Environment>
+ template <typename TEnvironment>
class StackGenerator {
private:
using env_type = TEnvironment;
diff --git a/corsika/setup/SetupEnvironment.hpp b/corsika/setup/SetupEnvironment.hpp
deleted file mode 100644
index b7f59b31b..000000000
--- a/corsika/setup/SetupEnvironment.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/media/Environment.hpp>
-#include <corsika/media/IMagneticFieldModel.hpp>
-#include <corsika/media/IMediumModel.hpp>
-#include <corsika/media/IMediumPropertyModel.hpp>
-#include <corsika/media/IRefractiveIndexModel.hpp>
-
-namespace corsika::setup {
-
- /**
- Definition of the default environemnt model interface. Each model
- interface provides properties of the environment in a position
- bdependent way.
- */
-
- using EnvironmentInterface = IMediumPropertyModel<IMagneticFieldModel<IMediumModel>>;
- using Environment = Environment<EnvironmentInterface>;
-
-} // end namespace corsika::setup
diff --git a/examples/boundary_example.cpp b/examples/boundary_example.cpp
index bffda918f..36866057b 100644
--- a/examples/boundary_example.cpp
+++ b/examples/boundary_example.cpp
@@ -17,7 +17,6 @@
#include <corsika/output/OutputManager.hpp>
-#include <corsika/setup/SetupEnvironment.hpp>
#include <corsika/setup/SetupStack.hpp>
#include <corsika/setup/SetupTrajectory.hpp>
diff --git a/examples/cascade_example.cpp b/examples/cascade_example.cpp
index b43428ae5..ce61dd9e7 100644
--- a/examples/cascade_example.cpp
+++ b/examples/cascade_example.cpp
@@ -27,7 +27,6 @@
#include <corsika/media/MediumPropertyModel.hpp>
#include <corsika/media/UniformMagneticField.hpp>
-#include <corsika/setup/SetupEnvironment.hpp>
#include <corsika/setup/SetupStack.hpp>
#include <corsika/setup/SetupTrajectory.hpp>
diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp
index 7f41162b2..5a7845239 100644
--- a/examples/cascade_proton_example.cpp
+++ b/examples/cascade_proton_example.cpp
@@ -27,7 +27,6 @@
#include <corsika/media/MediumPropertyModel.hpp>
#include <corsika/media/UniformMagneticField.hpp>
-#include <corsika/setup/SetupEnvironment.hpp>
#include <corsika/setup/SetupStack.hpp>
#include <corsika/setup/SetupTrajectory.hpp>
diff --git a/examples/particle_list_example.cpp b/examples/particle_list_example.cpp
index 29e4bdc5f..241fda60d 100644
--- a/examples/particle_list_example.cpp
+++ b/examples/particle_list_example.cpp
@@ -9,7 +9,6 @@
#include <corsika/framework/core/ParticleProperties.hpp>
#include <corsika/modules/QGSJetII.hpp>
#include <corsika/modules/Sibyll.hpp>
-#include <corsika/setup/SetupEnvironment.hpp>
#include <corsika/framework/core/PhysicalUnits.hpp>
/*
diff --git a/tests/common/SetupTestEnvironment.hpp b/tests/common/SetupTestEnvironment.hpp
index 2be9f34d5..a118390d0 100644
--- a/tests/common/SetupTestEnvironment.hpp
+++ b/tests/common/SetupTestEnvironment.hpp
@@ -11,7 +11,10 @@
#include <corsika/framework/geometry/Point.hpp>
#include <corsika/framework/geometry/CoordinateSystem.hpp>
-#include <corsika/setup/SetupEnvironment.hpp>
+#include <corsika/media/Environment.hpp>
+#include <corsika/media/IMagneticFieldModel.hpp>
+#include <corsika/media/IMediumModel.hpp>
+#include <corsika/media/IMediumPropertyModel.hpp>
#include <corsika/media/UniformMagneticField.hpp>
#include <corsika/media/MediumPropertyModel.hpp>
#include <corsika/media/HomogeneousMedium.hpp>
diff --git a/tests/common/TestStack.hpp b/tests/common/TestStack.hpp
index 299a07429..2488fc1f0 100644
--- a/tests/common/TestStack.hpp
+++ b/tests/common/TestStack.hpp
@@ -14,8 +14,10 @@
#include <corsika/stack/WeightStackExtension.hpp>
#include <corsika/stack/history/HistorySecondaryProducer.hpp>
#include <corsika/stack/history/HistoryStackExtension.hpp>
-
-#include <corsika/setup/SetupEnvironment.hpp>
+#include <corsika/media/Environment.hpp>
+#include <corsika/media/IMagneticFieldModel.hpp>
+#include <corsika/media/IMediumModel.hpp>
+#include <corsika/media/IMediumPropertyModel.hpp>
namespace corsika {
--
GitLab