From f706a49b0044af41c13a76335df32aafb1fb592b Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@tu-dortmund.de>
Date: Fri, 2 Oct 2020 16:59:30 +0200
Subject: [PATCH] standard observation level in vertical_EAS
---
Documentation/Examples/vertical_EAS.cc | 7 ++-----
Framework/Cascade/Cascade.h | 2 +-
Processes/ParticleCut/ParticleCut.cc | 1 -
Stack/History/Event.hpp | 3 +--
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index 577ea4166..6eb662ec4 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -38,8 +38,6 @@
#include <corsika/units/PhysicalUnits.h>
#include <corsika/utl/CorsikaFenv.h>
-#include <corsika/stack/history/HistoryObservationPlane.hpp>
-
#include <iomanip>
#include <iostream>
#include <limits>
@@ -209,9 +207,8 @@ int main(int argc, char** argv) {
process::longitudinal_profile::LongitudinalProfile longprof{showerAxis};
Plane const obsPlane(showerCore, Vector<dimensionless_d>(rootCS, {0., 0., 1.}));
- //~ process::observation_plane::ObservationPlane observationLevel(obsPlane,
- //~ "particles.dat");
- corsika::history::HistoryObservationPlane observationLevel{stack, obsPlane};
+ process::observation_plane::ObservationPlane observationLevel(obsPlane,
+ "particles.dat");
process::UrQMD::UrQMD urqmd;
process::interaction_counter::InteractionCounter urqmdCounted{urqmd};
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index 986526333..7353b9a84 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -16,7 +16,7 @@
#include <corsika/random/UniformRealDistribution.h>
#include <corsika/stack/SecondaryView.h>
#include <corsika/units/PhysicalUnits.h>
-#include <corsika/history/EventType.hpp>
+#include <corsika/stack/history/EventType.hpp>
#include <corsika/logging/Logging.h>
diff --git a/Processes/ParticleCut/ParticleCut.cc b/Processes/ParticleCut/ParticleCut.cc
index 69a0216e2..1616f6248 100644
--- a/Processes/ParticleCut/ParticleCut.cc
+++ b/Processes/ParticleCut/ParticleCut.cc
@@ -95,7 +95,6 @@ namespace corsika::process {
} else {
++particle; // next entry in SecondaryView
}
- ++p; // next entry in SecondaryView
}
return EProcessReturn::eOk;
}
diff --git a/Stack/History/Event.hpp b/Stack/History/Event.hpp
index c569a577f..de6131164 100644
--- a/Stack/History/Event.hpp
+++ b/Stack/History/Event.hpp
@@ -10,9 +10,8 @@
#include <corsika/logging/Logging.h>
#include <corsika/particles/ParticleProperties.h>
+#include <corsika/stack/history/EventType.hpp>
#include <corsika/stack/history/SecondaryParticle.hpp>
-#include <corsika/logging/Logging.h>
-#include <corsika/history/EventType.hpp>
#include <iostream>
#include <memory>
--
GitLab