From bef205068e4e786c84ebd6b6b15121bec36a24b5 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Mon, 10 Dec 2018 09:45:11 +0100
Subject: [PATCH] clang-format
---
Documentation/Examples/geometry_example.cc | 6 +-
Documentation/Examples/stack_example.cc | 6 +-
.../Examples/staticsequence_example.cc | 42 ++++-----
Framework/Cascade/Cascade.h | 5 +-
Framework/Cascade/testCascade.cc | 2 +-
Framework/Geometry/Point.h | 8 +-
Framework/ProcessSequence/BaseProcess.h | 2 +-
Framework/ProcessSequence/ContinuousProcess.h | 4 +-
Framework/ProcessSequence/DiscreteProcess.h | 1 -
Framework/ProcessSequence/ProcessSequence.h | 13 ++-
.../ProcessSequence/testProcessSequence.cc | 87 +++++++++++--------
Processes/StackInspector/StackInspector.cc | 3 +-
Setup/SetupTrajectory.h | 8 +-
13 files changed, 100 insertions(+), 87 deletions(-)
diff --git a/Documentation/Examples/geometry_example.cc b/Documentation/Examples/geometry_example.cc
index abba9d9fc..67f43344c 100644
--- a/Documentation/Examples/geometry_example.cc
+++ b/Documentation/Examples/geometry_example.cc
@@ -50,12 +50,12 @@ int main() {
std::cout << "p2-p1 components in cs3: " << diff.GetComponents(cs3)
<< std::endl; // but not under rotations
std::cout << "p2-p1 norm^2: " << norm << std::endl;
- assert(norm == 1 * meter*meter);
-
+ assert(norm == 1 * meter * meter);
+
Sphere s(p1, 10_m); // define a sphere around a point with a radius
std::cout << "p1 inside s: " << s.Contains(p2) << std::endl;
assert(s.Contains(p2) == 1);
-
+
Sphere s2(p1, 3_um); // another sphere
std::cout << "p1 inside s2: " << s2.Contains(p2) << std::endl;
assert(s2.Contains(p2) == 0);
diff --git a/Documentation/Examples/stack_example.cc b/Documentation/Examples/stack_example.cc
index 4e2aae20b..fbe4cd9da 100644
--- a/Documentation/Examples/stack_example.cc
+++ b/Documentation/Examples/stack_example.cc
@@ -11,9 +11,9 @@
#include <corsika/particles/ParticleProperties.h>
#include <corsika/stack/super_stupid/SuperStupidStack.h>
+#include <cassert>
#include <iomanip>
#include <iostream>
-#include <cassert>
using namespace corsika::units::si;
using namespace corsika::stack;
@@ -28,7 +28,7 @@ void fill(corsika::stack::super_stupid::SuperStupidStack& s) {
}
void read(corsika::stack::super_stupid::SuperStupidStack& s) {
- assert(s.GetSize() == 11); // stack has 11 particles
+ assert(s.GetSize() == 11); // stack has 11 particles
EnergyType total_energy;
int i = 0;
@@ -38,7 +38,7 @@ void read(corsika::stack::super_stupid::SuperStupidStack& s) {
assert(p.GetPID() == corsika::particles::Code::Electron);
assert(p.GetEnergy() == 1.5_GeV * (i++));
}
- //assert(total_energy == 82.5_GeV);
+ // assert(total_energy == 82.5_GeV);
}
int main() {
diff --git a/Documentation/Examples/staticsequence_example.cc b/Documentation/Examples/staticsequence_example.cc
index e118961bc..522c17114 100644
--- a/Documentation/Examples/staticsequence_example.cc
+++ b/Documentation/Examples/staticsequence_example.cc
@@ -15,8 +15,8 @@
#include <corsika/process/ProcessSequence.h>
-#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/geometry/Point.h>
+#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/geometry/Vector.h>
using namespace corsika;
@@ -30,7 +30,7 @@ class Process1 : public BaseProcess<Process1> {
public:
Process1() {}
template <typename D, typename T, typename S>
- EProcessReturn DoContinuous(D& d, T& , S& ) const {
+ EProcessReturn DoContinuous(D& d, T&, S&) const {
for (int i = 0; i < nData; ++i) d.p[i] += 1;
return EProcessReturn::eOk;
}
@@ -41,8 +41,8 @@ public:
Process2() {}
template <typename D, typename T, typename S>
- inline EProcessReturn DoContinuous(D& d, T& , S& ) const {
- for (int i=0; i<nData; ++i) d.p[i] -= 0.1*i;
+ inline EProcessReturn DoContinuous(D& d, T&, S&) const {
+ for (int i = 0; i < nData; ++i) d.p[i] -= 0.1 * i;
return EProcessReturn::eOk;
}
};
@@ -52,32 +52,34 @@ public:
Process3() {}
template <typename D, typename T, typename S>
- inline EProcessReturn DoContinuous(D&, T& , S& ) const {
+ inline EProcessReturn DoContinuous(D&, T&, S&) const {
return EProcessReturn::eOk;
}
};
class Process4 : public BaseProcess<Process4> {
public:
- Process4(const double v) : fV(v) {}
+ Process4(const double v)
+ : fV(v) {}
template <typename D, typename T, typename S>
- inline EProcessReturn DoContinuous(D& d, T& , S& ) const {
- for (int i=0; i<nData; ++i) d.p[i] *= fV;
+ inline EProcessReturn DoContinuous(D& d, T&, S&) const {
+ for (int i = 0; i < nData; ++i) d.p[i] *= fV;
return EProcessReturn::eOk;
}
+
private:
double fV;
};
struct DummyData {
- double p[nData] = {0,0,0,0,0,0,0,0,0,0};
+ double p[nData] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+};
+struct DummyStack {
+ void clear() {}
};
-struct DummyStack {void clear() {} };
struct DummyTrajectory {};
-void
-modular()
-{
+void modular() {
Process1 m1;
Process2 m2;
@@ -85,19 +87,19 @@ modular()
Process4 m4(0.9);
const auto sequence = m1 + m2 + m3 + m4;
-
+
DummyData p;
DummyStack s;
DummyTrajectory t;
-
+
const int n = 1000;
for (int i = 0; i < n; ++i) { sequence.DoContinuous(p, t, s); }
-
- for(int i=0; i<nData; ++i) {
- //cout << p.p[i] << endl;
- //assert(p.p[i] == n-i*100);
+
+ for (int i = 0; i < nData; ++i) {
+ // cout << p.p[i] << endl;
+ // assert(p.p[i] == n-i*100);
}
-
+
cout << " done (nothing...) " << endl;
}
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index 148092081..592372f5d 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -34,8 +34,7 @@ namespace corsika::cascade {
Cascade(Tracking& tr, ProcessList& pl, Stack& stack)
: fTracking(tr)
, fProcesseList(pl)
- , fStack(stack) {
- }
+ , fStack(stack) {}
void Init() {
fTracking.Init();
@@ -62,7 +61,7 @@ namespace corsika::cascade {
/// here the particle is actually moved along the trajectory to new position:
// std::visit(corsika::setup::ParticleUpdate<Particle>{particle}, step);
particle.SetPosition(step.GetPosition(1));
-
+
corsika::process::EProcessReturn status =
fProcesseList.DoContinuous(particle, step, fStack);
if (status == corsika::process::EProcessReturn::eParticleAbsorbed) {
diff --git a/Framework/Cascade/testCascade.cc b/Framework/Cascade/testCascade.cc
index 7f6800395..a218cb788 100644
--- a/Framework/Cascade/testCascade.cc
+++ b/Framework/Cascade/testCascade.cc
@@ -17,8 +17,8 @@
#include <corsika/stack/super_stupid/SuperStupidStack.h>
-#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/geometry/Point.h>
+#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/geometry/Vector.h>
#include <corsika/setup/SetupStack.h>
diff --git a/Framework/Geometry/Point.h b/Framework/Geometry/Point.h
index 7f735d58a..74c4b6f8d 100644
--- a/Framework/Geometry/Point.h
+++ b/Framework/Geometry/Point.h
@@ -44,8 +44,7 @@ namespace corsika::geometry {
return BaseVector<length_d>::qVector;
} else {
return QuantityVector<length_d>(
- CoordinateSystem::GetTransformation(*BaseVector<length_d>::cs,
- pCS) *
+ CoordinateSystem::GetTransformation(*BaseVector<length_d>::cs, pCS) *
BaseVector<length_d>::qVector.eVector);
}
}
@@ -60,9 +59,8 @@ namespace corsika::geometry {
}
Point operator+(Vector<length_d> const& pVec) const {
- return Point(
- *BaseVector<length_d>::cs,
- GetCoordinates() + pVec.GetComponents(*BaseVector<length_d>::cs));
+ return Point(*BaseVector<length_d>::cs,
+ GetCoordinates() + pVec.GetComponents(*BaseVector<length_d>::cs));
}
/*!
diff --git a/Framework/ProcessSequence/BaseProcess.h b/Framework/ProcessSequence/BaseProcess.h
index 020607c20..34dcb198e 100644
--- a/Framework/ProcessSequence/BaseProcess.h
+++ b/Framework/ProcessSequence/BaseProcess.h
@@ -34,7 +34,7 @@ namespace corsika::process {
inline EProcessReturn DoDiscrete(Particle&, Stack&) const; // {}
template <typename Particle, typename Track, typename Stack>
- inline EProcessReturn DoContinuous(Particle&, Track&, Stack&) const; // {}
+ inline EProcessReturn DoContinuous(Particle&, Track&, Stack&) const; // {}
};
/*
diff --git a/Framework/ProcessSequence/ContinuousProcess.h b/Framework/ProcessSequence/ContinuousProcess.h
index 98a4dde0c..a9bc21e5d 100644
--- a/Framework/ProcessSequence/ContinuousProcess.h
+++ b/Framework/ProcessSequence/ContinuousProcess.h
@@ -34,11 +34,9 @@ namespace corsika::process {
// here starts the interface part
// -> enforce derived to implement DoContinuous...
template <typename D, typename T, typename S>
- inline EProcessReturn DoContinuous(D&, T&, S&) const;
-
+ inline EProcessReturn DoContinuous(D&, T&, S&) const;
};
-
} // namespace corsika::process
#endif
diff --git a/Framework/ProcessSequence/DiscreteProcess.h b/Framework/ProcessSequence/DiscreteProcess.h
index 1c7b50c0c..a540c92c7 100644
--- a/Framework/ProcessSequence/DiscreteProcess.h
+++ b/Framework/ProcessSequence/DiscreteProcess.h
@@ -37,7 +37,6 @@ namespace corsika::process {
// -> enforce derived to implement DoDiscrete...
template <typename Particle, typename Stack>
inline EProcessReturn DoDiscrete(Particle&, Stack&) const; // {}
-
};
} // namespace corsika::process
diff --git a/Framework/ProcessSequence/ProcessSequence.h b/Framework/ProcessSequence/ProcessSequence.h
index 4a1e45f26..54ac90e7a 100644
--- a/Framework/ProcessSequence/ProcessSequence.h
+++ b/Framework/ProcessSequence/ProcessSequence.h
@@ -18,12 +18,11 @@
#include <corsika/process/ProcessReturn.h>
//#include <corsika/setup/SetupTrajectory.h>
-//using corsika::setup::Trajectory;
+// using corsika::setup::Trajectory;
//#include <variant>
//#include <type_traits> // still needed ?
-
namespace corsika::process {
/* namespace detail { */
@@ -152,18 +151,18 @@ namespace corsika::process {
inline EProcessReturn DoContinuous(Particle& p, Track& t, Stack& s) const {
EProcessReturn ret = EProcessReturn::eOk;
if constexpr (!std::is_base_of<DiscreteProcess<T1>, T1>::value) {
- //A.DoContinuous(std::forward<Particle>(p), t, std::forward<Stack>(s));
- A.DoContinuous(p, t, s);
+ // A.DoContinuous(std::forward<Particle>(p), t, std::forward<Stack>(s));
+ A.DoContinuous(p, t, s);
}
if constexpr (!std::is_base_of<DiscreteProcess<T2>, T2>::value) {
- //B.DoContinuous(std::forward<Particle>(p), t, std::forward<Stack>(s));
- B.DoContinuous(p, t, s);
+ // B.DoContinuous(std::forward<Particle>(p), t, std::forward<Stack>(s));
+ B.DoContinuous(p, t, s);
}
return ret;
}
template <typename Particle, typename Track>
- inline void MinStepLength(Particle& p, Track& track) const {
+ inline void MinStepLength(Particle& p, Track& track) const {
A.MinStepLength(p, track);
B.MinStepLength(p, track);
}
diff --git a/Framework/ProcessSequence/testProcessSequence.cc b/Framework/ProcessSequence/testProcessSequence.cc
index 305023eaf..7094cacb9 100644
--- a/Framework/ProcessSequence/testProcessSequence.cc
+++ b/Framework/ProcessSequence/testProcessSequence.cc
@@ -30,11 +30,13 @@ int globalCount = 0;
class ContinuousProcess1 : public ContinuousProcess<ContinuousProcess1> {
int fV = 0;
+
public:
- ContinuousProcess1(const int v) : fV(v) {}
+ ContinuousProcess1(const int v)
+ : fV(v) {}
void Init() {
cout << "ContinuousProcess1::Init" << endl;
- assert (globalCount == fV);
+ assert(globalCount == fV);
globalCount++;
}
template <typename D, typename T, typename S>
@@ -47,12 +49,15 @@ public:
class ContinuousProcess2 : public ContinuousProcess<ContinuousProcess2> {
int fV = 0;
+
public:
- ContinuousProcess2(const int v) : fV(v) {}
- void Init() { cout << "ContinuousProcess2::Init" << endl;
- assert (globalCount == fV);
+ ContinuousProcess2(const int v)
+ : fV(v) {}
+ void Init() {
+ cout << "ContinuousProcess2::Init" << endl;
+ assert(globalCount == fV);
globalCount++;
-}
+ }
template <typename D, typename T, typename S>
inline EProcessReturn DoContinuous(D& d, T&, S&) const {
cout << "ContinuousProcess2::DoContinuous" << endl;
@@ -63,9 +68,11 @@ public:
class Process1 : public DiscreteProcess<Process1> {
public:
- Process1(const int v) : fV(v) {}
- void Init() { cout << "Process1::Init" << endl;
- assert (globalCount == fV);
+ Process1(const int v)
+ : fV(v) {}
+ void Init() {
+ cout << "Process1::Init" << endl;
+ assert(globalCount == fV);
globalCount++;
}
template <typename D, typename S>
@@ -73,18 +80,21 @@ public:
for (int i = 0; i < nData; ++i) d.p[i] += 1 + i;
return EProcessReturn::eOk;
}
- //private:
+ // private:
int fV;
};
class Process2 : public DiscreteProcess<Process2> {
int fV = 0;
+
public:
- Process2(const int v) : fV(v) {}
- void Init() { cout << "Process2::Init" << endl;
- assert (globalCount == fV);
+ Process2(const int v)
+ : fV(v) {}
+ void Init() {
+ cout << "Process2::Init" << endl;
+ assert(globalCount == fV);
globalCount++;
-}
+ }
template <typename Particle, typename Stack>
inline EProcessReturn DoDiscrete(Particle&, Stack&) const {
cout << "Process2::DoDiscrete" << endl;
@@ -94,12 +104,15 @@ public:
class Process3 : public DiscreteProcess<Process3> {
int fV = 0;
+
public:
- Process3(const int v) : fV(v) {}
- void Init() { cout << "Process3::Init" << endl;
- assert (globalCount == fV);
+ Process3(const int v)
+ : fV(v) {}
+ void Init() {
+ cout << "Process3::Init" << endl;
+ assert(globalCount == fV);
globalCount++;
-}
+ }
template <typename Particle, typename Stack>
inline EProcessReturn DoDiscrete(Particle&, Stack&) const {
cout << "Process3::DoDiscrete" << endl;
@@ -109,20 +122,25 @@ public:
class Process4 : public BaseProcess<Process4> {
int fV = 0;
+
public:
- Process4(const int v) : fV(v) {}
- void Init() { cout << "Process4::Init" << endl;
- assert (globalCount == fV);
+ Process4(const int v)
+ : fV(v) {}
+ void Init() {
+ cout << "Process4::Init" << endl;
+ assert(globalCount == fV);
globalCount++;
-}
+ }
template <typename D, typename T, typename S>
inline EProcessReturn DoContinuous(D& d, T&, S&) const {
- for (int i = 0; i < nData; ++i) {d.p[i] /= 1.2;}
+ for (int i = 0; i < nData; ++i) { d.p[i] /= 1.2; }
return EProcessReturn::eOk;
}
// inline double MinStepLength(D& d) {
- template<typename Particle, typename Stack>
- EProcessReturn DoDiscrete(Particle&, Stack&) const { return EProcessReturn::eOk; }
+ template <typename Particle, typename Stack>
+ EProcessReturn DoDiscrete(Particle&, Stack&) const {
+ return EProcessReturn::eOk;
+ }
};
struct DummyData {
@@ -143,15 +161,14 @@ TEST_CASE("Process Sequence", "[Process Sequence]") {
globalCount = 0;
sequence.Init();
- //REQUIRE_NOTHROW( (sequence.Init()) );
+ // REQUIRE_NOTHROW( (sequence.Init()) );
- //const auto sequence_wrong = m3 + m2 + m1 + m4;
- //globalCount = 0;
- //sequence_wrong.Init();
- //REQUIRE_THROWS(sequence_wrong.Init());
+ // const auto sequence_wrong = m3 + m2 + m1 + m4;
+ // globalCount = 0;
+ // sequence_wrong.Init();
+ // REQUIRE_THROWS(sequence_wrong.Init());
}
-
SECTION("sectionTwo") {
ContinuousProcess1 cp1(0);
@@ -164,7 +181,7 @@ TEST_CASE("Process Sequence", "[Process Sequence]") {
DummyData p;
DummyStack s;
DummyTrajectory t;
-
+
cout << "-->init sequence2" << endl;
globalCount = 0;
sequence2.Init();
@@ -177,9 +194,11 @@ TEST_CASE("Process Sequence", "[Process Sequence]") {
const int nLoop = 5;
cout << "Running loop with n=" << nLoop << endl;
- for (int i = 0; i < nLoop; ++i) { sequence2.DoContinuous(p, t, s); sequence2.DoDiscrete(p, s); }
+ for (int i = 0; i < nLoop; ++i) {
+ sequence2.DoContinuous(p, t, s);
+ sequence2.DoDiscrete(p, s);
+ }
for (int i = 0; i < nData; i++) { cout << "data[" << i << "]=" << p.p[i] << endl; }
cout << "done" << endl;
}
-
}
diff --git a/Processes/StackInspector/StackInspector.cc b/Processes/StackInspector/StackInspector.cc
index 8a4514e59..b0acefc4a 100644
--- a/Processes/StackInspector/StackInspector.cc
+++ b/Processes/StackInspector/StackInspector.cc
@@ -32,8 +32,7 @@ template <typename Stack>
StackInspector<Stack>::~StackInspector() {}
template <typename Stack>
-process::EProcessReturn StackInspector<Stack>::DoContinuous(Particle&,
- setup::Trajectory&,
+process::EProcessReturn StackInspector<Stack>::DoContinuous(Particle&, setup::Trajectory&,
Stack& s) const {
static int countStep = 0;
if (!fReport) return EProcessReturn::eOk;
diff --git a/Setup/SetupTrajectory.h b/Setup/SetupTrajectory.h
index fa6301719..acbbc373a 100644
--- a/Setup/SetupTrajectory.h
+++ b/Setup/SetupTrajectory.h
@@ -21,17 +21,17 @@
#include <variant>
namespace corsika::setup {
-
+
using corsika::geometry::Helix;
using corsika::geometry::Line;
-
+
/// definition of Trajectory base class, to be used in tracking and cascades
typedef corsika::geometry::Trajectory<Line> Trajectory;
-
+
/*
typedef std::variant<std::monostate, corsika::geometry::Trajectory<Line>,
corsika::geometry::Trajectory<Helix>>
- Trajectory;
+ Trajectory;
/// helper visitor to modify Particle by moving along Trajectory
template <typename Particle>
--
GitLab