From a63bcce1c6da4405e9bf795bf18a4a5a1bbffb17 Mon Sep 17 00:00:00 2001
From: Alan Coleman <alanc@udel.edu>
Date: Fri, 8 Mar 2024 18:43:23 +0100
Subject: [PATCH] clang
---
applications/c8_air_shower.cpp | 3 +-
.../modules/writers/InteractionWriter.inl | 63 +++++++++----------
corsika/modules/writers/InteractionWriter.hpp | 8 ++-
tests/output/testInteractionWriter.cpp | 20 +++---
4 files changed, 45 insertions(+), 49 deletions(-)
diff --git a/applications/c8_air_shower.cpp b/applications/c8_air_shower.cpp
index ff61c9a9d..473e05b86 100644
--- a/applications/c8_air_shower.cpp
+++ b/applications/c8_air_shower.cpp
@@ -572,7 +572,8 @@ int main(int argc, char** argv) {
// register ZHS with the output manager
output.add("ZHS", zhs);
- InteractionWriter<setup::Tracking, ParticleWriterParquet> inter_writer(showerAxis, observationLevel);
+ InteractionWriter<setup::Tracking, ParticleWriterParquet> inter_writer(
+ showerAxis, observationLevel);
output.add("interactions", inter_writer);
// assemble the final process sequence with radio
diff --git a/corsika/detail/modules/writers/InteractionWriter.inl b/corsika/detail/modules/writers/InteractionWriter.inl
index 596844035..1e0108dbe 100644
--- a/corsika/detail/modules/writers/InteractionWriter.inl
+++ b/corsika/detail/modules/writers/InteractionWriter.inl
@@ -13,20 +13,18 @@
namespace corsika {
template <typename TTracking, typename TOutput>
- inline InteractionWriter<TTracking, TOutput>::InteractionWriter(ShowerAxis const& axis, ObservationPlane<TTracking, TOutput> const& obsPlane)
+ inline InteractionWriter<TTracking, TOutput>::InteractionWriter(
+ ShowerAxis const& axis, ObservationPlane<TTracking, TOutput> const& obsPlane)
: obsPlane_(obsPlane)
, showerAxis_(axis)
, interactionCounter_(0)
, showerId_(0)
- , nSecondaries_(0)
- {}
+ , nSecondaries_(0) {}
template <typename TTracking, typename TOutput>
template <typename TStackView>
inline void InteractionWriter<TTracking, TOutput>::doSecondaries(TStackView& vS) {
- if (interactionCounter_++) {
- return;
- }
+ if (interactionCounter_++) { return; }
auto primary = vS.getProjectile();
auto dX = showerAxis_.getProjectedX(primary.getPosition());
@@ -36,17 +34,16 @@ namespace corsika {
Vector const dr_prim = primary.getPosition() - obsPlane_.getPlane().getCenter();
auto const p_prim = primary.getMomentum();
- *(output_.getWriter()) << showerId_ << true
- << static_cast<int>(get_PDG(primary.getPID()))
- << static_cast<float>(dr_prim.dot(obsPlane_.getXAxis()) / 1_m)
- << static_cast<float>(dr_prim.dot(obsPlane_.getYAxis()) / 1_m)
- << static_cast<float>(dr_prim.dot(obsPlane_.getPlane().getNormal()) / 1_m)
- << static_cast<float>(p_prim.dot(obsPlane_.getXAxis()) / 1_GeV)
- << static_cast<float>(p_prim.dot(obsPlane_.getYAxis()) / 1_GeV)
- << static_cast<float>(p_prim.dot(obsPlane_.getPlane().getNormal()) / 1_GeV)
- << static_cast<double>(primary.getTime() / 1_ns)
- << static_cast<float>(dX / (1_g / 1_cm / 1_cm))
- << parquet::EndRow;
+ *(output_.getWriter())
+ << showerId_ << true << static_cast<int>(get_PDG(primary.getPID()))
+ << static_cast<float>(dr_prim.dot(obsPlane_.getXAxis()) / 1_m)
+ << static_cast<float>(dr_prim.dot(obsPlane_.getYAxis()) / 1_m)
+ << static_cast<float>(dr_prim.dot(obsPlane_.getPlane().getNormal()) / 1_m)
+ << static_cast<float>(p_prim.dot(obsPlane_.getXAxis()) / 1_GeV)
+ << static_cast<float>(p_prim.dot(obsPlane_.getYAxis()) / 1_GeV)
+ << static_cast<float>(p_prim.dot(obsPlane_.getPlane().getNormal()) / 1_GeV)
+ << static_cast<double>(primary.getTime() / 1_ns)
+ << static_cast<float>(dX / (1_g / 1_cm / 1_cm)) << parquet::EndRow;
// Loop through secondaries
auto particle = vS.begin();
@@ -55,26 +52,27 @@ namespace corsika {
Vector const dr_2nd = particle.getPosition() - obsPlane_.getPlane().getCenter();
auto const p_2nd = particle.getMomentum();
- *(output_.getWriter()) << showerId_ << false
- << static_cast<int>(get_PDG(particle.getPID()))
- << static_cast<float>(dr_2nd.dot(obsPlane_.getXAxis()) / 1_m)
- << static_cast<float>(dr_2nd.dot(obsPlane_.getYAxis()) / 1_m)
- << static_cast<float>(dr_2nd.dot(obsPlane_.getPlane().getNormal()) / 1_m)
- << static_cast<float>(p_2nd.dot(obsPlane_.getXAxis()) / 1_GeV)
- << static_cast<float>(p_2nd.dot(obsPlane_.getYAxis()) / 1_GeV)
- << static_cast<float>(p_2nd.dot(obsPlane_.getPlane().getNormal()) / 1_GeV)
- << static_cast<double>(particle.getTime() / 1_ns)
- << static_cast<float>(dX / (1_g / 1_cm / 1_cm))
- << parquet::EndRow;
-
- CORSIKA_LOG_INFO(" 2ndary: {}, E {}", particle.getPID(), particle.getKineticEnergy());
+ *(output_.getWriter())
+ << showerId_ << false << static_cast<int>(get_PDG(particle.getPID()))
+ << static_cast<float>(dr_2nd.dot(obsPlane_.getXAxis()) / 1_m)
+ << static_cast<float>(dr_2nd.dot(obsPlane_.getYAxis()) / 1_m)
+ << static_cast<float>(dr_2nd.dot(obsPlane_.getPlane().getNormal()) / 1_m)
+ << static_cast<float>(p_2nd.dot(obsPlane_.getXAxis()) / 1_GeV)
+ << static_cast<float>(p_2nd.dot(obsPlane_.getYAxis()) / 1_GeV)
+ << static_cast<float>(p_2nd.dot(obsPlane_.getPlane().getNormal()) / 1_GeV)
+ << static_cast<double>(particle.getTime() / 1_ns)
+ << static_cast<float>(dX / (1_g / 1_cm / 1_cm)) << parquet::EndRow;
+
+ CORSIKA_LOG_INFO(" 2ndary: {}, E {}", particle.getPID(),
+ particle.getKineticEnergy());
++particle;
++nSecondaries_;
}
}
template <typename TTracking, typename TOutput>
- inline void InteractionWriter<TTracking, TOutput>::startOfLibrary(boost::filesystem::path const& directory) {
+ inline void InteractionWriter<TTracking, TOutput>::startOfLibrary(
+ boost::filesystem::path const& directory) {
output_.initStreamer((directory / ("interactions.parquet")).string());
output_.addField("primary", parquet::Repetition::REQUIRED, parquet::Type::BOOLEAN,
@@ -107,7 +105,8 @@ namespace corsika {
}
template <typename TTracking, typename TOutput>
- inline void InteractionWriter<TTracking, TOutput>::startOfShower(unsigned int const showerId) {
+ inline void InteractionWriter<TTracking, TOutput>::startOfShower(
+ unsigned int const showerId) {
showerId_ = showerId;
interactionCounter_ = 0;
nSecondaries_ = 0;
diff --git a/corsika/modules/writers/InteractionWriter.hpp b/corsika/modules/writers/InteractionWriter.hpp
index 6c1509da2..6515ad195 100644
--- a/corsika/modules/writers/InteractionWriter.hpp
+++ b/corsika/modules/writers/InteractionWriter.hpp
@@ -20,14 +20,17 @@
namespace corsika {
template <typename TTracking, typename TOutput>
- class InteractionWriter : public SecondariesProcess<InteractionWriter<TTracking, TOutput>>, public BaseOutput{
+ class InteractionWriter
+ : public SecondariesProcess<InteractionWriter<TTracking, TOutput>>,
+ public BaseOutput {
public:
/**
*
* @param axis - axis used for calculating grammage
*/
- InteractionWriter(ShowerAxis const& axis, ObservationPlane<TTracking, TOutput> const& obsPlane);
+ InteractionWriter(ShowerAxis const& axis,
+ ObservationPlane<TTracking, TOutput> const& obsPlane);
/**
*
@@ -42,7 +45,6 @@ namespace corsika {
void startOfShower(unsigned int const) override;
void endOfShower(unsigned int const) override;
-
YAML::Node getConfig() const override;
YAML::Node getSummary() const override;
diff --git a/tests/output/testInteractionWriter.cpp b/tests/output/testInteractionWriter.cpp
index 8f982a4ba..d9a45e418 100644
--- a/tests/output/testInteractionWriter.cpp
+++ b/tests/output/testInteractionWriter.cpp
@@ -25,7 +25,6 @@
#include <SetupTestStack.hpp>
#include <SetupTestTrajectory.hpp>
-
using namespace corsika;
using DummyEnvironmentInterface = IMediumPropertyModel<IMagneticFieldModel<IMediumModel>>;
@@ -38,14 +37,13 @@ TEST_CASE("InteractionWriter", "process") {
auto& universe = *(env->getUniverse());
CoordinateSystemPtr const& rootCS = env->getCoordinateSystem();
auto theMedium = Environment<IMediumModel>::createNode<Sphere>(
- Point{rootCS, 0_m, 0_m, 0_m}, 1_km * std::numeric_limits<double>::infinity());
+ Point{rootCS, 0_m, 0_m, 0_m}, 1_km * std::numeric_limits<double>::infinity());
using MyHomogeneousModel = HomogeneousMedium<IMediumModel>;
const auto density = 1_kg / (1_m * 1_m * 1_m);
theMedium->setModelProperties<MyHomogeneousModel>(
- density, NuclearComposition({Code::Nitrogen}, {1.}));
+ density, NuclearComposition({Code::Nitrogen}, {1.}));
universe.addChild(std::move(theMedium));
-
std::string const outputDir = "./output_interactions";
// preparation
@@ -62,7 +60,6 @@ TEST_CASE("InteractionWriter", "process") {
auto length = stop - start;
ShowerAxis axis(start, length, *env);
-
Plane const plane(Point(rootCS, {0_m, 0_m, 0_m}),
DirectionVector(rootCS, {0., 0., 1.}));
@@ -71,7 +68,6 @@ TEST_CASE("InteractionWriter", "process") {
true, // plane should "absorb" particles
false};
-
InteractionWriter<setup::Tracking, ParticleWriterParquet> writer(axis, obsPlane);
writer.startOfLibrary(outputDir);
writer.startOfShower(0);
@@ -79,10 +75,9 @@ TEST_CASE("InteractionWriter", "process") {
CHECK(!writer.getInteractionCounter());
// add primary particle to stack
- auto particle = stack.addParticle(
- std::make_tuple(Code::Proton, 10_GeV, DirectionVector(rootCS, {1, 0, 0}),
- Point(rootCS, 0_m, 0_m, 0_m), 0_ns));
-
+ auto particle = stack.addParticle(std::make_tuple(Code::Proton, 10_GeV,
+ DirectionVector(rootCS, {1, 0, 0}),
+ Point(rootCS, 0_m, 0_m, 0_m), 0_ns));
test::StackView view(particle);
auto projectile = view.getProjectile();
@@ -90,12 +85,11 @@ TEST_CASE("InteractionWriter", "process") {
std::vector<Code> const particleList = {Code::PiPlus, Code::PiMinus, Code::KPlus,
Code::KMinus, Code::K0Long, Code::K0Short,
Code::Electron, Code::MuPlus, Code::NuE,
- Code::Neutron, Code::NuMu
- };
+ Code::Neutron, Code::NuMu};
for (auto proType : particleList)
projectile.addSecondary(
- std::make_tuple(proType, 1_GeV, DirectionVector(rootCS, {1, 0, 0})));
+ std::make_tuple(proType, 1_GeV, DirectionVector(rootCS, {1, 0, 0})));
// pre-check on stack size
CHECK(view.getEntries() == 11);
--
GitLab