From f16cd74d67ae717e6b7187f65ce9ac597fd6808e Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 5 Jan 2021 16:08:50 +0100
Subject: [PATCH] style
---
Stack/DummyStack/testDummyStack.cc | 41 ----
.../GeometryNodeStackExtension/CMakeLists.txt | 38 ---
.../GeometryNodeStackExtension.h | 99 --------
.../testGeometryNodeStackExtension.cc | 90 -------
Stack/History/CMakeLists.txt | 69 ------
Stack/History/Event.hpp | 68 ------
Stack/History/EventType.hpp | 13 --
Stack/History/HistoryObservationPlane.cpp | 85 -------
Stack/History/HistoryObservationPlane.hpp | 60 -----
Stack/History/HistorySecondaryProducer.hpp | 59 -----
Stack/History/HistoryStackExtension.hpp | 139 -----------
Stack/History/SecondaryParticle.hpp | 37 ---
Stack/History/testHistoryStack.cc | 66 ------
Stack/History/testHistoryView.cc | 221 ------------------
corsika/framework/core/PhysicalUnits.hpp | 2 +-
corsika/framework/geometry/BaseVector.hpp | 2 +-
.../framework/geometry/CoordinateSystem.hpp | 2 +-
corsika/framework/geometry/Helix.hpp | 2 +-
corsika/framework/geometry/IVolume.hpp | 2 +-
corsika/framework/geometry/Line.hpp | 2 +-
corsika/framework/geometry/Plane.hpp | 2 +-
corsika/framework/geometry/QuantityVector.hpp | 2 +-
.../geometry/RootCoordinateSystem.hpp | 2 +-
corsika/framework/geometry/Sphere.hpp | 2 +-
corsika/framework/geometry/Vector.hpp | 2 +-
corsika/framework/process/BaseProcess.hpp | 2 +-
.../process/BoundaryCrossingProcess.hpp | 2 +-
.../framework/process/ContinuousProcess.hpp | 2 +-
corsika/framework/process/DecayProcess.hpp | 3 +-
.../framework/process/InteractionProcess.hpp | 2 +-
corsika/framework/process/ProcessReturn.hpp | 2 +-
corsika/framework/process/ProcessSequence.hpp | 2 +-
.../random/ExponentialDistribution.hpp | 2 +-
corsika/framework/stack/CombinedStack.hpp | 2 +-
corsika/framework/utility/CorsikaFenv.hpp | 4 +-
corsika/framework/utility/Singleton.hpp | 2 +-
corsika/framework/utility/detail/COMBoost.inl | 192 +++++++--------
corsika/media/FlatExponential.hpp | 2 +-
corsika/process/EnergyLoss.hpp | 2 -
corsika/process/HadronicElasticModel.hpp | 4 +-
corsika/process/ObservationPlane.hpp | 12 +-
corsika/process/ParticleCut.hpp | 2 -
corsika/process/Pythia/Decay.hpp | 10 +-
corsika/process/Pythia/Interaction.hpp | 9 +-
corsika/process/Pythia/Random.hpp | 3 +-
corsika/process/QGSJetII/Interaction.hpp | 8 +-
corsika/process/QGSJetII/QGSJetIIStack.hpp | 7 +-
corsika/process/Sibyll/Interaction.hpp | 3 +-
corsika/process/Sibyll/NuclearInteraction.hpp | 3 +-
corsika/process/Sibyll/SibStack.hpp | 3 +-
corsika/process/StackInspector.hpp | 1 -
corsika/process/SwitchProcess.hpp | 1 -
corsika/process/TrackWriter.hpp | 1 -
corsika/setup/SetupTrajectory.hpp | 2 +-
tests/common/testTestStack.h | 2 +-
tests/framework/testCOMBoost.cpp | 3 -
56 files changed, 147 insertions(+), 1255 deletions(-)
delete mode 100644 Stack/DummyStack/testDummyStack.cc
delete mode 100644 Stack/GeometryNodeStackExtension/CMakeLists.txt
delete mode 100644 Stack/GeometryNodeStackExtension/GeometryNodeStackExtension.h
delete mode 100644 Stack/GeometryNodeStackExtension/testGeometryNodeStackExtension.cc
delete mode 100644 Stack/History/CMakeLists.txt
delete mode 100644 Stack/History/Event.hpp
delete mode 100644 Stack/History/EventType.hpp
delete mode 100644 Stack/History/HistoryObservationPlane.cpp
delete mode 100644 Stack/History/HistoryObservationPlane.hpp
delete mode 100644 Stack/History/HistorySecondaryProducer.hpp
delete mode 100644 Stack/History/HistoryStackExtension.hpp
delete mode 100644 Stack/History/SecondaryParticle.hpp
delete mode 100644 Stack/History/testHistoryStack.cc
delete mode 100644 Stack/History/testHistoryView.cc
diff --git a/Stack/DummyStack/testDummyStack.cc b/Stack/DummyStack/testDummyStack.cc
deleted file mode 100644
index 41a573158..000000000
--- a/Stack/DummyStack/testDummyStack.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#include <corsika/stack/dummy/DummyStack.h>
-
-using namespace corsika;
-using namespace corsika::stack;
-
-#include <catch2/catch.hpp>
-
-#include <tuple>
-
-TEST_CASE("DummyStack", "[stack]") {
-
- using TestStack = dummy::DummyStack;
-
- dummy::NoData noData;
-
- SECTION("write node") {
-
- TestStack s;
- s.AddParticle(std::tuple<dummy::NoData>{noData});
- CHECK(s.getEntries() == 1);
- }
-
- SECTION("stack fill and cleanup") {
-
- TestStack s;
- // add 99 particles, each 10th particle is a nucleus with A=i and Z=A/2!
- for (int i = 0; i < 99; ++i) { s.AddParticle(std::tuple<dummy::NoData>{noData}); }
-
- CHECK(s.getEntries() == 99);
- for (int i = 0; i < 99; ++i) s.GetNextParticle().Delete();
- CHECK(s.getEntries() == 0);
- }
-}
diff --git a/Stack/GeometryNodeStackExtension/CMakeLists.txt b/Stack/GeometryNodeStackExtension/CMakeLists.txt
deleted file mode 100644
index 8d7a3c7d0..000000000
--- a/Stack/GeometryNodeStackExtension/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-set (GeometryNodeStackExtension_HEADERS GeometryNodeStackExtension.h)
-set (GeometryNodeStackExtension_NAMESPACE corsika/stack/node)
-
-add_library (GeometryNodeStackExtension INTERFACE)
-
-CORSIKA_COPY_HEADERS_TO_NAMESPACE (GeometryNodeStackExtension ${GeometryNodeStackExtension_NAMESPACE} ${GeometryNodeStackExtension_HEADERS})
-
-target_link_libraries (
- GeometryNodeStackExtension
- INTERFACE
- CORSIKAstackinterface
- CORSIKAunits
- CORSIKAparticles
- CORSIKAgeometry
- )
-
-target_include_directories (
- GeometryNodeStackExtension
- INTERFACE
- $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
- $<INSTALL_INTERFACE:include>
- )
-
-install (
- FILES
- ${GeometryNodeStackExtension_HEADERS}
- DESTINATION
- include/${GeometryNodeStackExtension_NAMESPACE}
- )
-
-# ----------------
-# code unit testing
- CORSIKA_ADD_TEST(testGeometryNodeStackExtension)
- target_link_libraries (
- testGeometryNodeStackExtension
- GeometryNodeStackExtension
- CORSIKAtesting
- )
diff --git a/Stack/GeometryNodeStackExtension/GeometryNodeStackExtension.h b/Stack/GeometryNodeStackExtension/GeometryNodeStackExtension.h
deleted file mode 100644
index d33997b8e..000000000
--- a/Stack/GeometryNodeStackExtension/GeometryNodeStackExtension.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/logging/Logging.h>
-#include <corsika/stack/Stack.h>
-
-#include <tuple>
-#include <utility>
-#include <vector>
-
-namespace corsika::stack::node {
-
- /**
- * @class GeometryDataInterface
- *
- * corresponding defintion of a stack-readout object, the iteractor
- * dereference operator will deliver access to these function
- // defintion of a stack-readout object, the iteractor dereference
- // operator will deliver access to these function
- */
- template <typename T, typename TEnvType>
- class GeometryDataInterface : public T {
-
- protected:
- using T::GetStack;
- using T::GetStackData;
-
- public:
- using T::GetIndex;
- using BaseNodeType = typename TEnvType::BaseNodeType;
-
- public:
- // default version for particle-creation from input data
- void SetParticleData(const std::tuple<BaseNodeType const*> v) {
- SetNode(std::get<0>(v));
- }
- void SetParticleData(GeometryDataInterface& parent,
- const std::tuple<BaseNodeType const*>) {
- SetNode(parent.GetNode()); // copy Node from parent particle!
- }
- void SetParticleData() { SetNode(nullptr); }
- void SetParticleData(GeometryDataInterface& parent) {
- SetNode(parent.GetNode()); // copy Node from parent particle!
- }
-
- std::string as_string() const { return fmt::format("node={}", fmt::ptr(GetNode())); }
-
- void SetNode(BaseNodeType const* v) { GetStackData().SetNode(GetIndex(), v); }
- BaseNodeType const* GetNode() const { return GetStackData().GetNode(GetIndex()); }
- };
-
- // definition of stack-data object to store geometry information
- template <typename TEnvType>
-
- /**
- * @class GeometryData
- *
- * definition of stack-data object to store geometry information
- */
- class GeometryData {
-
- public:
- using BaseNodeType = typename TEnvType::BaseNodeType;
-
- // these functions are needed for the Stack interface
- void Clear() { fNode.clear(); }
- unsigned int GetSize() const { return fNode.size(); }
- unsigned int GetCapacity() const { return fNode.size(); }
- void Copy(const int i1, const int i2) { fNode[i2] = fNode[i1]; }
- void Swap(const int i1, const int i2) { std::swap(fNode[i1], fNode[i2]); }
-
- // custom data access function
- void SetNode(const int i, BaseNodeType const* v) { fNode[i] = v; }
- BaseNodeType const* GetNode(const int i) const { return fNode[i]; }
-
- // these functions are also needed by the Stack interface
- void IncrementSize() { fNode.push_back(nullptr); }
- void DecrementSize() {
- if (fNode.size() > 0) { fNode.pop_back(); }
- }
-
- // custom private data section
- private:
- std::vector<const BaseNodeType*> fNode;
- };
-
- template <typename T, typename TEnv>
- struct MakeGeometryDataInterface {
- typedef GeometryDataInterface<T, TEnv> type;
- };
-
-} // namespace corsika::stack::node
diff --git a/Stack/GeometryNodeStackExtension/testGeometryNodeStackExtension.cc b/Stack/GeometryNodeStackExtension/testGeometryNodeStackExtension.cc
deleted file mode 100644
index b566c2c8e..000000000
--- a/Stack/GeometryNodeStackExtension/testGeometryNodeStackExtension.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#include <corsika/stack/CombinedStack.h>
-#include <corsika/stack/dummy/DummyStack.h>
-#include <corsika/stack/node/GeometryNodeStackExtension.h>
-
-using namespace corsika;
-using namespace corsika::stack;
-
-#include <catch2/catch.hpp>
-
-#include <iostream>
-using namespace std;
-
-// this is our dummy environment, it only knows its trivial BaseNodeType
-class DummyEnv {
-public:
- typedef int BaseNodeType;
-};
-
-// the GeometryNode stack needs to know the type of geometry-nodes from the DummyEnv:
-template <typename TStackIter>
-using DummyGeometryDataInterface =
- typename corsika::stack::node::MakeGeometryDataInterface<TStackIter, DummyEnv>::type;
-
-// combine dummy stack with geometry information for tracking
-template <typename TStackIter>
-using StackWithGeometryInterface =
- corsika::stack::CombinedParticleInterface<dummy::DummyStack::MPIType,
- DummyGeometryDataInterface, TStackIter>;
-
-using TestStack =
- corsika::stack::CombinedStack<typename stack::dummy::DummyStack::StackImpl,
- stack::node::GeometryData<DummyEnv>,
- StackWithGeometryInterface>;
-
-TEST_CASE("GeometryNodeStackExtension", "[stack]") {
-
- dummy::NoData noData;
-
- SECTION("write node") {
-
- const int data = 5;
-
- TestStack s;
- s.AddParticle(std::make_tuple(noData), std::tuple<const int*>{&data});
-
- CHECK(s.getEntries() == 1);
- }
-
- SECTION("write/read node") {
- const int data = 15;
-
- TestStack s;
- auto p = s.AddParticle(std::make_tuple(noData));
- p.SetNode(&data);
- CHECK(s.getEntries() == 1);
-
- const auto pout = s.GetNextParticle();
- CHECK(*(pout.GetNode()) == 15);
- }
-
- SECTION("stack fill and cleanup") {
-
- const int data = 16;
-
- TestStack s;
- // add 99 particles, each 10th particle is a nucleus with A=i and Z=A/2!
- for (int i = 0; i < 99; ++i) {
- auto p = s.AddParticle(std::tuple<dummy::NoData>{noData});
- p.SetNode(&data);
- }
-
- CHECK(s.getEntries() == 99);
- double v = 0;
- for (int i = 0; i < 99; ++i) {
- auto p = s.GetNextParticle();
- v += *(p.GetNode());
- p.Delete();
- }
- CHECK(v == 99 * data);
- CHECK(s.getEntries() == 0);
- }
-}
diff --git a/Stack/History/CMakeLists.txt b/Stack/History/CMakeLists.txt
deleted file mode 100644
index 2a47b8618..000000000
--- a/Stack/History/CMakeLists.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-set (
- HISTORY_HEADERS
- EventType.hpp
- Event.hpp
- HistorySecondaryProducer.hpp
- HistoryObservationPlane.hpp
- HistoryStackExtension.hpp
- SecondaryParticle.hpp
- )
-
-set (
- HISTORY_NAMESPACE
- corsika/stack/history
- )
-
-if (WITH_HISTORY)
- set (
- HISTORY_SOURCES
- HistoryObservationPlane.cpp
- )
- add_library (CORSIKAhistory STATIC ${HISTORY_SOURCES})
- set (IS_INTERFACE "")
-else (WITH_HISTORY)
- add_library (CORSIKAhistory INTERFACE)
- set (IS_INTERFACE "INTERFACE")
-endif (WITH_HISTORY)
-
-CORSIKA_COPY_HEADERS_TO_NAMESPACE (CORSIKAhistory ${HISTORY_NAMESPACE} ${HISTORY_HEADERS})
-
-target_link_libraries (
- CORSIKAhistory
- ${IS_INTERFACE}
- CORSIKAparticles
- CORSIKAgeometry
- CORSIKAprocesssequence # for HistoryObservationPlane
- CORSIKAsetup # for HistoryObservationPlane
- CORSIKAlogging
- SuperStupidStack
- NuclearStackExtension # for testHistoryView.cc
- C8::ext::boost # for HistoryObservationPlane
- )
-
-target_include_directories (
- CORSIKAhistory
- INTERFACE
- $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
- $<INSTALL_INTERFACE:include/include>
- )
-
-install (
- FILES ${HISTORY_HEADERS}
- DESTINATION include/${HISTORY_NAMESPACE}
- )
-
-# ----------------
-# code unit testing
-CORSIKA_ADD_TEST(testHistoryStack)
-target_link_libraries (
- testHistoryStack
- CORSIKAhistory
- CORSIKAtesting
- DummyStack
- )
-CORSIKA_ADD_TEST(testHistoryView)
-target_link_libraries (
- testHistoryView
- CORSIKAhistory
- CORSIKAtesting
- )
diff --git a/Stack/History/Event.hpp b/Stack/History/Event.hpp
deleted file mode 100644
index 901d9db8f..000000000
--- a/Stack/History/Event.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/logging/Logging.h>
-#include <corsika/particles/ParticleProperties.h>
-#include <corsika/stack/history/EventType.hpp>
-#include <corsika/stack/history/SecondaryParticle.hpp>
-
-#include <memory>
-#include <optional>
-#include <vector>
-
-namespace corsika::history {
-
- class Event;
- using EventPtr = std::shared_ptr<history::Event>;
-
- class Event {
-
- size_t projectile_index_ = 0; //!< index of projectile on stack
- std::vector<SecondaryParticle> secondaries_;
- EventPtr parent_event_;
-
- EventType type_ = EventType::Uninitialized;
-
- std::optional<corsika::particles::Code> targetCode_;
-
- public:
- Event() = default;
-
- void setParentEvent(EventPtr const& evt) { parent_event_ = evt; }
-
- bool hasParentEvent() const { return bool(parent_event_); }
- EventPtr& parentEvent() { return parent_event_; }
- EventPtr const& parentEvent() const { return parent_event_; }
-
- void setProjectileIndex(size_t i) { projectile_index_ = i; }
- size_t projectileIndex() const { return projectile_index_; }
-
- size_t addSecondary(units::si::HEPEnergyType energy,
- geometry::Vector<units::si::hepmomentum_d> const& momentum,
- particles::Code pid) {
- secondaries_.emplace_back(energy, momentum, pid);
- return secondaries_.size() - 1;
- }
-
- std::vector<SecondaryParticle> const& secondaries() const { return secondaries_; }
-
- void setTargetCode(const particles::Code t) { targetCode_ = t; }
-
- std::string as_string() const {
- return fmt::format("hasParent={}, projIndex={}, Nsec={}", hasParentEvent(),
- projectile_index_, secondaries_.size());
- }
-
- EventType eventType() const { return type_; }
-
- void setEventType(EventType t) { type_ = t; }
- };
-
-} // namespace corsika::history
diff --git a/Stack/History/EventType.hpp b/Stack/History/EventType.hpp
deleted file mode 100644
index 4781d5c64..000000000
--- a/Stack/History/EventType.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-namespace corsika::history {
- enum class EventType { Uninitialized, Interaction, Decay };
-}
diff --git a/Stack/History/HistoryObservationPlane.cpp b/Stack/History/HistoryObservationPlane.cpp
deleted file mode 100644
index 6a8c94ec7..000000000
--- a/Stack/History/HistoryObservationPlane.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#include <corsika/logging/Logging.h>
-#include <corsika/stack/history/HistoryObservationPlane.hpp>
-
-#include <boost/histogram/ostream.hpp>
-
-#include <iomanip>
-#include <iostream>
-
-using namespace corsika::units::si;
-using namespace corsika::history;
-using namespace corsika;
-
-HistoryObservationPlane::HistoryObservationPlane(setup::Stack const& stack,
- geometry::Plane const& obsPlane,
- bool deleteOnHit)
- : stack_{stack}
- , plane_{obsPlane}
- , deleteOnHit_{deleteOnHit} {}
-
-corsika::process::EProcessReturn HistoryObservationPlane::DoContinuous(
- setup::Stack::ParticleType const& particle, setup::Trajectory const& trajectory) {
- TimeType const timeOfIntersection =
- (plane_.GetCenter() - trajectory.GetLine().GetR0()).dot(plane_.GetNormal()) /
- trajectory.GetLine().GetV0().dot(plane_.GetNormal());
-
- if (timeOfIntersection < TimeType::zero()) { return process::EProcessReturn::eOk; }
-
- if (plane_.IsAbove(trajectory.GetLine().GetR0()) ==
- plane_.IsAbove(trajectory.GetPosition(1))) {
- return process::EProcessReturn::eOk;
- }
-
- C8LOG_DEBUG(fmt::format("HistoryObservationPlane: Particle detected: pid={}",
- particle.GetPID()));
-
- auto const pid = particle.GetPID();
- if (particles::IsMuon(pid)) { fillHistoryHistogram(particle); }
-
- if (deleteOnHit_) {
- return process::EProcessReturn::eParticleAbsorbed;
- } else {
- return process::EProcessReturn::eOk;
- }
-}
-
-LengthType HistoryObservationPlane::MaxStepLength(setup::Stack::ParticleType const&,
- setup::Trajectory const& trajectory) {
- TimeType const timeOfIntersection =
- (plane_.GetCenter() - trajectory.GetLine().GetR0()).dot(plane_.GetNormal()) /
- trajectory.GetLine().GetV0().dot(plane_.GetNormal());
-
- if (timeOfIntersection < TimeType::zero()) {
- return std::numeric_limits<double>::infinity() * 1_m;
- }
-
- auto const pointOfIntersection = trajectory.GetLine().GetPosition(timeOfIntersection);
- return (trajectory.GetLine().GetR0() - pointOfIntersection).norm() * 1.0001;
-}
-
-void HistoryObservationPlane::fillHistoryHistogram(
- setup::Stack::ParticleType const& muon) {
- double const muon_energy = muon.GetEnergy() / 1_GeV;
-
- int genctr{0};
- Event const* event = muon.GetEvent().get();
- while (event) {
- auto const projectile = stack_.cfirst() + event->projectileIndex();
- if (event->eventType() == EventType::Interaction) {
- genctr++;
- double const projEnergy = projectile.GetEnergy() / 1_GeV;
- int const pdg = static_cast<int>(particles::GetPDG(projectile.GetPID()));
-
- histogram_(muon_energy, projEnergy, pdg);
- }
- event = event->parentEvent().get(); // projectile.GetEvent().get();
- }
-}
diff --git a/Stack/History/HistoryObservationPlane.hpp b/Stack/History/HistoryObservationPlane.hpp
deleted file mode 100644
index fb67ca7f9..000000000
--- a/Stack/History/HistoryObservationPlane.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/geometry/Plane.h>
-#include <corsika/process/ContinuousProcess.h>
-#include <corsika/setup/SetupStack.h>
-#include <corsika/setup/SetupTrajectory.h>
-#include <corsika/units/PhysicalUnits.h>
-
-#include <boost/histogram.hpp>
-
-#include <functional>
-
-namespace corsika::history {
- namespace detail {
- inline auto hist_factory() {
- namespace bh = boost::histogram;
- namespace bha = bh::axis;
- auto h = bh::make_histogram(
- bha::regular<float, bha::transform::log>{11 * 5, 1e0, 1e11, "muon energy"},
- bha::regular<float, bha::transform::log>{11 * 5, 1e0, 1e11,
- "projectile energy"},
- bha::category<int, bh::use_default, bha::option::growth_t>{
- {211, -211, 2212, -2212}, "projectile PDG"});
- return h;
- }
- } // namespace detail
-
- class HistoryObservationPlane
- : public corsika::process::ContinuousProcess<HistoryObservationPlane> {
- public:
- HistoryObservationPlane(setup::Stack const&, geometry::Plane const&, bool = true);
-
- corsika::units::si::LengthType MaxStepLength(
- corsika::setup::Stack::ParticleType const&,
- corsika::setup::Trajectory const& vTrajectory);
-
- corsika::process::EProcessReturn DoContinuous(
- corsika::setup::Stack::ParticleType const& vParticle,
- corsika::setup::Trajectory const& vTrajectory);
-
- auto const& histogram() const { return histogram_; }
-
- private:
- void fillHistoryHistogram(setup::Stack::ParticleType const&);
-
- setup::Stack const& stack_;
- geometry::Plane const plane_;
- bool const deleteOnHit_;
-
- decltype(detail::hist_factory()) histogram_ = detail::hist_factory();
- };
-} // namespace corsika::history
diff --git a/Stack/History/HistorySecondaryProducer.hpp b/Stack/History/HistorySecondaryProducer.hpp
deleted file mode 100644
index 792a83d95..000000000
--- a/Stack/History/HistorySecondaryProducer.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/stack/SecondaryView.h>
-#include <corsika/stack/history/Event.hpp>
-
-#include <corsika/logging/Logging.h>
-
-#include <boost/type_index.hpp>
-
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-namespace corsika::history {
-
- //! mix-in class for SecondaryView that fills secondaries into an \class Event
- template <class T1, template <class> class T2>
- class HistorySecondaryProducer {
- public:
- EventPtr event_;
- static bool constexpr has_event{true};
-
- public:
- template <typename Particle>
- HistorySecondaryProducer(Particle const& p)
- : event_{std::make_shared<Event>()} {
- C8LOG_TRACE("HistorySecondaryProducer::HistorySecondaryProducer");
- event_->setProjectileIndex(p.GetIndex());
- event_->setParentEvent(p.GetEvent());
- }
-
- /**
- * Method is called after a new Secondary has been created on the
- * SecondaryView. Extra logic can be introduced here.
- *
- * The input Particle is the new secondary that was produced and
- * is of course a reference into the SecondaryView itself.
- */
- template <typename Particle>
- auto new_secondary(Particle& sec) {
- C8LOG_TRACE("HistorySecondaryProducer::new_secondary(sec)");
-
- // store particles at production time in Event here
- auto const sec_index =
- event_->addSecondary(sec.GetEnergy(), sec.GetMomentum(), sec.GetPID());
- sec.SetParentEventIndex(sec_index);
- sec.SetEvent(event_);
- }
- };
-
-} // namespace corsika::history
diff --git a/Stack/History/HistoryStackExtension.hpp b/Stack/History/HistoryStackExtension.hpp
deleted file mode 100644
index 67a38b796..000000000
--- a/Stack/History/HistoryStackExtension.hpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/logging/Logging.h>
-#include <corsika/stack/Stack.h>
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-namespace corsika::history {
-
- /**
- * @class HistoryData
- *
- * definition of stack-data object to store history information this
- * is vector with shared_ptr<TEvent>, where TEvent is a free
- * template parameter for customization.
- */
- template <typename TEvent>
- class HistoryData {
- using EventPtr =
- std::shared_ptr<TEvent>; //!< Pointer to the event where this particle was created
- using ParentEventIndex = int; //!< index to TEvent::secondaries_
- using DataType = std::pair<EventPtr, ParentEventIndex>;
-
- public:
- // these functions are needed for the Stack interface
- void Clear() { historyData_.clear(); }
- unsigned int GetSize() const { return historyData_.size(); }
- unsigned int GetCapacity() const { return historyData_.size(); }
- void Copy(const int i1, const int i2) { historyData_[i2] = historyData_[i1]; }
- void Swap(const int i1, const int i2) {
- std::swap(historyData_[i1], historyData_[i2]);
- }
-
- // custom data access function
- void SetEvent(const int i, EventPtr v) { historyData_[i].first = std::move(v); }
- const EventPtr& GetEvent(const int i) const { return historyData_[i].first; }
- EventPtr& GetEvent(const int i) { return historyData_[i].first; }
-
- void SetParentEventIndex(const int i, ParentEventIndex v) {
- historyData_[i].second = std::move(v);
- }
- ParentEventIndex GetParentEventIndex(const int i) const {
- return historyData_[i].second;
- }
-
- // these functions are also needed by the Stack interface
- void IncrementSize() { historyData_.push_back(DataType{}); }
- void DecrementSize() {
- if (historyData_.size() > 0) { historyData_.pop_back(); }
- }
-
- // custom private data section
- private:
- std::vector<DataType> historyData_;
- };
-
- /**
- * @class HistoryDataInterface
- *
- * corresponding defintion of a stack-readout object, the iteractor
- * dereference operator will deliver access to these function
- // defintion of a stack-readout object, the iteractor dereference
- // operator will deliver access to these function
- */
- template <typename T, typename TEvent>
- class HistoryDataInterface : public T {
- protected:
- using T::GetStack;
- using T::GetStackData;
-
- public:
- using T::GetIndex;
-
- public:
- // create a new particle from scratch
- void SetParticleData() {
- C8LOG_TRACE("HistoyDatatInterface::SetParticleData()");
- GetStackData().SetParentEventIndex(GetIndex(), -1);
- }
-
- // create a new particle as secondary of a parent
- void SetParticleData(HistoryDataInterface& /*parent*/) {
- C8LOG_TRACE("HistoyDatatInterface::SetParticleData(parnt)");
- SetParticleData();
- }
-
- void SetEvent(const std::shared_ptr<TEvent>& v) {
- GetStackData().SetEvent(GetIndex(), v);
- }
-
- void SetParentEventIndex(int index) {
- GetStackData().SetParentEventIndex(GetIndex(), index);
- }
-
- std::shared_ptr<TEvent> GetEvent() const {
- return GetStackData().GetEvent(GetIndex());
- }
-
- int GetParentEventIndex() const {
- return GetStackData().GetParentEventIndex(GetIndex());
- }
-
- std::string as_string() const {
- return fmt::format("i_parent={}, [evt: {}]", GetParentEventIndex(),
- (bool(GetEvent()) ? GetEvent()->as_string() : "n/a"));
- }
- };
-
- template <typename T, typename TEvent>
- struct MakeHistoryDataInterface {
- typedef HistoryDataInterface<T, TEvent> type;
- };
-
-} // namespace corsika::history
-
-// for user-friendlyness we create the HistoryDataInterface type
-// with the histoy::Event data content right here:
-
-#include <corsika/stack/history/Event.hpp>
-
-namespace corsika::history {
-
- template <typename TStackIter>
- using HistoryEventDataInterface =
- typename history::MakeHistoryDataInterface<TStackIter, history::Event>::type;
-
- using HistoryEventData = history::HistoryData<history::Event>;
-
-} // namespace corsika::history
diff --git a/Stack/History/SecondaryParticle.hpp b/Stack/History/SecondaryParticle.hpp
deleted file mode 100644
index 249ea95bf..000000000
--- a/Stack/History/SecondaryParticle.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-#include <corsika/geometry/Vector.h>
-#include <corsika/particles/ParticleProperties.h>
-#include <corsika/units/PhysicalUnits.h>
-
-#include <vector>
-
-namespace corsika::history {
-
- /**
- * This class stores the non-common properties of secondaries in an event. All
- * other (common) properties are available via the event itself or its projectile.
- */
- struct SecondaryParticle {
- units::si::HEPEnergyType const energy_;
- geometry::Vector<units::si::hepmomentum_d> const momentum_;
- particles::Code const pid_;
-
- public:
- SecondaryParticle(units::si::HEPEnergyType energy,
- geometry::Vector<units::si::hepmomentum_d> momentum,
- particles::Code pid)
- : energy_{energy}
- , momentum_{momentum}
- , pid_{pid} {}
- };
-
-} // namespace corsika::history
diff --git a/Stack/History/testHistoryStack.cc b/Stack/History/testHistoryStack.cc
deleted file mode 100644
index c068bdb69..000000000
--- a/Stack/History/testHistoryStack.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#include <corsika/stack/CombinedStack.h>
-#include <corsika/stack/dummy/DummyStack.h>
-#include <corsika/stack/history/HistoryStackExtension.hpp>
-
-#include <catch2/catch.hpp>
-
-using namespace corsika;
-using namespace corsika::stack;
-
-// this is our dummy environment, it only knows its trivial BaseNodeType
-class DummyEvent {
-private:
- size_t parent_;
- std::vector<int> secondaries_;
-
-public:
- DummyEvent() {}
- DummyEvent(const size_t parent) { parent_ = parent; }
-
- size_t getParentIndex() { return parent_; }
- void addSecondary(const int particle) { secondaries_.push_back(particle); }
- int multiplicity() const { return secondaries_.size(); }
-};
-
-// the GeometryNode stack needs to know the type of geometry-nodes from the DummyEnv:
-template <typename TStackIter>
-using DummyHistoryDataInterface =
- typename history::MakeHistoryDataInterface<TStackIter, DummyEvent>::type;
-
-// combine dummy stack with geometry information for tracking
-template <typename TStackIter>
-using StackWithHistoryInterface =
- corsika::stack::CombinedParticleInterface<dummy::DummyStack::MPIType,
- DummyHistoryDataInterface, TStackIter>;
-
-using TestStack =
- corsika::stack::CombinedStack<typename stack::dummy::DummyStack::StackImpl,
- history::HistoryData<DummyEvent>,
- StackWithHistoryInterface>;
-
-using EvtPtr = std::shared_ptr<DummyEvent>;
-
-TEST_CASE("HistoryStackExtension", "[stack]") {
-
- logging::SetLevel(logging::level::debug);
-
- const dummy::NoData noData;
- TestStack s;
-
- auto p = s.AddParticle(std::tuple<dummy::NoData>{noData});
-
- SECTION("add lone particle") {
- CHECK(s.getEntries() == 1);
-
- EvtPtr evt = p.GetEvent();
- CHECK(evt == nullptr);
- }
-}
diff --git a/Stack/History/testHistoryView.cc b/Stack/History/testHistoryView.cc
deleted file mode 100644
index 588537198..000000000
--- a/Stack/History/testHistoryView.cc
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#include <corsika/stack/history/Event.hpp>
-#include <corsika/stack/history/HistorySecondaryProducer.hpp>
-#include <corsika/stack/history/HistoryStackExtension.hpp>
-
-#include <corsika/stack/CombinedStack.h>
-#include <corsika/stack/dummy/DummyStack.h>
-#include <corsika/stack/nuclear_extension/NuclearStackExtension.h>
-
-#include <corsika/logging/Logging.h>
-
-#include <catch2/catch.hpp>
-
-using namespace corsika;
-using namespace corsika::geometry;
-using namespace corsika::units::si;
-
-/**
- Need to replicate setup::SetupStack in a maximally simplified
- way, but with real particle data
- */
-
-// combine dummy stack with geometry information for tracking
-template <typename TStackIter>
-using StackWithHistoryInterface = corsika::stack::CombinedParticleInterface<
- stack::nuclear_extension::ParticleDataStack::MPIType,
- history::HistoryEventDataInterface, TStackIter>;
-
-using TestStack = corsika::stack::CombinedStack<
- typename stack::nuclear_extension::ParticleDataStack::StackImpl,
- history::HistoryEventData, StackWithHistoryInterface>;
-
-/*
- See Issue 161
-
- unfortunately clang does not support this in the same way (yet) as
- gcc, so we have to distinguish here. If clang cataches up, we
- could remove the clang branch here and also in
- corsika::Cascade. The gcc code is much more generic and
- universal. If we could do the gcc version, we won't had to define
- StackView globally, we could do it with MakeView whereever it is
- actually needed. Keep an eye on this!
- */
-#if defined(__clang__)
-using TheTestStackView = corsika::stack::SecondaryView<typename TestStack::StackImpl,
- StackWithHistoryInterface,
- history::HistorySecondaryProducer>;
-#elif defined(__GNUC__) || defined(__GNUG__)
-using TheTestStackView =
- corsika::stack::MakeView<TestStack, history::HistorySecondaryProducer>::type;
-#endif
-
-using TestStackView = TheTestStackView;
-
-template <typename Event>
-int count_generations(Event const* event) {
- int genCounter = 0;
- while (event) {
- event = event->parentEvent().get();
- genCounter++;
- }
-
- return genCounter;
-}
-
-TEST_CASE("HistoryStackExtension", "[stack]") {
-
- logging::SetLevel(logging::level::debug);
-
- geometry::CoordinateSystem& dummyCS =
- geometry::RootCoordinateSystem::GetInstance().GetRootCoordinateSystem();
-
- // in this test we only use one singel stack !
- TestStack stack;
-
- // add primary particle
- auto p0 = stack.AddParticle(
- std::make_tuple(particles::Code::Electron, 1.5_GeV,
- corsika::stack::MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
-
- CHECK(stack.getEntries() == 1);
- corsika::history::EventPtr evt = p0.GetEvent();
- CHECK(evt == nullptr);
- CHECK(count_generations(evt.get()) == 0);
-
- SECTION("interface test, view") {
-
- // add secondaries, 1st generation
- TestStackView hview0(p0);
-
- auto const ev0 = p0.GetEvent();
- CHECK(ev0 == nullptr);
-
- C8LOG_DEBUG("loop VIEW");
-
- // add 5 secondaries
- for (int i = 0; i < 5; ++i) {
- auto sec = hview0.AddSecondary(
- std::make_tuple(particles::Code::Electron, 1.5_GeV,
- corsika::stack::MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
-
- CHECK(sec.GetParentEventIndex() == i);
- CHECK(sec.GetEvent() != nullptr);
- CHECK(sec.GetEvent()->parentEvent() == nullptr);
- CHECK(count_generations(sec.GetEvent().get()) == 1);
- }
-
- // read 1st genertion particle particle
- auto p1 = stack.GetNextParticle();
- CHECK(count_generations(p1.GetEvent().get()) == 1);
-
- TestStackView hview1(p1);
-
- auto const ev1 = p1.GetEvent();
-
- // add second generation of secondaries
- // add 10 secondaries
- for (int i = 0; i < 10; ++i) {
- auto sec = hview1.AddSecondary(
- std::make_tuple(particles::Code::Electron, 1.5_GeV,
- corsika::stack::MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
-
- CHECK(sec.GetParentEventIndex() == i);
- CHECK(sec.GetEvent()->parentEvent() == ev1);
- CHECK(sec.GetEvent()->parentEvent()->parentEvent() == ev0);
-
- CHECK(count_generations(sec.GetEvent().get()) == 2);
-
- const auto org_projectile = stack.at(sec.GetEvent()->projectileIndex());
- CHECK(org_projectile.GetEvent() == sec.GetEvent()->parentEvent());
- }
-
- // read 2nd genertion particle particle
- auto p2 = stack.GetNextParticle();
-
- TestStackView hview2(p2);
-
- auto const ev2 = p2.GetEvent();
-
- // add third generation of secondaries
- // add 15 secondaries
- for (int i = 0; i < 15; ++i) {
- C8LOG_TRACE("loop, view: " + std::to_string(i));
-
- auto sec = hview2.AddSecondary(
- std::make_tuple(particles::Code::Electron, 1.5_GeV,
- corsika::stack::MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
- C8LOG_TRACE("loop, ---- ");
-
- CHECK(sec.GetParentEventIndex() == i);
- CHECK(sec.GetEvent()->parentEvent() == ev2);
- CHECK(sec.GetEvent()->parentEvent()->parentEvent() == ev1);
- CHECK(sec.GetEvent()->parentEvent()->parentEvent()->parentEvent() == ev0);
-
- CHECK(count_generations(sec.GetEvent().get()) == 3);
- }
- }
-
- SECTION("also test projectile access") {
-
- C8LOG_TRACE("projectile test");
-
- // add secondaries, 1st generation
- TestStackView hview0(p0);
- auto proj0 = hview0.GetProjectile();
- auto const ev0 = p0.GetEvent();
- CHECK(ev0 == nullptr);
-
- C8LOG_TRACE("loop");
-
- // add 5 secondaries
- for (int i = 0; i < 5; ++i) {
- C8LOG_TRACE("loop " + std::to_string(i));
- auto sec = proj0.AddSecondary(
- std::make_tuple(particles::Code::Electron, 1.5_GeV,
- corsika::stack::MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
-
- CHECK(sec.GetParentEventIndex() == i);
- CHECK(sec.GetEvent() != nullptr);
- CHECK(sec.GetEvent()->parentEvent() == nullptr);
- }
- CHECK(stack.getEntries() == 6);
-
- // read 1st genertion particle particle
- auto p1 = stack.GetNextParticle();
-
- TestStackView hview1(p1);
- auto proj1 = hview1.GetProjectile();
- auto const ev1 = p1.GetEvent();
-
- // add second generation of secondaries
- // add 10 secondaries
- for (int i = 0; i < 10; ++i) {
- auto sec = proj1.AddSecondary(
- std::make_tuple(particles::Code::Electron, 1.5_GeV,
- corsika::stack::MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
-
- CHECK(sec.GetParentEventIndex() == i);
- CHECK(sec.GetEvent()->parentEvent() == ev1);
- CHECK(sec.GetEvent()->secondaries().size() == i + 1);
- CHECK(sec.GetEvent()->parentEvent()->parentEvent() == ev0);
-
- const auto org_projectile = stack.at(sec.GetEvent()->projectileIndex());
- CHECK(org_projectile.GetEvent() == sec.GetEvent()->parentEvent());
- }
- CHECK(stack.getEntries() == 16);
- }
-}
diff --git a/corsika/framework/core/PhysicalUnits.hpp b/corsika/framework/core/PhysicalUnits.hpp
index a9769c00d..185a65fce 100644
--- a/corsika/framework/core/PhysicalUnits.hpp
+++ b/corsika/framework/core/PhysicalUnits.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/BaseVector.hpp b/corsika/framework/geometry/BaseVector.hpp
index b094f6d43..f689d49dc 100644
--- a/corsika/framework/geometry/BaseVector.hpp
+++ b/corsika/framework/geometry/BaseVector.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/CoordinateSystem.hpp b/corsika/framework/geometry/CoordinateSystem.hpp
index 31f57d395..32fbba52e 100644
--- a/corsika/framework/geometry/CoordinateSystem.hpp
+++ b/corsika/framework/geometry/CoordinateSystem.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/Helix.hpp b/corsika/framework/geometry/Helix.hpp
index eb10b51e4..5bd9fac77 100644
--- a/corsika/framework/geometry/Helix.hpp
+++ b/corsika/framework/geometry/Helix.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/IVolume.hpp b/corsika/framework/geometry/IVolume.hpp
index 4983b3de1..59b9acb55 100644
--- a/corsika/framework/geometry/IVolume.hpp
+++ b/corsika/framework/geometry/IVolume.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/Line.hpp b/corsika/framework/geometry/Line.hpp
index 21bf263c8..cdb03d624 100644
--- a/corsika/framework/geometry/Line.hpp
+++ b/corsika/framework/geometry/Line.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/Plane.hpp b/corsika/framework/geometry/Plane.hpp
index 928b04ebe..9b2eacade 100644
--- a/corsika/framework/geometry/Plane.hpp
+++ b/corsika/framework/geometry/Plane.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/QuantityVector.hpp b/corsika/framework/geometry/QuantityVector.hpp
index c8787712c..235237afe 100644
--- a/corsika/framework/geometry/QuantityVector.hpp
+++ b/corsika/framework/geometry/QuantityVector.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/RootCoordinateSystem.hpp b/corsika/framework/geometry/RootCoordinateSystem.hpp
index 7f73cdb29..08244fb54 100644
--- a/corsika/framework/geometry/RootCoordinateSystem.hpp
+++ b/corsika/framework/geometry/RootCoordinateSystem.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/Sphere.hpp b/corsika/framework/geometry/Sphere.hpp
index 99f269398..cea283b3d 100644
--- a/corsika/framework/geometry/Sphere.hpp
+++ b/corsika/framework/geometry/Sphere.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/geometry/Vector.hpp b/corsika/framework/geometry/Vector.hpp
index ddc0738f5..0d37c66c7 100644
--- a/corsika/framework/geometry/Vector.hpp
+++ b/corsika/framework/geometry/Vector.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/process/BaseProcess.hpp b/corsika/framework/process/BaseProcess.hpp
index 597499167..e91651d12 100644
--- a/corsika/framework/process/BaseProcess.hpp
+++ b/corsika/framework/process/BaseProcess.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/process/BoundaryCrossingProcess.hpp b/corsika/framework/process/BoundaryCrossingProcess.hpp
index 8d56350ab..1e9a4bdee 100644
--- a/corsika/framework/process/BoundaryCrossingProcess.hpp
+++ b/corsika/framework/process/BoundaryCrossingProcess.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/process/ContinuousProcess.hpp b/corsika/framework/process/ContinuousProcess.hpp
index a0a1e1dee..1343c0822 100644
--- a/corsika/framework/process/ContinuousProcess.hpp
+++ b/corsika/framework/process/ContinuousProcess.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/process/DecayProcess.hpp b/corsika/framework/process/DecayProcess.hpp
index 95953f75b..64298dc34 100644
--- a/corsika/framework/process/DecayProcess.hpp
+++ b/corsika/framework/process/DecayProcess.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
@@ -39,5 +39,6 @@ namespace corsika {
InverseTimeType getInverseLifetime(TParticle const& particle) {
return 1. / ref().getLifetime(particle);
}
+ };
} // namespace corsika
diff --git a/corsika/framework/process/InteractionProcess.hpp b/corsika/framework/process/InteractionProcess.hpp
index b3f51aebc..f80480926 100644
--- a/corsika/framework/process/InteractionProcess.hpp
+++ b/corsika/framework/process/InteractionProcess.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/process/ProcessReturn.hpp b/corsika/framework/process/ProcessReturn.hpp
index fab4f628d..eef7058d0 100644
--- a/corsika/framework/process/ProcessReturn.hpp
+++ b/corsika/framework/process/ProcessReturn.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/process/ProcessSequence.hpp b/corsika/framework/process/ProcessSequence.hpp
index be499bf8b..70337e109 100644
--- a/corsika/framework/process/ProcessSequence.hpp
+++ b/corsika/framework/process/ProcessSequence.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/random/ExponentialDistribution.hpp b/corsika/framework/random/ExponentialDistribution.hpp
index 77b351941..7bd855632 100644
--- a/corsika/framework/random/ExponentialDistribution.hpp
+++ b/corsika/framework/random/ExponentialDistribution.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/stack/CombinedStack.hpp b/corsika/framework/stack/CombinedStack.hpp
index 89424775d..5dfbbfe12 100644
--- a/corsika/framework/stack/CombinedStack.hpp
+++ b/corsika/framework/stack/CombinedStack.hpp
@@ -131,7 +131,7 @@ namespace corsika {
template <typename Stack1Impl, typename Stack2Impl, template <typename> typename _PI>
using CombinedStack = Stack<CombinedStackImpl<Stack1Impl, Stack2Impl>, _PI>;
-
+
} // namespace corsika
#include <corsika/detail/framework/stack/CombinedStack.inl>
diff --git a/corsika/framework/utility/CorsikaFenv.hpp b/corsika/framework/utility/CorsikaFenv.hpp
index e9837943f..f3be6389c 100644
--- a/corsika/framework/utility/CorsikaFenv.hpp
+++ b/corsika/framework/utility/CorsikaFenv.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
@@ -28,4 +28,4 @@ int fedisableexcept(int excepts);
#else
#include <corsika/detail/framework/utility/CorsikaFenvFallback.inl>
#endif
-#endif
\ No newline at end of file
+#endif
diff --git a/corsika/framework/utility/Singleton.hpp b/corsika/framework/utility/Singleton.hpp
index 9b1b7ea50..78a7df97b 100644
--- a/corsika/framework/utility/Singleton.hpp
+++ b/corsika/framework/utility/Singleton.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/framework/utility/detail/COMBoost.inl b/corsika/framework/utility/detail/COMBoost.inl
index 95ac32b4b..aa6af4834 100644
--- a/corsika/framework/utility/detail/COMBoost.inl
+++ b/corsika/framework/utility/detail/COMBoost.inl
@@ -19,107 +19,107 @@
namespace corsika::utl {
- auto const& COMBoost::GetRotationMatrix() const { return fRotation; }
-
- //! transforms a 4-momentum from lab frame to the center-of-mass frame
- template <typename FourVector>
- FourVector COMBoost::toCoM(const FourVector& p) const {
- using namespace corsika::units::si;
- auto pComponents = p.GetSpaceLikeComponents().GetComponents(rotatedCS_);
- Eigen::Vector3d eVecRotated = pComponents.eVector;
- Eigen::Vector2d lab;
-
- lab << (p.GetTimeLikeComponent() * (1 / 1_GeV)),
- (eVecRotated(2) * (1 / 1_GeV).magnitude());
-
- auto const boostedZ = boost_ * lab;
- auto const E_CoM = boostedZ(0) * 1_GeV;
-
- eVecRotated(2) = boostedZ(1) * (1_GeV).magnitude();
-
- return FourVector(
- E_CoM, corsika::geometry::Vector<hepmomentum_d>(rotatedCS_, eVecRotated));
+ auto const& COMBoost::GetRotationMatrix() const { return fRotation; }
+
+ //! transforms a 4-momentum from lab frame to the center-of-mass frame
+ template <typename FourVector>
+ FourVector COMBoost::toCoM(const FourVector& p) const {
+ using namespace corsika::units::si;
+ auto pComponents = p.GetSpaceLikeComponents().GetComponents(rotatedCS_);
+ Eigen::Vector3d eVecRotated = pComponents.eVector;
+ Eigen::Vector2d lab;
+
+ lab << (p.GetTimeLikeComponent() * (1 / 1_GeV)),
+ (eVecRotated(2) * (1 / 1_GeV).magnitude());
+
+ auto const boostedZ = boost_ * lab;
+ auto const E_CoM = boostedZ(0) * 1_GeV;
+
+ eVecRotated(2) = boostedZ(1) * (1_GeV).magnitude();
+
+ return FourVector(E_CoM,
+ corsika::geometry::Vector<hepmomentum_d>(rotatedCS_, eVecRotated));
+ }
+
+ //! transforms a 4-momentum from the center-of-mass frame back to lab frame
+ template <typename FourVector>
+ FourVector COMBoost::fromCoM(const FourVector& p) const {
+ using namespace corsika::units::si;
+ auto pCM = p.GetSpaceLikeComponents().GetComponents(rotatedCS_);
+ auto const Ecm = p.GetTimeLikeComponent();
+
+ Eigen::Vector2d com;
+ com << (Ecm * (1 / 1_GeV)), (pCM.eVector(2) * (1 / 1_GeV).magnitude());
+
+ C8LOG_TRACE(
+ "COMBoost::fromCoM Ecm={} GeV"
+ " pcm={} GeV (norm = {} GeV), invariant mass={} GeV",
+ Ecm / 1_GeV, pCM / 1_GeV, pCM.norm() / 1_GeV, p.GetNorm() / 1_GeV);
+
+ auto const boostedZ = inverseBoost_ * com;
+ auto const E_lab = boostedZ(0) * 1_GeV;
+
+ pCM.eVector(2) = boostedZ(1) * (1_GeV).magnitude();
+
+ geometry::Vector<typename decltype(pCM)::dimension> pLab{rotatedCS_, pCM};
+ pLab.rebase(originalCS_);
+
+ FourVector f(E_lab, pLab);
+
+ C8LOG_TRACE("COMBoost::fromCoM --> Elab={} GeV",
+ " plab={} GeV (norm={} GeV) "
+ " GeV), invariant mass = {}",
+ E_lab / 1_GeV, f.GetNorm() / 1_GeV, pLab.GetComponents(),
+ pLab.norm() / 1_GeV);
+
+ return f;
+ }
+
+ COMBoost::COMBoost(FourVector<HEPEnergyType, Vector<hepmomentum_d>> const& Pprojectile,
+ const HEPMassType massTarget)
+ : fCS(Pprojectile.GetSpaceLikeComponents().GetCoordinateSystem()) {
+ auto const pProjectile = Pprojectile.GetSpaceLikeComponents();
+ auto const pProjNorm = pProjectile.norm();
+ auto const a = (pProjectile / pProjNorm).GetComponents().eVector;
+ auto const a1 = a(0), a2 = a(1);
+
+ auto const s = sgn(a(2));
+ auto const c = 1 / (1 + s * a(2));
+
+ Eigen::Matrix3d A, B;
+
+ if (s > 0) {
+ A << 1, 0, -a1, // comment to prevent clang-format
+ 0, 1, -a2, // .
+ a1, a2, 1; // .
+ B << -a1 * a1 * c, -a1 * a2 * c, 0, // .
+ -a1 * a2 * c, -a2 * a2 * c, 0, // .
+ 0, 0, -(a1 * a1 + a2 * a2) * c; // .
+
+ } else {
+ A << 1, 0, a1, // comment to prevent clang-format
+ 0, -1, -a2, // .
+ a1, a2, -1; // .
+ B << -a1 * a1 * c, -a1 * a2 * c, 0, // .
+ +a1 * a2 * c, +a2 * a2 * c, 0, // .
+ 0, 0, (a1 * a1 + a2 * a2) * c; // .
}
- //! transforms a 4-momentum from the center-of-mass frame back to lab frame
- template <typename FourVector>
- FourVector COMBoost::fromCoM(const FourVector& p) const {
- using namespace corsika::units::si;
- auto pCM = p.GetSpaceLikeComponents().GetComponents(rotatedCS_);
- auto const Ecm = p.GetTimeLikeComponent();
-
- Eigen::Vector2d com;
- com << (Ecm * (1 / 1_GeV)), (pCM.eVector(2) * (1 / 1_GeV).magnitude());
+ fRotation = A + B;
- C8LOG_TRACE(
- "COMBoost::fromCoM Ecm={} GeV"
- " pcm={} GeV (norm = {} GeV), invariant mass={} GeV",
- Ecm / 1_GeV, pCM / 1_GeV, pCM.norm() / 1_GeV, p.GetNorm() / 1_GeV);
+ // calculate boost
+ double const beta = pProjNorm / (Pprojectile.GetTimeLikeComponent() + massTarget);
- auto const boostedZ = inverseBoost_ * com;
- auto const E_lab = boostedZ(0) * 1_GeV;
+ /* Accurracy matters here, beta = 1 - epsilon for ultra-relativistic boosts */
+ double const coshEta = 1 / std::sqrt((1 + beta) * (1 - beta));
+ //~ double const coshEta = 1 / std::sqrt((1-beta*beta));
+ double const sinhEta = -beta * coshEta;
- pCM.eVector(2) = boostedZ(1) * (1_GeV).magnitude();
-
- geometry::Vector<typename decltype(pCM)::dimension> pLab{rotatedCS_, pCM};
- pLab.rebase(originalCS_);
-
- FourVector f(E_lab, pLab);
-
- C8LOG_TRACE("COMBoost::fromCoM --> Elab={} GeV",
- " plab={} GeV (norm={} GeV) "
- " GeV), invariant mass = {}",
- E_lab / 1_GeV, f.GetNorm() / 1_GeV, pLab.GetComponents(),
- pLab.norm() / 1_GeV);
-
- return f;
- }
+ std::cout << "COMBoost (1-beta)=" << 1 - beta << " gamma=" << coshEta << std::endl;
+ std::cout << " det = " << fRotation.determinant() - 1 << std::endl;
- COMBoost::COMBoost(FourVector<HEPEnergyType, Vector<hepmomentum_d>> const& Pprojectile,
- const HEPMassType massTarget)
- : fCS(Pprojectile.GetSpaceLikeComponents().GetCoordinateSystem()) {
- auto const pProjectile = Pprojectile.GetSpaceLikeComponents();
- auto const pProjNorm = pProjectile.norm();
- auto const a = (pProjectile / pProjNorm).GetComponents().eVector;
- auto const a1 = a(0), a2 = a(1);
+ fBoost << coshEta, sinhEta, sinhEta, coshEta;
- auto const s = sgn(a(2));
- auto const c = 1 / (1 + s * a(2));
-
- Eigen::Matrix3d A, B;
-
- if (s > 0) {
- A << 1, 0, -a1, // comment to prevent clang-format
- 0, 1, -a2, // .
- a1, a2, 1; // .
- B << -a1 * a1 * c, -a1 * a2 * c, 0, // .
- -a1 * a2 * c, -a2 * a2 * c, 0, // .
- 0, 0, -(a1 * a1 + a2 * a2) * c; // .
-
- } else {
- A << 1, 0, a1, // comment to prevent clang-format
- 0, -1, -a2, // .
- a1, a2, -1; // .
- B << -a1 * a1 * c, -a1 * a2 * c, 0, // .
- +a1 * a2 * c, +a2 * a2 * c, 0, // .
- 0, 0, (a1 * a1 + a2 * a2) * c; // .
- }
-
- fRotation = A + B;
-
- // calculate boost
- double const beta = pProjNorm / (Pprojectile.GetTimeLikeComponent() + massTarget);
-
- /* Accurracy matters here, beta = 1 - epsilon for ultra-relativistic boosts */
- double const coshEta = 1 / std::sqrt((1 + beta) * (1 - beta));
- //~ double const coshEta = 1 / std::sqrt((1-beta*beta));
- double const sinhEta = -beta * coshEta;
-
- std::cout << "COMBoost (1-beta)=" << 1 - beta << " gamma=" << coshEta << std::endl;
- std::cout << " det = " << fRotation.determinant() - 1 << std::endl;
-
- fBoost << coshEta, sinhEta, sinhEta, coshEta;
-
- fInverseBoost << coshEta, -sinhEta, -sinhEta, coshEta;
- }
+ fInverseBoost << coshEta, -sinhEta, -sinhEta, coshEta;
+ }
} // namespace corsika::utl
diff --git a/corsika/media/FlatExponential.hpp b/corsika/media/FlatExponential.hpp
index 2e21772d4..704e69b45 100644
--- a/corsika/media/FlatExponential.hpp
+++ b/corsika/media/FlatExponential.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/corsika/process/EnergyLoss.hpp b/corsika/process/EnergyLoss.hpp
index 6378824d2..656f644c0 100644
--- a/corsika/process/EnergyLoss.hpp
+++ b/corsika/process/EnergyLoss.hpp
@@ -28,7 +28,6 @@ namespace corsika {
void MomentumUpdate(setup::Stack::ParticleType&, units::si::HEPEnergyType Enew);
public:
-
template <typename TDim>
EnergyLoss(geometry::Point const& injectionPoint,
geometry::Vector<TDim> const& direction)
@@ -75,4 +74,3 @@ namespace corsika {
return 0.0001_g / square(1_cm);
});
} // namespace corsika
-
diff --git a/corsika/process/HadronicElasticModel.hpp b/corsika/process/HadronicElasticModel.hpp
index 3b15c4b52..0466a037e 100644
--- a/corsika/process/HadronicElasticModel.hpp
+++ b/corsika/process/HadronicElasticModel.hpp
@@ -40,8 +40,7 @@ namespace corsika::HadronicElasticModel {
using inveV2 = decltype(1 / units::si::square(units::si::electronvolt));
corsika::RNG& fRNG =
- corsika::RNGManager::GetInstance().GetRandomStream(
- "HadronicElasticModel");
+ corsika::RNGManager::GetInstance().GetRandomStream("HadronicElasticModel");
inveV2 B(eV2 s) const;
corsika::units::si::CrossSectionType CrossSection(SquaredHEPEnergyType s) const;
@@ -59,4 +58,3 @@ namespace corsika::HadronicElasticModel {
};
} // namespace corsika::HadronicElasticModel
-
diff --git a/corsika/process/ObservationPlane.hpp b/corsika/process/ObservationPlane.hpp
index 5749e69d9..3ac64e263 100644
--- a/corsika/process/ObservationPlane.hpp
+++ b/corsika/process/ObservationPlane.hpp
@@ -31,13 +31,11 @@ namespace corsika::observation_plane {
geometry::Vector<units::si::dimensionless_d> const&,
std::string const&, bool = true);
- corsika::EProcessReturn DoContinuous(
- corsika::Stack::ParticleType const& vParticle,
- corsika::Trajectory const& vTrajectory);
+ corsika::EProcessReturn DoContinuous(corsika::Stack::ParticleType const& vParticle,
+ corsika::Trajectory const& vTrajectory);
- corsika::units::si::LengthType MaxStepLength(
- corsika::Stack::ParticleType const&,
- corsika::Trajectory const& vTrajectory);
+ corsika::units::si::LengthType MaxStepLength(corsika::Stack::ParticleType const&,
+ corsika::Trajectory const& vTrajectory);
void ShowResults() const;
void Reset();
@@ -53,5 +51,3 @@ namespace corsika::observation_plane {
geometry::Vector<units::si::dimensionless_d> const xAxis_, yAxis_;
};
} // namespace corsika::observation_plane
-
-
diff --git a/corsika/process/ParticleCut.hpp b/corsika/process/ParticleCut.hpp
index 5674e2c03..435eb09f3 100644
--- a/corsika/process/ParticleCut.hpp
+++ b/corsika/process/ParticleCut.hpp
@@ -67,5 +67,3 @@ namespace corsika {
};
} // namespace particle_cut
} // namespace corsika
-
-
diff --git a/corsika/process/Pythia/Decay.hpp b/corsika/process/Pythia/Decay.hpp
index f8cfa8f97..20bbf9694 100644
--- a/corsika/process/Pythia/Decay.hpp
+++ b/corsika/process/Pythia/Decay.hpp
@@ -23,18 +23,16 @@ namespace corsika {
typedef corsika::Vector<corsika::units::si::hepmomentum_d> MomentumVector;
- class Decay : public corsika::DecayProcess<Decay>
- {
+ class Decay : public corsika::DecayProcess<Decay> {
- const std::vector<particles::Code> fTrackedParticles;
- int fCount = 0;
+ const std::vector<particles::Code> fTrackedParticles;
+ int fCount = 0;
public:
-
Decay(std::vector<corsika::Code>);
~Decay();
- void SetParticleListStable(std::vector<particles::Code> const& );
+ void SetParticleListStable(std::vector<particles::Code> const&);
void SetUnstable(const corsika::Code);
void SetStable(const corsika::Code);
diff --git a/corsika/process/Pythia/Interaction.hpp b/corsika/process/Pythia/Interaction.hpp
index 27634e0f0..e5d473f98 100644
--- a/corsika/process/Pythia/Interaction.hpp
+++ b/corsika/process/Pythia/Interaction.hpp
@@ -39,12 +39,10 @@ namespace corsika::pythia {
}
bool CanInteract(const corsika::Code);
- void ConfigureLabFrameCollision(const corsika::Code,
- const corsika::Code,
+ void ConfigureLabFrameCollision(const corsika::Code, const corsika::Code,
const corsika::units::si::HEPEnergyType);
std::tuple<corsika::units::si::CrossSectionType, corsika::units::si::CrossSectionType>
- GetCrossSection(const corsika::Code BeamId,
- const corsika::Code TargetId,
+ GetCrossSection(const corsika::Code BeamId, const corsika::Code TargetId,
const corsika::units::si::HEPEnergyType CoMenergy);
template <typename TParticle>
@@ -59,8 +57,7 @@ namespace corsika::pythia {
corsika::EProcessReturn DoInteraction(TProjectile&);
private:
- corsika::RNG& fRNG =
- corsika::RNGManager::GetInstance().GetRandomStream("pythia");
+ corsika::RNG& fRNG = corsika::RNGManager::GetInstance().GetRandomStream("pythia");
Pythia8::Pythia fPythia;
Pythia8::SigmaTotal fSigma;
const bool fInternalDecays = true;
diff --git a/corsika/process/Pythia/Random.hpp b/corsika/process/Pythia/Random.hpp
index 339a9cf87..3858be793 100644
--- a/corsika/process/Pythia/Random.hpp
+++ b/corsika/process/Pythia/Random.hpp
@@ -20,8 +20,7 @@ namespace corsika {
private:
std::uniform_real_distribution<double> fDist;
- corsika::RNG& fRNG =
- corsika::RNGManager::GetInstance().GetRandomStream("pythia");
+ corsika::RNG& fRNG = corsika::RNGManager::GetInstance().GetRandomStream("pythia");
};
} // namespace pythia
diff --git a/corsika/process/QGSJetII/Interaction.hpp b/corsika/process/QGSJetII/Interaction.hpp
index dbe201090..fd331d75a 100644
--- a/corsika/process/QGSJetII/Interaction.hpp
+++ b/corsika/process/QGSJetII/Interaction.hpp
@@ -37,9 +37,8 @@ namespace corsika::qgsjetII {
}
corsika::units::si::CrossSectionType GetCrossSection(
- const corsika::Code, const corsika::Code,
- const corsika::units::si::HEPEnergyType, const unsigned int Abeam = 0,
- const unsigned int Atarget = 0) const;
+ const corsika::Code, const corsika::Code, const corsika::units::si::HEPEnergyType,
+ const unsigned int Abeam = 0, const unsigned int Atarget = 0) const;
template <typename TParticle>
corsika::units::si::GrammageType GetInteractionLength(TParticle const&) const;
@@ -53,8 +52,7 @@ namespace corsika::qgsjetII {
corsika::EProcessReturn DoInteraction(TProjectile&);
private:
- corsika::RNG& fRNG =
- corsika::RNGManager::GetInstance().GetRandomStream("qgran");
+ corsika::RNG& fRNG = corsika::RNGManager::GetInstance().GetRandomStream("qgran");
const int maxMassNumber_ = 208;
};
diff --git a/corsika/process/QGSJetII/QGSJetIIStack.hpp b/corsika/process/QGSJetII/QGSJetIIStack.hpp
index 9bd8512d1..403fa9032 100644
--- a/corsika/process/QGSJetII/QGSJetIIStack.hpp
+++ b/corsika/process/QGSJetII/QGSJetIIStack.hpp
@@ -51,7 +51,8 @@ namespace corsika::qgsjetII {
using namespace corsika::units::si;
return qgarr14_.esp[i][0] * 1_GeV;
}
- MomentumVector GetMomentum(const unsigned int i, const corsika::CoordinateSystem& CS) const {
+ MomentumVector GetMomentum(const unsigned int i,
+ const corsika::CoordinateSystem& CS) const {
using namespace corsika::units::si;
geometry::QuantityVector<hepmomentum_d> components = {qgarr14_.esp[i][2] * 1_GeV,
qgarr14_.esp[i][3] * 1_GeV,
@@ -115,7 +116,9 @@ namespace corsika::qgsjetII {
GetStackData().GetId(GetIndex()));
}
- MomentumVector GetMomentum(const corsika::CoordinateSystem& CS) const { return GetStackData().GetMomentum(GetIndex(), CS); }
+ MomentumVector GetMomentum(const corsika::CoordinateSystem& CS) const {
+ return GetStackData().GetMomentum(GetIndex(), CS);
+ }
void SetMomentum(const MomentumVector& v) {
GetStackData().SetMomentum(GetIndex(), v);
diff --git a/corsika/process/Sibyll/Interaction.hpp b/corsika/process/Sibyll/Interaction.hpp
index f89245b21..9c263aaa5 100644
--- a/corsika/process/Sibyll/Interaction.hpp
+++ b/corsika/process/Sibyll/Interaction.hpp
@@ -65,8 +65,7 @@ namespace corsika::sibyll {
corsika::EProcessReturn DoInteraction(TProjectile&);
private:
- corsika::RNG& RNG_ =
- corsika::RNGManager::GetInstance().GetRandomStream("s_rndm");
+ corsika::RNG& RNG_ = corsika::RNGManager::GetInstance().GetRandomStream("s_rndm");
// FOR NOW keep trackedParticles private, could be configurable
std::vector<particles::Code> const trackedParticles_ = {
particles::Code::PiPlus, particles::Code::PiMinus,
diff --git a/corsika/process/Sibyll/NuclearInteraction.hpp b/corsika/process/Sibyll/NuclearInteraction.hpp
index 7a0fe1dfc..a587bf0f8 100644
--- a/corsika/process/Sibyll/NuclearInteraction.hpp
+++ b/corsika/process/Sibyll/NuclearInteraction.hpp
@@ -59,8 +59,7 @@ namespace corsika::sibyll {
TEnvironment const& environment_;
corsika::sibyll::Interaction& hadronicInteraction_;
std::map<corsika::Code, int> targetComponentsIndex_;
- corsika::RNG& RNG_ =
- corsika::RNGManager::GetInstance().GetRandomStream("s_rndm");
+ corsika::RNG& RNG_ = corsika::RNGManager::GetInstance().GetRandomStream("s_rndm");
static constexpr int gNSample_ =
500; // number of samples in MC estimation of cross section
static constexpr unsigned int gMaxNucleusAProjectile_ = 56;
diff --git a/corsika/process/Sibyll/SibStack.hpp b/corsika/process/Sibyll/SibStack.hpp
index e17e2c536..121746831 100644
--- a/corsika/process/Sibyll/SibStack.hpp
+++ b/corsika/process/Sibyll/SibStack.hpp
@@ -130,8 +130,7 @@ namespace corsika::sibyll {
void SetPID(const int v) { GetStackData().SetId(GetIndex(), v); }
corsika::sibyll::SibyllCode GetPID() const {
- return static_cast<corsika::sibyll::SibyllCode>(
- GetStackData().GetId(GetIndex()));
+ return static_cast<corsika::sibyll::SibyllCode>(GetStackData().GetId(GetIndex()));
}
MomentumVector GetMomentum() const { return GetStackData().GetMomentum(GetIndex()); }
diff --git a/corsika/process/StackInspector.hpp b/corsika/process/StackInspector.hpp
index 0b2d8aaf7..ff9169d4d 100644
--- a/corsika/process/StackInspector.hpp
+++ b/corsika/process/StackInspector.hpp
@@ -50,4 +50,3 @@ namespace corsika {
} // namespace stack_inspector
} // namespace corsika
-
diff --git a/corsika/process/SwitchProcess.hpp b/corsika/process/SwitchProcess.hpp
index 1ade22295..2c08016fd 100644
--- a/corsika/process/SwitchProcess.hpp
+++ b/corsika/process/SwitchProcess.hpp
@@ -98,4 +98,3 @@ namespace corsika::switch_process {
}
};
} // namespace corsika::switch_process
-
diff --git a/corsika/process/TrackWriter.hpp b/corsika/process/TrackWriter.hpp
index 3af5fdda6..d0f9d8462 100644
--- a/corsika/process/TrackWriter.hpp
+++ b/corsika/process/TrackWriter.hpp
@@ -38,4 +38,3 @@ namespace corsika::track_writer {
};
} // namespace corsika::track_writer
-
diff --git a/corsika/setup/SetupTrajectory.hpp b/corsika/setup/SetupTrajectory.hpp
index 70204abd2..a20d1db3d 100644
--- a/corsika/setup/SetupTrajectory.hpp
+++ b/corsika/setup/SetupTrajectory.hpp
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/tests/common/testTestStack.h b/tests/common/testTestStack.h
index c71d2922b..a905231fb 100644
--- a/tests/common/testTestStack.h
+++ b/tests/common/testTestStack.h
@@ -1,4 +1,4 @@
-n/*
+/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
* This software is distributed under the terms of the GNU General Public
diff --git a/tests/framework/testCOMBoost.cpp b/tests/framework/testCOMBoost.cpp
index 12e1e3a0d..7cc37dd49 100644
--- a/tests/framework/testCOMBoost.cpp
+++ b/tests/framework/testCOMBoost.cpp
@@ -233,9 +233,6 @@ TEST_CASE("boosts") {
auto const sqrt_s_lab =
sqrt(s(eProjectileLab + targetMass, pProjectileLab.getComponents(rootCS)));
- auto const sqrt_s_lab =
- sqrt(s(eProjectileLab + targetMass, pProjectileLab.GetComponents(rootCS)));
-
// define boost to com frame
COMBoost boost(PprojLab, targetMass);
--
GitLab