From 4d0df41e38e2b940af1c44510d1ab23c29fe223a Mon Sep 17 00:00:00 2001
From: Felix Riehn <felix@matilda>
Date: Sat, 25 Mar 2023 08:22:38 +0000
Subject: [PATCH] change output to kinetic energy again, with label
---
corsika/detail/modules/ObservationPlane.inl | 5 ++---
corsika/detail/modules/writers/ParticleWriterParquet.inl | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl
index 458615961..46488d4f1 100644
--- a/corsika/detail/modules/ObservationPlane.inl
+++ b/corsika/detail/modules/ObservationPlane.inl
@@ -46,14 +46,13 @@ namespace corsika {
return ProcessReturn::Ok;
}
- HEPEnergyType const energy =
- step.getEkinPost() + get_mass(step.getParticlePre().getPID());
+ HEPEnergyType const kineticEnergy = step.getEkinPost();
Point const pointOfIntersection = step.getPositionPost();
Vector const displacement = pointOfIntersection - plane_.getCenter();
// add our particles to the output file stream
double const weight = 1.; // step.getParticlePre().getWeight();
- this->write(step.getParticlePre().getPID(), energy, displacement.dot(xAxis_),
+ this->write(step.getParticlePre().getPID(), kineticEnergy, displacement.dot(xAxis_),
displacement.dot(yAxis_), 0_m, step.getTimePost(), weight);
CORSIKA_LOG_TRACE("Particle detected absorbed={}", deleteOnHit_);
diff --git a/corsika/detail/modules/writers/ParticleWriterParquet.inl b/corsika/detail/modules/writers/ParticleWriterParquet.inl
index 271346417..967b32d2f 100644
--- a/corsika/detail/modules/writers/ParticleWriterParquet.inl
+++ b/corsika/detail/modules/writers/ParticleWriterParquet.inl
@@ -29,8 +29,8 @@ namespace corsika {
// build the schema
output_.addField("pdg", parquet::Repetition::REQUIRED, parquet::Type::INT32,
parquet::ConvertedType::INT_32);
- output_.addField("energy", parquet::Repetition::REQUIRED, parquet::Type::FLOAT,
- parquet::ConvertedType::NONE);
+ output_.addField("kinetic_energy", parquet::Repetition::REQUIRED,
+ parquet::Type::FLOAT, parquet::ConvertedType::NONE);
output_.addField("x", parquet::Repetition::REQUIRED, parquet::Type::FLOAT,
parquet::ConvertedType::NONE);
output_.addField("y", parquet::Repetition::REQUIRED, parquet::Type::FLOAT,
--
GitLab