From be5b9fbc77f89e5a3d8641b1d90ef56236f7623e Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Tue, 18 May 2021 09:23:36 -1000
Subject: [PATCH] Removed setup from *most* of Sibyll.
---
corsika/detail/modules/sibyll/Decay.inl | 7 -------
corsika/detail/modules/sibyll/Interaction.inl | 10 ++--------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/corsika/detail/modules/sibyll/Decay.inl b/corsika/detail/modules/sibyll/Decay.inl
index 1474df5c3..55f8446ff 100644
--- a/corsika/detail/modules/sibyll/Decay.inl
+++ b/corsika/detail/modules/sibyll/Decay.inl
@@ -12,16 +12,9 @@
#include <corsika/modules/sibyll/ParticleConversion.hpp>
#include <corsika/modules/sibyll/SibStack.hpp>
-#include <corsika/setup/SetupStack.hpp>
-#include <corsika/setup/SetupTrajectory.hpp>
-
#include <iostream>
#include <vector>
-using SetupView = corsika::setup::StackView;
-using SetupProjectile = corsika::setup::StackView::particle_type;
-using SetupParticle = corsika::setup::Stack::particle_type;
-
namespace corsika::sibyll {
inline Decay::Decay(const bool sibyll_printout_on)
diff --git a/corsika/detail/modules/sibyll/Interaction.inl b/corsika/detail/modules/sibyll/Interaction.inl
index 39d240df8..087946bac 100644
--- a/corsika/detail/modules/sibyll/Interaction.inl
+++ b/corsika/detail/modules/sibyll/Interaction.inl
@@ -15,18 +15,12 @@
#include <corsika/framework/geometry/FourVector.hpp>
#include <corsika/modules/sibyll/ParticleConversion.hpp>
#include <corsika/modules/sibyll/SibStack.hpp>
-#include <corsika/setup/SetupStack.hpp>
-#include <corsika/setup/SetupTrajectory.hpp>
#include <corsika/framework/utility/COMBoost.hpp>
#include <sibyll2.3d.hpp>
#include <tuple>
-using namespace corsika;
-using SetupParticle = setup::Stack::stack_iterator_type;
-using SetupView = setup::StackView;
-using Track = setup::Trajectory;
namespace corsika::sibyll {
@@ -84,9 +78,9 @@ namespace corsika::sibyll {
return std::make_tuple(sigProd * 1_mb, sigEla * 1_mb);
}
- template <>
+ template <typename TParticle>
inline corsika::GrammageType Interaction::getInteractionLength(
- SetupParticle const& projectile) const {
+ TParticle const& projectile) const {
const corsika::Code corsikaBeamId = projectile.getPID();
--
GitLab