From cba41ff4f3797fec0b4e71cc20adca34ebf6ce31 Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Tue, 18 May 2021 10:38:24 -1000
Subject: [PATCH] Remove Setup from CONEX.
---
corsika/detail/modules/conex/CONEXhybrid.inl | 3 ++-
corsika/modules/conex/CONEXhybrid.hpp | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/corsika/detail/modules/conex/CONEXhybrid.inl b/corsika/detail/modules/conex/CONEXhybrid.inl
index 6d94ab747..6fbfb02e1 100644
--- a/corsika/detail/modules/conex/CONEXhybrid.inl
+++ b/corsika/detail/modules/conex/CONEXhybrid.inl
@@ -125,7 +125,8 @@ namespace corsika {
::conex::conexrun_(ipart, eprima, theta, phi, xminp, dimpact, ioseed.data());
}
- inline void CONEXhybrid::doSecondaries(setup::StackView& vS) {
+ template <typename TStackView>
+ inline void CONEXhybrid::doSecondaries(TStackView& vS) {
auto p = vS.begin();
while (p != vS.end()) {
Code const pid = p.getPID();
diff --git a/corsika/modules/conex/CONEXhybrid.hpp b/corsika/modules/conex/CONEXhybrid.hpp
index 659cbe95b..2f0b80873 100644
--- a/corsika/modules/conex/CONEXhybrid.hpp
+++ b/corsika/modules/conex/CONEXhybrid.hpp
@@ -14,7 +14,6 @@
#include <corsika/framework/geometry/Vector.hpp>
#include <corsika/framework/process/SecondariesProcess.hpp>
#include <corsika/media/ShowerAxis.hpp>
-#include <corsika/setup/SetupStack.hpp>
#include <corsika/modules/conex/CONEX_f.hpp>
@@ -29,7 +28,9 @@ namespace corsika {
public:
CONEXhybrid(Point center, ShowerAxis const& showerAxis, LengthType groundDist,
LengthType injectionHeight, HEPEnergyType primaryEnergy, PDGCode pdg);
- void doSecondaries(setup::StackView&);
+
+ template <typename TStackView>
+ void doSecondaries(TStackView&);
void solveCE();
--
GitLab