From 7e1ca43a3204c39c2832dc94baea798610600e4a Mon Sep 17 00:00:00 2001
From: Felix Riehn <felix@matilda>
Date: Wed, 5 Dec 2018 08:39:21 +0000
Subject: [PATCH] fixed rebase
---
Documentation/Examples/cascade_example.cc | 11 ++++++-----
Framework/Cascade/SibStack.h | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index 5cdcf73e8..5697e0d57 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -121,7 +121,7 @@ public:
}
template <typename Particle, typename Stack>
- EProcessReturn DoContinuous(Particle&, Trajectory&, Stack&) const {
+ EProcessReturn DoContinuous(Particle&, setup::Trajectory&, Stack&) const {
// corsika::utls::ignore(p);
return EProcessReturn::eOk;
}
@@ -132,7 +132,7 @@ public:
if( process::sibyll::CanInteract( p.GetPID() ) ){
cout << "defining coordinates" << endl;
// coordinate system, get global frame of reference
- CoordinateSystem rootCS = CoordinateSystem::CreateRootCS();
+ CoordinateSystem& rootCS = RootCoordinateSystem::GetInstance().GetRootCS();
QuantityVector<length_d> const coordinates{0_m, 0_m, 0_m};
Point pOrig(rootCS, coordinates);
@@ -336,12 +336,13 @@ double s_rndm_(int&) {
int main() {
// coordinate system, get global frame of reference
- CoordinateSystem rootCS = CoordinateSystem::CreateRootCS();
+ CoordinateSystem& rootCS = RootCoordinateSystem::GetInstance().GetRootCS();
QuantityVector<length_d> const coordinates{0_m, 0_m, 0_m};
Point pOrig(rootCS, coordinates);
-
- stack_inspector::StackInspector<setup::Stack, setup::Trajectory> p0(true);
+
+ tracking_line::TrackingLine<setup::Stack> tracking;
+ stack_inspector::StackInspector<setup::Stack> p0(true);
ProcessSplit p1;
const auto sequence = p0 + p1;
diff --git a/Framework/Cascade/SibStack.h b/Framework/Cascade/SibStack.h
index c18cb3e33..57a3f9c16 100644
--- a/Framework/Cascade/SibStack.h
+++ b/Framework/Cascade/SibStack.h
@@ -40,7 +40,7 @@ public:
super_stupid::MomentumVector GetMomentum(const int i) const
{
- CoordinateSystem rootCS = CoordinateSystem::CreateRootCS();
+ CoordinateSystem& rootCS = RootCoordinateSystem::GetInstance().GetRootCS();
corsika::geometry::QuantityVector<momentum_d> components{ s_plist_.p[0][i] * 1_GeV / si::constants::c , s_plist_.p[1][i] * 1_GeV / si::constants::c, s_plist_.p[2][i] * 1_GeV / si::constants::c};
super_stupid::MomentumVector v1(rootCS,components);
return v1;
--
GitLab