From e0fc31c4d8a38aa055e8760e7f2f42e27e51cf1a Mon Sep 17 00:00:00 2001
From: rulrich <ralf.m.ulrich@kit.edu>
Date: Fri, 24 Jul 2020 13:38:45 +0200
Subject: [PATCH] corsika-data
---
Data | 2 +-
Documentation/Examples/cascade_example.cc | 11 ++++++-----
Documentation/Examples/proposal_example.cc | 14 +++++---------
Processes/ParticleCut/ParticleCut.cc | 16 +++++++++-------
Processes/ParticleCut/ParticleCut.h | 8 ++++----
Processes/ParticleCut/testParticleCut.cc | 2 +-
Processes/Proposal/ContinuousProcess.h | 1 -
Processes/Proposal/Interaction.cc | 1 -
do-clang-format.py | 7 ++++++-
9 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/Data b/Data
index 47e6e5abb..968325e6a 160000
--- a/Data
+++ b/Data
@@ -1 +1 @@
-Subproject commit 47e6e5abb78b8151c9748af44e09efcbee810fac
+Subproject commit 968325e6a734e3967c1aff15138f72b6b13edf0b
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index b77dcea92..c988b4f5d 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -137,21 +137,22 @@ int main() {
random::RNGManager::GetInstance().RegisterRandomStream("sibyll");
random::RNGManager::GetInstance().RegisterRandomStream("pythia");
- //random::RNGManager::GetInstance().RegisterRandomStream("proposal");
+ // random::RNGManager::GetInstance().RegisterRandomStream("proposal");
process::sibyll::Interaction sibyll;
process::sibyll::NuclearInteraction sibyllNuc(sibyll, env);
process::sibyll::Decay decay;
// cascade with only HE model ==> HE cut
process::particle_cut::ParticleCut cut(80_GeV, true, true);
- //process::proposal::Interaction proposal(env, cut);
+ // process::proposal::Interaction proposal(env, cut);
process::track_writer::TrackWriter trackWriter("tracks.dat");
process::energy_loss::EnergyLoss eLoss{showerAxis};
// assemble all processes into an ordered process list
- auto sequence = stackInspect << sibyll << sibyllNuc /* << proposal*/ << decay
- /* << eLoss */
- << cut << trackWriter;
+ auto sequence = stackInspect << sibyll << sibyllNuc /* << proposal*/
+ << decay
+ /* << eLoss */
+ << cut << trackWriter;
// define air shower object, run simulation
cascade::Cascade EAS(env, tracking, sequence, stack);
diff --git a/Documentation/Examples/proposal_example.cc b/Documentation/Examples/proposal_example.cc
index d0699c45e..0494ce8a5 100644
--- a/Documentation/Examples/proposal_example.cc
+++ b/Documentation/Examples/proposal_example.cc
@@ -19,15 +19,15 @@
#include <corsika/process/longitudinal_profile/LongitudinalProfile.h>
#include <corsika/process/observation_plane/ObservationPlane.h>
#include <corsika/process/particle_cut/ParticleCut.h>
+#include <corsika/process/proposal/ContinuousProcess.h>
+#include <corsika/process/proposal/Interaction.h>
+#include <corsika/process/track_writer/TrackWriter.h>
#include <corsika/process/tracking_line/TrackingLine.h>
#include <corsika/random/RNGManager.h>
#include <corsika/setup/SetupStack.h>
#include <corsika/setup/SetupTrajectory.h>
#include <corsika/units/PhysicalUnits.h>
#include <corsika/utl/CorsikaFenv.h>
-#include <corsika/process/track_writer/TrackWriter.h>
-#include <corsika/process/proposal/Interaction.h>
-#include <corsika/process/proposal/ContinuousProcess.h>
#include <iomanip>
#include <iostream>
@@ -147,12 +147,8 @@ int main(int argc, char** argv) {
process::observation_plane::ObservationPlane observationLevel(obsPlane,
"particles.dat");
- auto sequence = proposalCounted
- << cut
- << em_continuous
- << longprof
- << observationLevel
- << trackWriter;
+ auto sequence = proposalCounted << cut << em_continuous << longprof << observationLevel
+ << trackWriter;
// define air shower object, run simulation
tracking_line::TrackingLine tracking;
cascade::Cascade EAS(env, tracking, sequence, stack);
diff --git a/Processes/ParticleCut/ParticleCut.cc b/Processes/ParticleCut/ParticleCut.cc
index d7af1c81c..1b0995765 100644
--- a/Processes/ParticleCut/ParticleCut.cc
+++ b/Processes/ParticleCut/ParticleCut.cc
@@ -64,12 +64,12 @@ namespace corsika::process {
cout << "ProcessCut: DoSecondaries: " << pid << " E= " << energy
<< ", EcutTot=" << (emEnergy_ + invEnergy_ + energy_) / 1_GeV << " GeV"
<< endl;
- if (cutEm_ && ParticleIsEmParticle(pid)) {
- cout << "removing em. particle..." << endl;
- emEnergy_ += energy;
- emCount_ += 1;
- p.Delete();
- } else if (cutInv_ && ParticleIsInvisible(pid)) {
+ if (cutEm_ && ParticleIsEmParticle(pid)) {
+ cout << "removing em. particle..." << endl;
+ emEnergy_ += energy;
+ emCount_ += 1;
+ p.Delete();
+ } else if (cutInv_ && ParticleIsInvisible(pid)) {
cout << "removing inv. particle..." << endl;
invEnergy_ += energy;
invCount_ += 1;
@@ -90,7 +90,9 @@ namespace corsika::process {
}
ParticleCut::ParticleCut(const units::si::HEPEnergyType eCut, bool em, bool inv)
- : eCut_(eCut), cutEm_(em), cutInv_(inv) {
+ : eCut_(eCut)
+ , cutEm_(em)
+ , cutInv_(inv) {
emEnergy_ = 0_GeV;
emCount_ = 0;
diff --git a/Processes/ParticleCut/ParticleCut.h b/Processes/ParticleCut/ParticleCut.h
index 74796f9e2..68639471a 100644
--- a/Processes/ParticleCut/ParticleCut.h
+++ b/Processes/ParticleCut/ParticleCut.h
@@ -16,17 +16,17 @@
namespace corsika::process {
namespace particle_cut {
class ParticleCut : public process::SecondariesProcess<ParticleCut> {
-
+
units::si::HEPEnergyType const eCut_;
bool cutEm_;
bool cutInv_;
-
+
units::si::HEPEnergyType energy_ = 0 * units::si::electronvolt;
units::si::HEPEnergyType emEnergy_ = 0 * units::si::electronvolt;
unsigned int emCount_ = 0;
units::si::HEPEnergyType invEnergy_ = 0 * units::si::electronvolt;
- unsigned int invCount_ = 0;
-
+ unsigned int invCount_ = 0;
+
public:
ParticleCut(const units::si::HEPEnergyType eCut, bool em, bool inv);
diff --git a/Processes/ParticleCut/testParticleCut.cc b/Processes/ParticleCut/testParticleCut.cc
index 7b3ce99ea..e7647a55d 100644
--- a/Processes/ParticleCut/testParticleCut.cc
+++ b/Processes/ParticleCut/testParticleCut.cc
@@ -102,7 +102,7 @@ TEST_CASE("ParticleCut", "[processes]") {
CHECK(view.GetSize() == 9);
}
-
+
SECTION("cut low energy") {
ParticleCut cut(20_GeV, true, true);
diff --git a/Processes/Proposal/ContinuousProcess.h b/Processes/Proposal/ContinuousProcess.h
index c5f6fb701..cbb5a337c 100644
--- a/Processes/Proposal/ContinuousProcess.h
+++ b/Processes/Proposal/ContinuousProcess.h
@@ -113,4 +113,3 @@ namespace corsika::process::proposal {
corsika::units::si::LengthType MaxStepLength(Particle const&, Track const&);
};
} // namespace corsika::process::proposal
-
diff --git a/Processes/Proposal/Interaction.cc b/Processes/Proposal/Interaction.cc
index b1f25c96e..8e8b08c2b 100644
--- a/Processes/Proposal/Interaction.cc
+++ b/Processes/Proposal/Interaction.cc
@@ -6,7 +6,6 @@
* the license.
*/
-
#include <corsika/environment/IMediumModel.h>
#include <corsika/environment/NuclearComposition.h>
#include <corsika/process/proposal/Interaction.h>
diff --git a/do-clang-format.py b/do-clang-format.py
index a23d76e22..3b760eadb 100755
--- a/do-clang-format.py
+++ b/do-clang-format.py
@@ -20,7 +20,12 @@ args = parser.parse_args()
filelist = []
if args.all:
for dirpath, dirnames, filenames in os.walk("."):
- if "ThirdParty" in dirpath:
+ doExclude = False
+ for exclude in ["ThirdParty", "PROPOSAL", "include", "build"]:
+ if exclude in dirpath:
+ doExclude = True
+ break
+ if doExclude:
continue
for f in filenames:
if f.endswith(".h") or f.endswith(".cc"):
--
GitLab