From 518bb8e3dd54f8552c4cd202d88907eff8602f1f Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Mon, 29 Mar 2021 23:39:45 -1000
Subject: [PATCH] Remove radius from ObservationPlane output.
---
corsika/detail/modules/ObservationPlane.inl | 6 +++---
.../modules/writers/ObservationPlaneWriterParquet.inl | 7 ++-----
corsika/modules/writers/ObservationPlaneWriterParquet.hpp | 3 +--
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl
index 3f11726d5..0f3b6b29a 100644
--- a/corsika/detail/modules/ObservationPlane.inl
+++ b/corsika/detail/modules/ObservationPlane.inl
@@ -43,9 +43,9 @@ namespace corsika {
auto const displacement = trajectory.getPosition(1) - plane_.getCenter();
// add our particles to the output file stream
- this->write(particle.getPID(), energy, displacement.dot(xAxis_),
- displacement.dot(yAxis_),
- (trajectory.getPosition(1) - plane_.getCenter()).getNorm());
+ this->write(particle.getPID(), energy,
+ displacement.dot(xAxis_),
+ displacement.dot(yAxis_));
if (deleteOnHit_) {
count_ground_++;
diff --git a/corsika/detail/modules/writers/ObservationPlaneWriterParquet.inl b/corsika/detail/modules/writers/ObservationPlaneWriterParquet.inl
index 8599c4684..76ae3af1c 100644
--- a/corsika/detail/modules/writers/ObservationPlaneWriterParquet.inl
+++ b/corsika/detail/modules/writers/ObservationPlaneWriterParquet.inl
@@ -28,8 +28,6 @@ namespace corsika {
parquet::ConvertedType::NONE);
addField("y", parquet::Repetition::REQUIRED, parquet::Type::FLOAT,
parquet::ConvertedType::NONE);
- addField("radius", parquet::Repetition::REQUIRED, parquet::Type::FLOAT,
- parquet::ConvertedType::NONE);
// and build the streamer
buildStreamer();
@@ -42,13 +40,12 @@ namespace corsika {
void ObservationPlaneWriterParquet::write(Code const& pid,
units::si::HEPEnergyType const& energy,
units::si::LengthType const& x,
- units::si::LengthType const& y,
- units::si::LengthType const& radius) {
+ units::si::LengthType const& y) {
using namespace units::si;
// write the next row - we must write `shower_` first.
(*writer_) << shower_ << static_cast<int>(get_PDG(pid)) << energy / 1_eV << x / 1_m
- << y / 1_m << radius / 1_m << parquet::EndRow;
+ << y / 1_m << parquet::EndRow;
}
} // namespace corsika
diff --git a/corsika/modules/writers/ObservationPlaneWriterParquet.hpp b/corsika/modules/writers/ObservationPlaneWriterParquet.hpp
index 980fc74cf..53ec19a2e 100644
--- a/corsika/modules/writers/ObservationPlaneWriterParquet.hpp
+++ b/corsika/modules/writers/ObservationPlaneWriterParquet.hpp
@@ -48,8 +48,7 @@ namespace corsika {
* Write a particle to the file.
*/
void write(Code const& pid, units::si::HEPEnergyType const& energy,
- units::si::LengthType const& x, units::si::LengthType const& y,
- units::si::LengthType const& radius);
+ units::si::LengthType const& x, units::si::LengthType const& y);
}; // class ObservationPlaneWriterParquet
--
GitLab