IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 1c27d388 authored by ralfulrich's avatar ralfulrich
Browse files

do-clang-format

parent 11a8fcc7
No related branches found
No related tags found
No related merge requests found
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include <corsika/geometry/LineTrajectory.h> // to be removed #include <corsika/geometry/LineTrajectory.h> // to be removed
#include <corsika/geometry/Point.h> // to be removed #include <corsika/geometry/Point.h> // to be removed
#include <corsika/units/PhysicalUnits.h>
#include <corsika/process/ProcessReturn.h> #include <corsika/process/ProcessReturn.h>
#include <corsika/units/PhysicalUnits.h>
using namespace corsika::units::si; using namespace corsika::units::si;
...@@ -28,19 +28,19 @@ namespace corsika::cascade { ...@@ -28,19 +28,19 @@ namespace corsika::cascade {
void Run() { void Run() {
while (!fStack.IsEmpty()) { while (!fStack.IsEmpty()) {
while (!fStack.IsEmpty()) { while (!fStack.IsEmpty()) {
//Particle& p = *fStack.GetNextParticle(); // Particle& p = *fStack.GetNextParticle();
EnergyType Emin; EnergyType Emin;
typename Stack::StackIterator pMin(fStack, 0); typename Stack::StackIterator pMin(fStack, 0);
bool first = true; bool first = true;
for (typename Stack::StackIterator ip = fStack.begin(); ip!=fStack.end(); ++ip) for (typename Stack::StackIterator ip = fStack.begin(); ip != fStack.end();
{ ++ip) {
if (first || ip.GetEnergy()<Emin) { if (first || ip.GetEnergy() < Emin) {
first = false; first = false;
pMin = ip; pMin = ip;
Emin = pMin.GetEnergy(); Emin = pMin.GetEnergy();
} }
} }
Step(pMin); Step(pMin);
} }
// do cascade equations, which can put new particles on Stack, // do cascade equations, which can put new particles on Stack,
...@@ -48,7 +48,7 @@ namespace corsika::cascade { ...@@ -48,7 +48,7 @@ namespace corsika::cascade {
// DoCascadeEquations(); // // DoCascadeEquations(); //
} }
} }
void Step(Particle& particle) { void Step(Particle& particle) {
double nextStep = fProcesseList.MinStepLength(particle); double nextStep = fProcesseList.MinStepLength(particle);
corsika::geometry::CoordinateSystem root; corsika::geometry::CoordinateSystem root;
...@@ -56,11 +56,12 @@ namespace corsika::cascade { ...@@ -56,11 +56,12 @@ namespace corsika::cascade {
corsika::geometry::Point(root, {0_m, 0_m, 0_m}), corsika::geometry::Point(root, {0_m, 0_m, 0_m}),
corsika::geometry::Vector<corsika::units::si::SpeedType::dimension_type>( corsika::geometry::Vector<corsika::units::si::SpeedType::dimension_type>(
root, 0 * 1_m / second, 0 * 1_m / second, 1 * 1_m / second)); root, 0 * 1_m / second, 0 * 1_m / second, 1 * 1_m / second));
corsika::process::EProcessReturn status = fProcesseList.DoContinuous(particle, trajectory, fStack); corsika::process::EProcessReturn status =
if (status==corsika::process::EProcessReturn::eParticleAbsorbed) { fProcesseList.DoContinuous(particle, trajectory, fStack);
fStack.Delete(particle); if (status == corsika::process::EProcessReturn::eParticleAbsorbed) {
fStack.Delete(particle);
} else { } else {
fProcesseList.DoDiscrete(particle, fStack); fProcesseList.DoDiscrete(particle, fStack);
} }
} }
......
...@@ -25,8 +25,9 @@ public: ...@@ -25,8 +25,9 @@ public:
} }
template <typename Particle, typename Trajectory, typename Stack> template <typename Particle, typename Trajectory, typename Stack>
EProcessReturn DoContinuous(Particle& p, Trajectory& t, Stack& s) const { return EProcessReturn::eOk; EProcessReturn DoContinuous(Particle& p, Trajectory& t, Stack& s) const {
} return EProcessReturn::eOk;
}
template <typename Particle, typename Stack> template <typename Particle, typename Stack>
void DoDiscrete(Particle& p, Stack& s) const { void DoDiscrete(Particle& p, Stack& s) const {
...@@ -37,7 +38,7 @@ public: ...@@ -37,7 +38,7 @@ public:
} else { } else {
p.SetEnergy(E / 2); p.SetEnergy(E / 2);
s.NewParticle().SetEnergy(E / 2); s.NewParticle().SetEnergy(E / 2);
} }
} }
void Init() { fCount = 0; } void Init() { fCount = 0; }
...@@ -63,7 +64,7 @@ public: ...@@ -63,7 +64,7 @@ public:
EProcessReturn DoContinuous(Particle& p, Trajectory& t, Stack& s) const { EProcessReturn DoContinuous(Particle& p, Trajectory& t, Stack& s) const {
static int countStep = 0; static int countStep = 0;
if (!fReport) return EProcessReturn::eOk; if (!fReport) return EProcessReturn::eOk;
//std::cout << "generation " << countStep << std::endl; // std::cout << "generation " << countStep << std::endl;
int i = 0; int i = 0;
EnergyType Etot = 0_GeV; EnergyType Etot = 0_GeV;
for (auto& iterP : s) { for (auto& iterP : s) {
...@@ -75,8 +76,9 @@ public: ...@@ -75,8 +76,9 @@ public:
*/ */
} }
countStep++; countStep++;
//cout << "#=" << countStep << " " << s.GetSize() << " " << Etot/1_GeV << endl; // cout << "#=" << countStep << " " << s.GetSize() << " " << Etot/1_GeV << endl;
cout << countStep << " " << s.GetSize() << " " << Etot/1_GeV << " " << fCount << endl; cout << countStep << " " << s.GetSize() << " " << Etot / 1_GeV << " " << fCount
<< endl;
return EProcessReturn::eOk; return EProcessReturn::eOk;
} }
...@@ -91,7 +93,7 @@ TEST_CASE("Cascade", "[Cascade]") { ...@@ -91,7 +93,7 @@ TEST_CASE("Cascade", "[Cascade]") {
ProcessSplit p1; ProcessSplit p1;
const auto sequence = p0 + p1; const auto sequence = p0 + p1;
corsika::stack::super_stupid::SuperStupidStack stack; corsika::stack::super_stupid::SuperStupidStack stack;
corsika::cascade::Cascade<corsika::geometry::LineTrajectory, decltype(sequence), corsika::cascade::Cascade<corsika::geometry::LineTrajectory, decltype(sequence),
decltype(stack)> decltype(stack)>
EAS(sequence, stack); EAS(sequence, stack);
...@@ -111,8 +113,8 @@ TEST_CASE("Cascade", "[Cascade]") { ...@@ -111,8 +113,8 @@ TEST_CASE("Cascade", "[Cascade]") {
particle.SetEnergy(E0); particle.SetEnergy(E0);
EAS.Init(); EAS.Init();
EAS.Run(); EAS.Run();
//cout << "Result: E0=" << E0 / 1_GeV << "GeV, count=" << p1.GetCount() << endl; // cout << "Result: E0=" << E0 / 1_GeV << "GeV, count=" << p1.GetCount() << endl;
} }
} }
} }
...@@ -19,7 +19,9 @@ namespace corsika::geometry { ...@@ -19,7 +19,9 @@ namespace corsika::geometry {
: r0(pR0) : r0(pR0)
, v0(pV0) {} , v0(pV0) {}
Point GetPosition(corsika::units::si::TimeType t) const override { return r0 + v0 * t; } Point GetPosition(corsika::units::si::TimeType t) const override {
return r0 + v0 * t;
}
}; };
} // namespace corsika::geometry } // namespace corsika::geometry
......
...@@ -15,11 +15,11 @@ namespace corsika::geometry { ...@@ -15,11 +15,11 @@ namespace corsika::geometry {
* with a phys::units::si::dimension. Arithmethic operators are defined that * with a phys::units::si::dimension. Arithmethic operators are defined that
* propagate the dimensions by dimensional analysis. * propagate the dimensions by dimensional analysis.
*/ */
template <typename dim> template <typename dim>
class QuantityVector { class QuantityVector {
protected: protected:
// todo: check if we need to move "quantity" into namespace corsika::units // todo: check if we need to move "quantity" into namespace corsika::units
using Quantity = phys::units::quantity<dim, double>; //< the phys::units::quantity using Quantity = phys::units::quantity<dim, double>; //< the phys::units::quantity
// corresponding to the dimension // corresponding to the dimension
...@@ -106,7 +106,7 @@ namespace corsika::geometry { ...@@ -106,7 +106,7 @@ namespace corsika::geometry {
auto operator==(QuantityVector<dim> const& p) const { return eVector == p.eVector; } auto operator==(QuantityVector<dim> const& p) const { return eVector == p.eVector; }
}; };
} // end namespace corsika } // namespace corsika::geometry
template <typename dim> template <typename dim>
auto& operator<<(std::ostream& os, corsika::geometry::QuantityVector<dim> qv) { auto& operator<<(std::ostream& os, corsika::geometry::QuantityVector<dim> qv) {
......
...@@ -11,7 +11,7 @@ namespace corsika::geometry { ...@@ -11,7 +11,7 @@ namespace corsika::geometry {
BaseTrajectory const& fTrajectory; BaseTrajectory const& fTrajectory;
public: public:
Trajectory(corsika::units::si::TimeType pTStart, corsika::units::si::TimeType pTEnd, Trajectory(corsika::units::si::TimeType pTStart, corsika::units::si::TimeType pTEnd,
BaseTrajectory const& pTrajectory) BaseTrajectory const& pTrajectory)
: fTStart(pTStart) : fTStart(pTStart)
, fTEnd(pTEnd) , fTEnd(pTEnd)
......
...@@ -16,7 +16,6 @@ using namespace corsika::units::si; ...@@ -16,7 +16,6 @@ using namespace corsika::units::si;
double constexpr absMargin = 1.0e-8; double constexpr absMargin = 1.0e-8;
TEST_CASE("transformations between CoordinateSystems") { TEST_CASE("transformations between CoordinateSystems") {
CoordinateSystem rootCS; CoordinateSystem rootCS;
...@@ -26,8 +25,7 @@ TEST_CASE("transformations between CoordinateSystems") { ...@@ -26,8 +25,7 @@ TEST_CASE("transformations between CoordinateSystems") {
QuantityVector<length_d> const coordinates{0_m, 0_m, 0_m}; QuantityVector<length_d> const coordinates{0_m, 0_m, 0_m};
Point p1(rootCS, coordinates); Point p1(rootCS, coordinates);
QuantityVector<magnetic_flux_density_d> components{1. * tesla, 0. * tesla, QuantityVector<magnetic_flux_density_d> components{1. * tesla, 0. * tesla, 0. * tesla};
0. * tesla};
Vector<magnetic_flux_density_d> v1(rootCS, components); Vector<magnetic_flux_density_d> v1(rootCS, components);
REQUIRE((p1.GetCoordinates() - coordinates).norm().magnitude() == REQUIRE((p1.GetCoordinates() - coordinates).norm().magnitude() ==
......
...@@ -38,10 +38,9 @@ TEST_CASE("ParticleProperties", "[Particles]") { ...@@ -38,10 +38,9 @@ TEST_CASE("ParticleProperties", "[Particles]") {
SECTION("PDG") { SECTION("PDG") {
REQUIRE(GetPDG(Code::PiPlus) == 211); REQUIRE(GetPDG(Code::PiPlus) == 211);
REQUIRE(GetPDG(Code::DPlus) == 411); REQUIRE(GetPDG(Code::DPlus) == 411);
REQUIRE(GetPDG(Code::NuMu) == 14); REQUIRE(GetPDG(Code::NuMu) == 14);
REQUIRE(GetPDG(Code::NuE) == 12); REQUIRE(GetPDG(Code::NuE) == 12);
REQUIRE(GetPDG(Code::MuMinus) == 13); REQUIRE(GetPDG(Code::MuMinus) == 13);
} }
} }
...@@ -6,13 +6,13 @@ namespace corsika::process { ...@@ -6,13 +6,13 @@ namespace corsika::process {
/** /**
since in a process sequence many status updates can accumulate since in a process sequence many status updates can accumulate
for a single particle, this enum should define only bit-flags for a single particle, this enum should define only bit-flags
that can be accumulated easily with "|=" that can be accumulated easily with "|="
*/ */
enum class EProcessReturn { enum class EProcessReturn {
eOk = 1, eOk = 1,
eParticleAbsorbed = 2, eParticleAbsorbed = 2,
}; };
} } // namespace corsika::process
#endif #endif
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <iostream> #include <iostream>
#include <typeinfo> #include <typeinfo>
namespace corsika::process { namespace corsika::process {
/** /**
\class BaseProcess \class BaseProcess
...@@ -48,8 +48,8 @@ namespace corsika::process { ...@@ -48,8 +48,8 @@ namespace corsika::process {
template <typename Particle, typename Trajectory, typename Stack> template <typename Particle, typename Trajectory, typename Stack>
inline EProcessReturn DoContinuous(Particle& p, Trajectory& t, Stack& s) const { inline EProcessReturn DoContinuous(Particle& p, Trajectory& t, Stack& s) const {
EProcessReturn ret = EProcessReturn::eOk; EProcessReturn ret = EProcessReturn::eOk;
/*ret |=*/ A.DoContinuous(p, t, s); /*ret |=*/A.DoContinuous(p, t, s);
/*ret |=*/ B.DoContinuous(p, t, s); /*ret |=*/B.DoContinuous(p, t, s);
return ret; return ret;
} // add trajectory } // add trajectory
...@@ -60,8 +60,10 @@ namespace corsika::process { ...@@ -60,8 +60,10 @@ namespace corsika::process {
template <typename Particle, typename Trajectory> template <typename Particle, typename Trajectory>
inline Trajectory Transport(Particle& p, double& length) const { inline Trajectory Transport(Particle& p, double& length) const {
A.Transport(p, length); // todo: maybe check (?) if there is more than one Transport process implemented?? A.Transport(p, length); // todo: maybe check (?) if there is more than one Transport
return B.Transport(p, length); // need to do this also to decide which Trajectory to return!!!! // process implemented??
return B.Transport(
p, length); // need to do this also to decide which Trajectory to return!!!!
} }
template <typename Particle, typename Stack> template <typename Particle, typename Stack>
......
...@@ -27,7 +27,7 @@ public: ...@@ -27,7 +27,7 @@ public:
Process2() {} Process2() {}
void Init() {} // cout << "Process2::Init" << endl; } void Init() {} // cout << "Process2::Init" << endl; }
template <typename D, typename T, typename S> template <typename D, typename T, typename S>
inline EProcessReturn DoContinuous(D& d, T& t, S& s) const { inline EProcessReturn DoContinuous(D& d, T& t, S& s) const {
for (int i = 0; i < 10; ++i) d.p[i] *= 0.7; for (int i = 0; i < 10; ++i) d.p[i] *= 0.7;
return EProcessReturn::eOk; return EProcessReturn::eOk;
} }
...@@ -38,7 +38,7 @@ public: ...@@ -38,7 +38,7 @@ public:
Process3() {} Process3() {}
void Init() {} // cout << "Process3::Init" << endl; } void Init() {} // cout << "Process3::Init" << endl; }
template <typename D, typename T, typename S> template <typename D, typename T, typename S>
inline EProcessReturn DoContinuous(D& d, T& t, S& s) const { inline EProcessReturn DoContinuous(D& d, T& t, S& s) const {
for (int i = 0; i < 10; ++i) d.p[i] += 0.933; for (int i = 0; i < 10; ++i) d.p[i] += 0.933;
return EProcessReturn::eOk; return EProcessReturn::eOk;
} }
...@@ -49,10 +49,10 @@ public: ...@@ -49,10 +49,10 @@ public:
Process4() {} Process4() {}
void Init() {} // cout << "Process4::Init" << endl; } void Init() {} // cout << "Process4::Init" << endl; }
template <typename D, typename T, typename S> template <typename D, typename T, typename S>
inline EProcessReturn DoContinuous(D& d, T& t, S& s) const { inline EProcessReturn DoContinuous(D& d, T& t, S& s) const {
for (int i = 0; i < 10; ++i) d.p[i] /= 1.2; for (int i = 0; i < 10; ++i) d.p[i] /= 1.2;
return EProcessReturn::eOk; return EProcessReturn::eOk;
} }
// inline double MinStepLength(D& d) { // inline double MinStepLength(D& d) {
// void DoDiscrete(Particle& p, Stack& s) const { // void DoDiscrete(Particle& p, Stack& s) const {
}; };
......
...@@ -63,7 +63,7 @@ namespace corsika::stack { ...@@ -63,7 +63,7 @@ namespace corsika::stack {
StackIteratorInterface(const StackIteratorInterface& mit) StackIteratorInterface(const StackIteratorInterface& mit)
: fData(mit.fData) : fData(mit.fData)
, fIndex(mit.fIndex) {} , fIndex(mit.fIndex) {}
public: public:
StackIteratorInterface& operator=(const StackIteratorInterface& mit) { StackIteratorInterface& operator=(const StackIteratorInterface& mit) {
fData = mit.fData; fData = mit.fData;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment