From b15036345cf683bed136883b1f2d8d7a38564b33 Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Tue, 18 May 2021 09:20:07 -1000
Subject: [PATCH] Removed Setup from PYTHIA.
---
corsika/detail/modules/pythia8/Decay.inl | 2 --
corsika/detail/modules/pythia8/Interaction.inl | 5 ++---
corsika/modules/pythia8/Interaction.hpp | 5 ++---
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/corsika/detail/modules/pythia8/Decay.inl b/corsika/detail/modules/pythia8/Decay.inl
index 163ec37a7..e02f38b86 100644
--- a/corsika/detail/modules/pythia8/Decay.inl
+++ b/corsika/detail/modules/pythia8/Decay.inl
@@ -12,8 +12,6 @@
#include <corsika/framework/utility/COMBoost.hpp>
-#include <corsika/setup/SetupStack.hpp>
-#include <corsika/setup/SetupTrajectory.hpp>
namespace corsika::pythia8 {
diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl
index 74a910de7..56dfeb2e4 100644
--- a/corsika/detail/modules/pythia8/Interaction.inl
+++ b/corsika/detail/modules/pythia8/Interaction.inl
@@ -15,8 +15,6 @@
#include <corsika/media/Environment.hpp>
#include <corsika/media/NuclearComposition.hpp>
-#include <corsika/setup/SetupStack.hpp>
-
#include <tuple>
namespace corsika::pythia8 {
@@ -155,8 +153,9 @@ namespace corsika::pythia8 {
}
}
+ template <typename TParticle>
inline GrammageType Interaction::getInteractionLength(
- corsika::setup::Stack::particle_type const& particle) {
+ TParticle const& particle) {
// coordinate system, get global frame of reference
MomentumVector const& pMomentum = particle.getMomentum();
diff --git a/corsika/modules/pythia8/Interaction.hpp b/corsika/modules/pythia8/Interaction.hpp
index f2d264db1..868554046 100644
--- a/corsika/modules/pythia8/Interaction.hpp
+++ b/corsika/modules/pythia8/Interaction.hpp
@@ -14,8 +14,6 @@
#include <corsika/framework/process/InteractionProcess.hpp>
#include <corsika/modules/pythia8/Pythia8.hpp>
-#include <corsika/setup/SetupStack.hpp>
-
#include <tuple>
namespace corsika::pythia8 {
@@ -38,7 +36,8 @@ namespace corsika::pythia8 {
std::tuple<CrossSectionType, CrossSectionType> getCrossSection(
const Code BeamId, const Code TargetId, const HEPEnergyType CoMenergy);
- GrammageType getInteractionLength(corsika::setup::Stack::particle_type const&);
+ template <typename TParticle>
+ GrammageType getInteractionLength(TParticle const&);
/**
In this function PYTHIA is called to produce one event. The
--
GitLab