From 8b7a7de12088a96e04e3f56cdf2e8cc4be067092 Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Tue, 30 Mar 2021 22:59:17 -1000
Subject: [PATCH] Minor updates to ObservationPlane.
---
corsika/modules/ObservationPlane.hpp | 4 +---
.../writers/ObservationPlaneWriterParquet.hpp | 2 +-
corsika/output/ParquetStreamer.hpp | 12 +++++++++---
python/corsika/io/outputs/observation_plane.py | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/corsika/modules/ObservationPlane.hpp b/corsika/modules/ObservationPlane.hpp
index aec2c0086..f37591c6e 100644
--- a/corsika/modules/ObservationPlane.hpp
+++ b/corsika/modules/ObservationPlane.hpp
@@ -15,9 +15,6 @@
#include <corsika/setup/SetupTrajectory.hpp>
#include <corsika/modules/writers/ObservationPlaneWriterParquet.hpp>
-#include <fstream>
-#include <string>
-
namespace corsika {
/**
@@ -42,6 +39,7 @@ namespace corsika {
void reset();
HEPEnergyType getEnergyGround() const { return energy_ground_; }
YAML::Node getConfig() const;
+
private:
Plane const plane_;
bool const deleteOnHit_;
diff --git a/corsika/modules/writers/ObservationPlaneWriterParquet.hpp b/corsika/modules/writers/ObservationPlaneWriterParquet.hpp
index cda8b8fb5..240b808e1 100644
--- a/corsika/modules/writers/ObservationPlaneWriterParquet.hpp
+++ b/corsika/modules/writers/ObservationPlaneWriterParquet.hpp
@@ -21,7 +21,7 @@ namespace corsika {
public:
/**
- * Write an observation plane to a directory.
+ * Construct an ObservationPlane.
*
* @param name The name of this output.
*/
diff --git a/corsika/output/ParquetStreamer.hpp b/corsika/output/ParquetStreamer.hpp
index 3e5c2f1c0..240e2af0f 100644
--- a/corsika/output/ParquetStreamer.hpp
+++ b/corsika/output/ParquetStreamer.hpp
@@ -1,3 +1,4 @@
+
/*
* (c) Copyright 2021 CORSIKA Project, corsika-project@lists.kit.edu
*
@@ -26,11 +27,11 @@ namespace corsika {
class ParquetStreamer {
protected:
- std::shared_ptr<parquet::StreamWriter> writer_; ///< The stream writer to 'outfile'
- parquet::WriterProperties::Builder builder_; ///< The writer properties builder.
- parquet::schema::NodeVector fields_; ///< The fields in this file.
+ parquet::WriterProperties::Builder builder_; ///< The writer properties builder.
+ parquet::schema::NodeVector fields_; ///< The fields in this file.
std::shared_ptr<parquet::schema::GroupNode> schema_; ///< The schema for this file.
std::shared_ptr<arrow::io::FileOutputStream> outfile_; ///< The output file.
+ std::shared_ptr<parquet::StreamWriter> writer_; ///< The stream writer to 'outfile'
public:
/**
@@ -59,6 +60,11 @@ namespace corsika {
*/
void closeStreamer();
+ /**
+ * Return a reference to the underlying writer.
+ */
+ std::shared_ptr<parquet::StreamWriter> getWriter();
+
}; // class ParquetHelper
} // namespace corsika
diff --git a/python/corsika/io/outputs/observation_plane.py b/python/corsika/io/outputs/observation_plane.py
index 3b2680e17..271d145b4 100644
--- a/python/corsika/io/outputs/observation_plane.py
+++ b/python/corsika/io/outputs/observation_plane.py
@@ -9,7 +9,7 @@
"""
import logging
import os.path as op
-from typing import Any, Dict
+from typing import Any
import pyarrow.parquet as pq
--
GitLab