diff --git a/corsika/detail/modules/epos/Interaction.inl b/corsika/detail/modules/epos/Interaction.inl
index 4986bd9f6dc0c804896fe685394ce42f95db938c..31c0886c5fbcb6bbadc28baf548b1d8afbc08b31 100644
--- a/corsika/detail/modules/epos/Interaction.inl
+++ b/corsika/detail/modules/epos/Interaction.inl
@@ -166,13 +166,13 @@ namespace corsika::epos {
// dummy event (prepare commons)
initializeEventLab(Code::Iron, Iron::nucleus_A, Iron::nucleus_Z, Code::Argon,
- Argon::nucleus_A, Argon::nucleus_Z, 100_GeV);
+ Argon::nucleus_A, Argon::nucleus_Z, 100_GeV);
}
inline void Interaction::initializeEventCoM(Code const idBeam, int const iBeamA,
- int const iBeamZ, Code const idTarget,
- int const iTargetA, int const iTargetZ,
- HEPEnergyType const Ecm) const {
+ int const iBeamZ, Code const idTarget,
+ int const iTargetA, int const iTargetZ,
+ HEPEnergyType const Ecm) const {
CORSIKA_LOGGER_TRACE(logger_,
"initialize event in CoM frame!"
" Ecm={}",
@@ -196,9 +196,9 @@ namespace corsika::epos {
}
inline void Interaction::initializeEventLab(Code const idBeam, int const iBeamA,
- int const iBeamZ, Code const idTarget,
- int const iTargetA, int const iTargetZ,
- HEPEnergyType const Plab) const {
+ int const iBeamZ, Code const idTarget,
+ int const iTargetA, int const iTargetZ,
+ HEPEnergyType const Plab) const {
CORSIKA_LOGGER_TRACE(logger_,
"initialize event in lab. frame!"
" Plab per nuc={} GeV",
@@ -224,9 +224,9 @@ namespace corsika::epos {
}
inline void Interaction::configureParticles(Code const idBeam, int const iBeamA,
- int const iBeamZ, Code const idTarget,
- int const iTargetA,
- int const iTargetZ) const {
+ int const iBeamZ, Code const idTarget,
+ int const iTargetA,
+ int const iTargetZ) const {
CORSIKA_LOGGER_TRACE(logger_,
"setting "
"Beam={}, "
@@ -244,7 +244,7 @@ namespace corsika::epos {
::epos::had10_.iclpro = corsika::epos::getEposXSCode(Code::Proton);
} else {
::epos::hadr25_.idprojin = convertToEposRaw(idBeam);
- ::epos::had10_.iclpro = corsika::epos::getEposXSCode(idBeam);
+ ::epos::had10_.iclpro = corsika::epos::getEposXSCode(idBeam);
::epos::nucl1_.laproj = -1;
::epos::nucl1_.maproj = 1;
}
@@ -286,20 +286,22 @@ namespace corsika::epos {
inline Interaction::~Interaction() { CORSIKA_LOGGER_DEBUG(logger_, "n={} ", count_); }
// inline std::tuple<corsika::CrossSectionType, corsika::CrossSectionType>
- // Interaction::getCrossSection(corsika::Code const BeamId, corsika::Code const TargetId,
+ // Interaction::getCrossSection(corsika::Code const BeamId, corsika::Code const
+ // TargetId,
// const corsika::HEPEnergyType EnergyCOM) const {
// if (!is_nucleus(BeamId))
// return getCrossSection(BeamId, 1, 1, TargetId, get_nucleus_A(TargetId),
// get_nucleus_Z(TargetId), EnergyCOM);
// else
- // throw("nuclear projecile, call getCrossSection with : BeamId, BeamA, BeamZ, ...");
+ // throw("nuclear projecile, call getCrossSection with : BeamId, BeamA, BeamZ,
+ // ...");
// }
inline std::tuple<corsika::CrossSectionType, corsika::CrossSectionType>
Interaction::calcCrossSectionCoM(corsika::Code const BeamId, int const BeamA,
- int const BeamZ, corsika::Code const TargetId,
- int const TargetA, int const TargetZ,
- const corsika::HEPEnergyType EnergyCOM) const {
+ int const BeamZ, corsika::Code const TargetId,
+ int const TargetA, int const TargetZ,
+ const corsika::HEPEnergyType EnergyCOM) const {
CORSIKA_LOGGER_DEBUG(logger_,
"calcCrossSection: input:"
" beamId={}, beamA={}, beamZ={}"
@@ -322,13 +324,13 @@ namespace corsika::epos {
// reset beam particle // (1: pion-like, 2: proton-like, 3:kaon-like)
if (iBeam == 1)
initializeEventCoM(Code::PiPlus, BeamA, BeamZ, TargetId, TargetA, TargetZ,
- EnergyCOM);
+ EnergyCOM);
else if (iBeam == 2)
initializeEventCoM(Code::Proton, BeamA, BeamZ, TargetId, TargetA, TargetZ,
- EnergyCOM);
+ EnergyCOM);
else if (iBeam == 3)
initializeEventCoM(Code::KPlus, BeamA, BeamZ, TargetId, TargetA, TargetZ,
- EnergyCOM);
+ EnergyCOM);
else
throw std::runtime_error(
"calcCrossSectionCoM: interaction of beam hadron not defined in "
@@ -378,7 +380,7 @@ namespace corsika::epos {
// read cross section from epos internal tables
int Abeam;
float Ekin = -1;
-
+
if (is_nucleus(BeamId)) {
Abeam = BeamA;
// kinetic energy per nucleon
@@ -420,7 +422,7 @@ namespace corsika::epos {
float sigProdEpos = ::epos::eposcrse_(Ekin, Abeam, Atarget, iMode);
float sigElaEpos = ::epos::eposelacrse_(Ekin, Abeam, Atarget, iMode);
- return std::make_tuple(sigProdEpos * 1_mb, sigElaEpos * 1_mb);
+ return std::make_tuple(sigProdEpos * 1_mb, sigElaEpos * 1_mb);
}
inline std::tuple<corsika::CrossSectionType, corsika::CrossSectionType>
@@ -483,7 +485,8 @@ namespace corsika::epos {
// auto const pTotLabNorm = pTotLab.getNorm();
// calculate cm. energy
// const HEPEnergyType ECoM = sqrt(
- // (Elab + pTotLabNorm) * (Elab - pTotLabNorm)); // binomial for numerical accuracy
+ // (Elab + pTotLabNorm) * (Elab - pTotLabNorm)); // binomial for numerical
+ // accuracy
auto const* currentNode = projectile.getNode();
const auto& mediumComposition =
@@ -586,7 +589,7 @@ namespace corsika::epos {
targetZ = get_nucleus_Z(targetCode);
}
initializeEventLab(corsikaBeamId, beamA, beamZ, targetCode, targetA, targetZ,
- projectileMomentumLabPerNucleon);
+ projectileMomentumLabPerNucleon);
// create event
int iarg = 1;
diff --git a/corsika/detail/modules/epos/ParticleConversion.inl b/corsika/detail/modules/epos/ParticleConversion.inl
index d23b800c945be7ab2be175fe2d184fc9daaae6d1..4ca093eed8b45c3f98a2e93b210cefd10f2bd4ca 100644
--- a/corsika/detail/modules/epos/ParticleConversion.inl
+++ b/corsika/detail/modules/epos/ParticleConversion.inl
@@ -21,7 +21,7 @@ namespace corsika::epos {
throw std::runtime_error("getEposMass: unknown particle!");
else {
double mass2;
- ::epos::idmass_(sCode,mass2);
+ ::epos::idmass_(sCode, mass2);
return sqrt(mass2) * 1_GeV;
}
}
diff --git a/corsika/modules/Epos.hpp b/corsika/modules/Epos.hpp
index 5ca547e2a99b516e688bf6f3b7c48523438aba69..c25be9b14b615e797bb821d06d2bc27b7b23353a 100644
--- a/corsika/modules/Epos.hpp
+++ b/corsika/modules/Epos.hpp
@@ -10,4 +10,3 @@
#include <corsika/modules/epos/ParticleConversion.hpp>
#include <corsika/modules/epos/Interaction.hpp>
-//#include <corsika/modules/epos/Decay.hpp>
diff --git a/corsika/modules/Random.hpp b/corsika/modules/Random.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..8882a5ff6494ff7cad00884e70939acecd1b14a8
--- /dev/null
+++ b/corsika/modules/Random.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+/*
+ NOTE, WARNING, ATTENTION
+
+ The .../Random.hpp implement the hooks of external modules to the C8 random
+ number generator. It has to occur excatly ONCE per linked
+ executable. If you include the header below multiple times and
+ link this togehter, it will fail.
+ */
+#include <corsika/modules/sibyll/Random.hpp>
+#include <corsika/modules/epos/Random.hpp>
+#include <corsika/modules/urqmd/Random.hpp>
+#include <corsika/modules/qgsjetII/Random.hpp>
diff --git a/corsika/modules/epos/Interaction.hpp b/corsika/modules/epos/Interaction.hpp
index 05a2200278cb7621bcd5326499bd7dab1da713b9..ec6cbeeaf367c691e2c0e28c8b608a33263441bb 100644
--- a/corsika/modules/epos/Interaction.hpp
+++ b/corsika/modules/epos/Interaction.hpp
@@ -20,7 +20,7 @@ namespace corsika::epos {
std::string data_path_;
unsigned int count_ = 0;
bool epos_listing_;
-
+
public:
Interaction(const std::string& dataPath = "", const bool epos_printout_on = false);
~Interaction();
@@ -71,11 +71,11 @@ namespace corsika::epos {
void initialize() const;
void initializeEventCoM(Code const, int const, int const, Code const, int const,
- int const, HEPEnergyType const) const;
+ int const, HEPEnergyType const) const;
void initializeEventLab(Code const, int const, int const, Code const, int const,
- int const, HEPEnergyType const) const;
+ int const, HEPEnergyType const) const;
void configureParticles(Code const, int const, int const, Code const, int const,
- int const) const;
+ int const) const;
void setParticlesStable() const;
private:
diff --git a/corsika/modules/qgsjetII/Interaction.hpp b/corsika/modules/qgsjetII/Interaction.hpp
index 4f2f1c1db733322a93d3becd6d73ce5790c4f8c1..7af63723f5670fa0de59aea92c98f232b145d8d4 100644
--- a/corsika/modules/qgsjetII/Interaction.hpp
+++ b/corsika/modules/qgsjetII/Interaction.hpp
@@ -18,7 +18,6 @@
#include <boost/filesystem/path.hpp>
#include <qgsjet-II-04.hpp>
-
#include <string>
namespace corsika::qgsjetII {
diff --git a/examples/boundary_example.cpp b/examples/boundary_example.cpp
index 083a54559d1a52ac2a0f27d526b97b9614265e49..6e369e8a2085c66a9e9f3e31da4db3d8dc3eb9ed 100644
--- a/examples/boundary_example.cpp
+++ b/examples/boundary_example.cpp
@@ -32,11 +32,13 @@
/*
NOTE, WARNING, ATTENTION
- The .../Random.hpp implement the hooks of external modules to the C8 random
+ The file Random.hpp implements the hooks of external modules to the C8 random
number generator. It has to occur excatly ONCE per linked
executable. If you include the header below multiple times and
link this togehter, it will fail.
*/
+#include <corsika/modules/Random.hpp>
+
#include <iostream>
#include <limits>
#include <typeinfo>
diff --git a/examples/cascade_example.cpp b/examples/cascade_example.cpp
index da7cdb2d4ab38c9b9b35d9d1b5bebf04750f9239..2b9c38759b82a8a817266a803ca6dea1c47b0381 100644
--- a/examples/cascade_example.cpp
+++ b/examples/cascade_example.cpp
@@ -41,8 +41,7 @@
executable. If you include the header below multiple times and
link this togehter, it will fail.
*/
-#include <corsika/modules/sibyll/Random.hpp>
-#include <corsika/modules/urqmd/Random.hpp>
+#include <corsika/modules/Random.hpp>
#include <iostream>
#include <limits>
diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp
index 81d8101d794ce5b0d0b9bc4a1f09431b284d1997..053a0c13e2529bd1ae1883fa0b52b661413b2c3c 100644
--- a/examples/cascade_proton_example.cpp
+++ b/examples/cascade_proton_example.cpp
@@ -38,13 +38,12 @@
/*
NOTE, WARNING, ATTENTION
- The .../Random.hpppp implement the hooks of external modules to the C8 random
+ The file Random.hpp implements the hooks of external modules to the C8 random
number generator. It has to occur excatly ONCE per linked
executable. If you include the header below multiple times and
link this togehter, it will fail.
*/
-#include <corsika/modules/sibyll/Random.hpp>
-#include <corsika/modules/urqmd/Random.hpp>
+#include <corsika/modules/Random.hpp>
#include <iostream>
#include <limits>
diff --git a/examples/hybrid_MC.cpp b/examples/hybrid_MC.cpp
index 6271166205f3a7b52f8a9db59225c3bcd044dfde..4f43447844e848359e24a73bb3c75e7a0aca445f 100644
--- a/examples/hybrid_MC.cpp
+++ b/examples/hybrid_MC.cpp
@@ -57,13 +57,12 @@
/*
NOTE, WARNING, ATTENTION
- The .../Random.hpppp implement the hooks of external modules to the C8 random
+ The file Random.hpp implements the hooks of external modules to the C8 random
number generator. It has to occur excatly ONCE per linked
executable. If you include the header below multiple times and
link this togehter, it will fail.
*/
-#include <corsika/modules/sibyll/Random.hpp>
-#include <corsika/modules/urqmd/Random.hpp>
+#include <corsika/modules/Random.hpp>
using namespace corsika;
using namespace std;
diff --git a/examples/particle_list_example.cpp b/examples/particle_list_example.cpp
index 8a10d9f094fcc5e4838778e2bc5526347b2bfba0..29e4bdc5f8e3b33a6100621ed5a230588d4b2faa 100644
--- a/examples/particle_list_example.cpp
+++ b/examples/particle_list_example.cpp
@@ -15,13 +15,12 @@
/*
NOTE, WARNING, ATTENTION
- The .../Random.hpp implement the hooks of external modules to the C8 random
+ The file Random.hpp implements the hooks of external modules to the C8 random
number generator. It has to occur excatly ONCE per linked
executable. If you include the header below multiple times and
link this togehter, it will fail.
*/
-#include <corsika/modules/sibyll/Random.hpp>
-#include <corsika/modules/urqmd/Random.hpp>
+#include <corsika/modules/Random.hpp>
#include <iomanip>
#include <string>
diff --git a/examples/vertical_EAS.cpp b/examples/vertical_EAS.cpp
index 90db5adf8b98bf5f7aa3c8ca1a42d5c5f17e3f52..6ae766bb197e2e6610aa503442cea05704652b3b 100644
--- a/examples/vertical_EAS.cpp
+++ b/examples/vertical_EAS.cpp
@@ -50,6 +50,7 @@
#include <corsika/modules/Pythia8.hpp>
#include <corsika/modules/Sibyll.hpp>
#include <corsika/modules/UrQMD.hpp>
+#include <corsika/modules/Epos.hpp>
#include <corsika/setup/SetupStack.hpp>
#include <corsika/setup/SetupTrajectory.hpp>
@@ -67,8 +68,7 @@
executable. If you include the header below multiple times and
link this togehter, it will fail.
*/
-#include <corsika/modules/sibyll/Random.hpp>
-#include <corsika/modules/urqmd/Random.hpp>
+#include <corsika/modules/Random.hpp>
using namespace corsika;
using namespace std;
diff --git a/modules/epos/epos.cpp b/modules/epos/epos.cpp
index bbfe7e20f9805d97c9ad78e39f16823e0f9277b6..b242172060c87808ff56c90e862a62327ad828bc 100644
--- a/modules/epos/epos.cpp
+++ b/modules/epos/epos.cpp
@@ -23,5 +23,4 @@ namespace epos {
data[i + 1] = '\0';
length = dir.length();
}
-}
-
+} // namespace epos
diff --git a/modules/epos/epos.hpp b/modules/epos/epos.hpp
index a5ad0c9ff1c7de12a117d05f25b6a6b89f7eeb6f..7419bf1b2cbd9b5637231b212ee0526c02b464c7 100644
--- a/modules/epos/epos.hpp
+++ b/modules/epos/epos.hpp
@@ -52,12 +52,12 @@ namespace epos {
void conini_();
void psaini_();
- //void idspin_(int&, int&, int&, int&);
- // void iclass_(int&, int&);
+ // void idspin_(int&, int&, int&, int&);
+ // void iclass_(int&, int&);
void emsini_(double&, int&, int&);
void paramini_(int&);
void xsigma_();
-
+
//
// cross section from tables
//
@@ -478,38 +478,37 @@ namespace epos {
float sigelaaa;
float sigcutaa;
float sigdd;
- } hadr5_;
-
- // integer mxnody,nrnody,nody
- // parameter(mxnody=200)
- // common/nodcy/nrnody,nody(mxnody)
- unsigned int constexpr mxnody = 200;
- extern struct {
- int nrnody;
- int nody[mxnody];
- } nodcy_;
-
-
- // integer iclpro,icltar,iclegy
- // common/had10/iclpro,icltar,iclegy
- extern struct {
- int iclpro;
- int icltar;
- int iclegy;
- } had10_;
-
- /**
- Small helper class to provide a data-directory name in the format eposlhc expects
- */
- class datadir {
- private:
- datadir operator=(const std::string& dir);
- datadir operator=(const datadir&);
-
- public:
- datadir(const std::string& dir);
- char data[500];
- int length;
+ } hadr5_;
+
+ // integer mxnody,nrnody,nody
+ // parameter(mxnody=200)
+ // common/nodcy/nrnody,nody(mxnody)
+ unsigned int constexpr mxnody = 200;
+ extern struct {
+ int nrnody;
+ int nody[mxnody];
+ } nodcy_;
+
+ // integer iclpro,icltar,iclegy
+ // common/had10/iclpro,icltar,iclegy
+ extern struct {
+ int iclpro;
+ int icltar;
+ int iclegy;
+ } had10_;
+
+ /**
+ Small helper class to provide a data-directory name in the format eposlhc expects
+ */
+ class datadir {
+ private:
+ datadir operator=(const std::string& dir);
+ datadir operator=(const datadir&);
+
+ public:
+ datadir(const std::string& dir);
+ char data[500];
+ int length;
};
}
} // namespace epos
diff --git a/tests/modules/testEpos.cpp b/tests/modules/testEpos.cpp
index 8e54d72f08193bfd16c20ae8221dc7dd5e8f6bf3..c5ed8743cf267b8acd81a1c789d942d24141a2ff 100644
--- a/tests/modules/testEpos.cpp
+++ b/tests/modules/testEpos.cpp
@@ -44,7 +44,8 @@ TEST_CASE("Epos", "[processes]") {
SECTION("Corsika -> Epos") {
CHECK(corsika::epos::convertToEpos(Electron::code) ==
corsika::epos::EposCode::Electron);
- // check if particle code is correct for common particles that interact (secret epos knowledge)
+ // check if particle code is correct for common particles that interact (secret epos
+ // knowledge)
CHECK(corsika::epos::convertToEposRaw(Proton::code) == 1120);
CHECK(corsika::epos::convertToEposRaw(PiPlus::code) == 120);
CHECK(corsika::epos::convertToEposRaw(KPlus::code) == 130);
@@ -119,8 +120,7 @@ auto sumMomentum(TStackView const& view, CoordinateSystemPtr const& vCS) {
return sum;
}
-auto sqs2elab(HEPEnergyType const sqs, HEPEnergyType const ma,
- HEPEnergyType const mb){
+auto sqs2elab(HEPEnergyType const sqs, HEPEnergyType const ma, HEPEnergyType const mb) {
return (sqs * sqs - ma * ma - mb * mb) / 2. / mb;
}
@@ -135,20 +135,20 @@ TEST_CASE("EposInterface", "[processes]") {
RNGManager::getInstance().registerRandomStream("epos");
- SECTION("InteractionInterface - random number"){
+ SECTION("InteractionInterface - random number") {
auto const rndm = ::epos::rangen_();
- CHECK(rndm>0);
- CHECK(rndm<1);
+ CHECK(rndm > 0);
+ CHECK(rndm < 1);
}
-
+
SECTION("InteractionInterface - valid targets") {
Interaction model;
// eposlhc accepts protons or nuclei with 4<=A<=18 as targets
CHECK_FALSE(model.isValidTarget(Code::Electron));
CHECK(model.isValidTarget(Code::Hydrogen));
- //CHECK_FALSE(model.isValidTarget(Code::Deuterium));
- //CHECK_FALSE(model.isValidTarget(Code::Helium3));
+ // CHECK_FALSE(model.isValidTarget(Code::Deuterium));
+ // CHECK_FALSE(model.isValidTarget(Code::Helium3));
CHECK(model.isValidTarget(Code::Helium));
CHECK_FALSE(model.isValidTarget(Code::Iron));
CHECK(model.isValidTarget(Code::Oxygen));
@@ -163,7 +163,7 @@ TEST_CASE("EposInterface", "[processes]") {
CHECK(xs_prod_pp == xs_prod_pHydrogen);
CHECK(xs_prod_pp == xs_prod_pn);
CHECK(xs_ela_pp == xs_ela_pHydrogen);
- CHECK(xs_ela_pn == xs_ela_pHydrogen);
+ CHECK(xs_ela_pn == xs_ela_pHydrogen);
}
SECTION("InteractionInterface - hadron cross sections") {
@@ -187,7 +187,7 @@ TEST_CASE("EposInterface", "[processes]") {
auto const [xs_prod2, xs_ela2] =
model.getCrossSectionLab(Code::KPlus, 0, 0, Code::Proton, 1, 1,
sqs2elab(7_TeV, KPlus::mass, Proton::mass));
- CHECK(xs_prod2 / 1_mb == Approx(45.7).margin(2.1));
+ CHECK(xs_prod2 / 1_mb == Approx(45.7).margin(2.1));
}
SECTION("InteractionInterface - nuclear cross sections") {
@@ -210,7 +210,7 @@ TEST_CASE("EposInterface", "[processes]") {
Oxygen::nucleus_A, Oxygen::nucleus_Z, 400_GeV);
CHECK(xs_prod2 / xs_prod3 == 1);
}
-
+
SECTION("InteractionInterface - low energy") {
const HEPEnergyType P0 = 60_GeV;
@@ -226,7 +226,7 @@ TEST_CASE("EposInterface", "[processes]") {
model.doInteraction(view);
auto const pSum = sumMomentum(view, cs);
-
+
CHECK(pSum.getComponents(cs).getX() / P0 == Approx(1).margin(0.05));
CHECK(pSum.getComponents(cs).getY() / 1_GeV == Approx(0).margin(1e-4));
CHECK(pSum.getComponents(cs).getZ() / 1_GeV == Approx(0).margin(1e-4));
@@ -234,10 +234,9 @@ TEST_CASE("EposInterface", "[processes]") {
CHECK((pSum - plab).getNorm() / 1_GeV ==
Approx(0).margin(plab.getNorm() * 0.05 / 1_GeV));
CHECK(pSum.getNorm() / P0 == Approx(1).margin(0.05));
-
+
[[maybe_unused]] const GrammageType length = model.getInteractionLength(particle);
CHECK(length / 1_g * 1_cm * 1_cm == Approx(93.3).margin(0.1));
-
}
SECTION("InteractionInterface - nuclear projectile") {
@@ -255,7 +254,7 @@ TEST_CASE("EposInterface", "[processes]") {
model.doInteraction(view);
auto const pSum = sumMomentum(view, cs);
-
+
CHECK(pSum.getComponents(cs).getX() / P0 == Approx(1).margin(0.05));
CHECK(pSum.getComponents(cs).getY() / 1_GeV == Approx(0).margin(1e-4));
CHECK(pSum.getComponents(cs).getZ() / 1_GeV == Approx(0).margin(1e-4));
@@ -263,9 +262,8 @@ TEST_CASE("EposInterface", "[processes]") {
CHECK((pSum - plab).getNorm() / 1_GeV ==
Approx(0).margin(plab.getNorm() * 0.05 / 1_GeV));
CHECK(pSum.getNorm() / P0 == Approx(1).margin(0.05));
-
+
[[maybe_unused]] const GrammageType length = model.getInteractionLength(particle);
CHECK(length / 1_g * 1_cm * 1_cm == Approx(12.8).margin(4.1));
-
}
}