diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl index 37301ba6c409f7fcf001aad81997caaf4a80a8b0..a09324d9883dd60c990b618d246ad816238d32fd 100644 --- a/corsika/detail/modules/ObservationPlane.inl +++ b/corsika/detail/modules/ObservationPlane.inl @@ -6,6 +6,9 @@ * the license. */ +#include <corsika/setup/SetupStack.hpp> +#include <corsika/setup/SetupTrajectory.hpp> + namespace corsika { template <typename TOutput> @@ -47,7 +50,7 @@ namespace corsika { template <typename TOutput> inline LengthType ObservationPlane<TOutput>::getMaxStepLength( - corsika::setup::Stack::particle_type const& vParticle, + corsika::setup::Stack::particle_type const& particle, corsika::setup::Trajectory const& trajectory) { Intersections const intersection = diff --git a/corsika/detail/output/OutputManager.inl b/corsika/detail/output/OutputManager.inl index b2483a7ff88243ff366d755efd33e935b6e20614..f7936166cc09e586ec28f573be33b7bb0c10ab0b 100644 --- a/corsika/detail/output/OutputManager.inl +++ b/corsika/detail/output/OutputManager.inl @@ -145,7 +145,6 @@ namespace corsika { if (state_ == OutputState::LibraryReady) { endOfLibrary(); } } - // void OutputManager::add(std::string const& name, BaseOutput& output) { template <typename TOutput> void OutputManager::add(std::string const& name, TOutput& output) { diff --git a/tests/framework/testCascade.cpp b/tests/framework/testCascade.cpp index 633f30f47328970be8374552ecbb86411aaa6936..16ed61826867efb14e0636bfe468b68f70a85411 100644 --- a/tests/framework/testCascade.cpp +++ b/tests/framework/testCascade.cpp @@ -24,6 +24,8 @@ #include <corsika/media/HomogeneousMedium.hpp> #include <corsika/media/NuclearComposition.hpp> +#include <corsika/output/DummyOutputManager.hpp> + #include <SetupTestTrajectory.hpp> #include <catch2/catch.hpp> @@ -163,8 +165,10 @@ TEST_CASE("Cascade", "[Cascade]") { Point(rootCS, {0_m, 0_m, 10_km}), 0_ns)); DummyTracking tracking; - Cascade<DummyTracking, decltype(sequence), TestCascadeStack, TestCascadeStackView> EAS( - env, tracking, sequence, stack); + DummyOutputManager output; + Cascade<DummyTracking, decltype(sequence), DummyOutputManager, TestCascadeStack, + TestCascadeStackView> + EAS(env, tracking, sequence, output, stack); SECTION("full cascade") { EAS.run(); diff --git a/tests/modules/testObservationPlane.cpp b/tests/modules/testObservationPlane.cpp index 90a12288bd0b24c4c3021adaf66630fd1265d688..1c0b65fc80c72dc6e11f02e3d5d7cd3b513aff74 100644 --- a/tests/modules/testObservationPlane.cpp +++ b/tests/modules/testObservationPlane.cpp @@ -54,8 +54,7 @@ TEST_CASE("ObservationPlane", "[proccesses][observation_plane]") { SECTION("horizontal plane") { Plane const obsPlane(Point(cs, {10_m, 0_m, 0_m}), DirectionVector(cs, {1., 0., 0.})); - ObservationPlane obs(obsPlane, DirectionVector(cs, {0., 1., 0.}), "particles.dat", - true); + ObservationPlane obs(obsPlane, DirectionVector(cs, {0., 1., 0.})); LengthType const length = obs.getMaxStepLength(particle, no_used_track); ProcessReturn const ret = obs.doContinuous(particle, no_used_track, true); @@ -66,8 +65,7 @@ TEST_CASE("ObservationPlane", "[proccesses][observation_plane]") { SECTION("transparent plane") { Plane const obsPlane(Point(cs, {1_m, 0_m, 0_m}), DirectionVector(cs, {1., 0., 0.})); - ObservationPlane obs(obsPlane, DirectionVector(cs, {0., 0., 1.}), "particles.dat", - false); + ObservationPlane obs(obsPlane, DirectionVector(cs, {0., 0., 1.})); LengthType const length = obs.getMaxStepLength(particle, no_used_track); ProcessReturn const ret = obs.doContinuous(particle, no_used_track, true); @@ -85,8 +83,7 @@ TEST_CASE("ObservationPlane", "[proccesses][observation_plane]") { Plane const obsPlane(Point(cs, {10_m, 5_m, 5_m}), DirectionVector(cs, {1, 0.1, -0.05})); - ObservationPlane obs(obsPlane, DirectionVector(cs, {0., 1., 0.}), "particles.dat", - true); + ObservationPlane obs(obsPlane, DirectionVector(cs, {0., 1., 0.})); LengthType const length = obs.getMaxStepLength(particle, no_used_track); ProcessReturn const ret = obs.doContinuous(particle, no_used_track, true);