From b6dc15bff83d34668a22a9dbcc75a6792f6d2e1a Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Tue, 1 Jun 2021 22:19:25 -1000
Subject: [PATCH] Move TrackWriter back to new architecture.
---
corsika/detail/modules/TrackWriter.inl | 7 ++++---
corsika/modules/TrackWriter.hpp | 10 +++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/corsika/detail/modules/TrackWriter.inl b/corsika/detail/modules/TrackWriter.inl
index 811b27ae1..e44119069 100644
--- a/corsika/detail/modules/TrackWriter.inl
+++ b/corsika/detail/modules/TrackWriter.inl
@@ -15,9 +15,9 @@
namespace corsika {
+
template <typename TOutput>
- inline TrackWriter<TOutput>::TrackWriter(TOutput& output)
- : output_(output) {}
+ inline TrackWriter<TOutput>::TrackWriter() {}
template <typename TOutput>
template <typename TParticle, typename TTrack>
@@ -49,7 +49,8 @@ namespace corsika {
// add default units for values
node["type"] = "TrackWriter";
- node["units"] = "GeV | m | s";
+ node["units"]["energy"] = "GeV";
+ node["units"]["length"] = "m";
return node;
}
diff --git a/corsika/modules/TrackWriter.hpp b/corsika/modules/TrackWriter.hpp
index cf21939d8..4d1a956bb 100644
--- a/corsika/modules/TrackWriter.hpp
+++ b/corsika/modules/TrackWriter.hpp
@@ -9,16 +9,16 @@
#pragma once
#include <corsika/framework/process/ContinuousProcess.hpp>
-#include <corsika/modules/writers/TrackWriterOff.hpp>
#include <corsika/modules/writers/TrackWriterParquet.hpp>
namespace corsika {
- template <typename TOutput = TrackWriterOff>
- class TrackWriter : public ContinuousProcess<TrackWriter<TOutput>> {
+ template <typename TOutput = WriterOff>
+ class TrackWriter : public ContinuousProcess<TrackWriter<TOutput>>,
+ public TOutput {
public:
- TrackWriter(TOutput& output);
+ TrackWriter();
template <typename TParticle, typename TTrack>
ProcessReturn doContinuous(TParticle const&, TTrack const&, bool const limitFlag);
@@ -29,7 +29,7 @@ namespace corsika {
YAML::Node getConfig() const;
private:
- TOutput& output_;
+
};
} // namespace corsika
--
GitLab