From b9ea500837e1aa27ded9604ccca171a11e45c7dd Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Wed, 2 Jun 2021 11:26:10 -1000
Subject: [PATCH] Fix forwarding for observation plane.
---
corsika/detail/modules/ObservationPlane.inl | 7 +++++--
corsika/modules/ObservationPlane.hpp | 4 +++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl
index 99d416bc3..a8882c7d3 100644
--- a/corsika/detail/modules/ObservationPlane.inl
+++ b/corsika/detail/modules/ObservationPlane.inl
@@ -9,15 +9,18 @@
namespace corsika {
template <typename TOutput>
+ template <typename... TArgs>
ObservationPlane<TOutput>::ObservationPlane(Plane const& obsPlane,
DirectionVector const& x_axis,
- bool const deleteOnHit)
+ bool const deleteOnHit,
+ TArgs&&... args)
: plane_(obsPlane)
, deleteOnHit_(deleteOnHit)
, energy_ground_(0_GeV)
, count_ground_(0)
, xAxis_(x_axis.normalized())
- , yAxis_(obsPlane.getNormal().cross(xAxis_)) {}
+ , yAxis_(obsPlane.getNormal().cross(xAxis_))
+ , TOutput(std::forward<TArgs>(args)...) {}
template <typename TTracking, typename TOutput>
template <typename TParticle, typename TTrajectory>
diff --git a/corsika/modules/ObservationPlane.hpp b/corsika/modules/ObservationPlane.hpp
index b2c276ee6..cb84db4be 100644
--- a/corsika/modules/ObservationPlane.hpp
+++ b/corsika/modules/ObservationPlane.hpp
@@ -36,7 +36,9 @@ namespace corsika {
public TOutputWriter {
public:
- ObservationPlane(Plane const&, DirectionVector const&, bool const = true);
+ template <typename... TArgs>
+ ObservationPlane(Plane const&, DirectionVector const&, bool const = true,
+ TArgs&&... args);
~ObservationPlane() {}
--
GitLab