From ca7a1f6011cd753dad6112953fe0e3b83efb5794 Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu>
Date: Thu, 24 Sep 2020 18:50:45 +0200
Subject: [PATCH] adapt testCascade
---
Framework/Cascade/Cascade.h | 3 +--
Framework/Cascade/testCascade.cc | 15 ++++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index d83738c5e..114c2149c 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -145,8 +145,7 @@ namespace corsika::cascade {
std::cout << "forced interaction!" << std::endl;
auto vParticle = fStack.GetNextParticle();
TStackView secondaries(vParticle);
- auto projectile = secondaries.GetProjectile();
- interaction(vParticle, projectile);
+ interaction(vParticle, secondaries);
fProcessSequence.DoSecondaries(secondaries);
vParticle.Delete(); // todo: this should be reviewed, see below
}
diff --git a/Framework/Cascade/testCascade.cc b/Framework/Cascade/testCascade.cc
index 57f715ef5..9db2c73cc 100644
--- a/Framework/Cascade/testCascade.cc
+++ b/Framework/Cascade/testCascade.cc
@@ -69,18 +69,19 @@ public:
return fX0;
}
- template <typename TProjectile>
- corsika::process::EProcessReturn DoInteraction(TProjectile& vP) {
+ template <typename TSecondaryView>
+ corsika::process::EProcessReturn DoInteraction(TSecondaryView& view) {
fCalls++;
- const HEPEnergyType E = vP.GetEnergy();
- vP.AddSecondary(
+ auto const projectile = view.GetProjectile();
+ const HEPEnergyType E = projectile.GetEnergy();
+ view.AddSecondary(
std::tuple<particles::Code, units::si::HEPEnergyType,
corsika::stack::MomentumVector, geometry::Point, units::si::TimeType>{
- vP.GetPID(), E / 2, vP.GetMomentum(), vP.GetPosition(), vP.GetTime()});
- vP.AddSecondary(
+ projectile.GetPID(), E / 2, projectile.GetMomentum(), projectile.GetPosition(), projectile.GetTime()});
+ view.AddSecondary(
std::tuple<particles::Code, units::si::HEPEnergyType,
corsika::stack::MomentumVector, geometry::Point, units::si::TimeType>{
- vP.GetPID(), E / 2, vP.GetMomentum(), vP.GetPosition(), vP.GetTime()});
+ projectile.GetPID(), E / 2, projectile.GetMomentum(), projectile.GetPosition(), projectile.GetTime()});
return EProcessReturn::eInteracted;
}
--
GitLab