From 5a5ea658a68bfd4b093a2f31d2cdfc06ba2b201a Mon Sep 17 00:00:00 2001
From: Felix Riehn <friehn@lip.pt>
Date: Tue, 7 May 2019 14:13:50 +0200
Subject: [PATCH] Resolve "please modify namespace
corsika::process::TrackWriter::TrackWriter to a different name."
---
Documentation/Examples/boundary_example.cc | 2 +-
Documentation/Examples/cascade_example.cc | 4 ++--
Documentation/Examples/cascade_proton_example.cc | 2 +-
Documentation/Examples/vertical_EAS.cc | 4 ++--
Processes/EnergyLoss/EnergyLoss.cc | 4 ++--
Processes/EnergyLoss/EnergyLoss.h | 4 ++--
Processes/TrackWriter/TrackWriter.cc | 4 ++--
Processes/TrackWriter/TrackWriter.h | 8 ++++----
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Documentation/Examples/boundary_example.cc b/Documentation/Examples/boundary_example.cc
index b1d540eeb..037c8b352 100644
--- a/Documentation/Examples/boundary_example.cc
+++ b/Documentation/Examples/boundary_example.cc
@@ -278,7 +278,7 @@ int main() {
particles::Code::K0Long, particles::Code::K0Short}};
ProcessCut cut(20_GeV);
- process::TrackWriter::TrackWriter trackWriter("tracks.dat");
+ process::track_writer::TrackWriter trackWriter("tracks.dat");
MyBoundaryCrossingProcess<true> boundaryCrossing("crossings.dat");
// assemble all processes into an ordered process list
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index 03feb8f6e..cb06341c8 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -263,8 +263,8 @@ int main() {
process::sibyll::Decay decay(trackedHadrons);
ProcessCut cut(20_GeV);
- process::TrackWriter::TrackWriter trackWriter("tracks.dat");
- process::EnergyLoss::EnergyLoss eLoss;
+ process::track_writer::TrackWriter trackWriter("tracks.dat");
+ process::energy_loss::EnergyLoss eLoss;
// assemble all processes into an ordered process list
auto sequence = stackInspect << sibyll << sibyllNuc << decay << eLoss << cut
diff --git a/Documentation/Examples/cascade_proton_example.cc b/Documentation/Examples/cascade_proton_example.cc
index 743f8f007..e5b4b3456 100644
--- a/Documentation/Examples/cascade_proton_example.cc
+++ b/Documentation/Examples/cascade_proton_example.cc
@@ -257,7 +257,7 @@ int main() {
// process::HadronicElasticModel::HadronicElasticInteraction
// hadronicElastic(env);
- process::TrackWriter::TrackWriter trackWriter("tracks.dat");
+ process::track_writer::TrackWriter trackWriter("tracks.dat");
// assemble all processes into an ordered process list
// auto sequence = sibyll << decay << hadronicElastic << cut << trackWriter;
diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index e2d381914..526498b24 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -261,8 +261,8 @@ int main() {
// process::HadronicElasticModel::HadronicElasticInteraction
// hadronicElastic(env);
- process::TrackWriter::TrackWriter trackWriter("tracks.dat");
- process::EnergyLoss::EnergyLoss eLoss;
+ process::track_writer::TrackWriter trackWriter("tracks.dat");
+ process::energy_loss::EnergyLoss eLoss;
// assemble all processes into an ordered process list
// cut << trackWriter;
diff --git a/Processes/EnergyLoss/EnergyLoss.cc b/Processes/EnergyLoss/EnergyLoss.cc
index dde5cf442..990d61725 100644
--- a/Processes/EnergyLoss/EnergyLoss.cc
+++ b/Processes/EnergyLoss/EnergyLoss.cc
@@ -28,7 +28,7 @@ using namespace corsika::setup;
using Particle = Stack::ParticleType;
using Track = Trajectory;
-namespace corsika::process::EnergyLoss {
+namespace corsika::process::energy_loss {
auto elab2plab = [](HEPEnergyType Elab, HEPMassType m) {
return sqrt((Elab - m) * (Elab + m));
@@ -219,4 +219,4 @@ namespace corsika::process::EnergyLoss {
}
}
-} // namespace corsika::process::EnergyLoss
+} // namespace corsika::process::energy_loss
diff --git a/Processes/EnergyLoss/EnergyLoss.h b/Processes/EnergyLoss/EnergyLoss.h
index 323ef8573..deaff4faf 100644
--- a/Processes/EnergyLoss/EnergyLoss.h
+++ b/Processes/EnergyLoss/EnergyLoss.h
@@ -20,7 +20,7 @@
#include <map>
-namespace corsika::process::EnergyLoss {
+namespace corsika::process::energy_loss {
class EnergyLoss : public corsika::process::ContinuousProcess<EnergyLoss> {
@@ -55,6 +55,6 @@ namespace corsika::process::EnergyLoss {
std::map<int, double> fProfile; // longitudinal profile
};
-} // namespace corsika::process::EnergyLoss
+} // namespace corsika::process::energy_loss
#endif
diff --git a/Processes/TrackWriter/TrackWriter.cc b/Processes/TrackWriter/TrackWriter.cc
index 5ea8588d9..e422bce8a 100644
--- a/Processes/TrackWriter/TrackWriter.cc
+++ b/Processes/TrackWriter/TrackWriter.cc
@@ -22,7 +22,7 @@ using namespace corsika::setup;
using Particle = Stack::ParticleType;
using Track = Trajectory;
-namespace corsika::process::TrackWriter {
+namespace corsika::process::track_writer {
void TrackWriter::Init() {
using namespace std::string_literals;
@@ -51,4 +51,4 @@ namespace corsika::process::TrackWriter {
return units::si::meter * std::numeric_limits<double>::infinity();
}
-} // namespace corsika::process::TrackWriter
+} // namespace corsika::process::track_writer
diff --git a/Processes/TrackWriter/TrackWriter.h b/Processes/TrackWriter/TrackWriter.h
index 51fd5a157..de9bf31b7 100644
--- a/Processes/TrackWriter/TrackWriter.h
+++ b/Processes/TrackWriter/TrackWriter.h
@@ -9,8 +9,8 @@
* the license.
*/
-#ifndef _Processes_TrackWriter_h_
-#define _Processes_TrackWriter_h_
+#ifndef _Processes_track_writer_TrackWriter_h_
+#define _Processes_track_writer_TrackWriter_h_
#include <corsika/process/ContinuousProcess.h>
#include <corsika/units/PhysicalUnits.h>
@@ -18,7 +18,7 @@
#include <fstream>
#include <string>
-namespace corsika::process::TrackWriter {
+namespace corsika::process::track_writer {
class TrackWriter : public corsika::process::ContinuousProcess<TrackWriter> {
@@ -39,6 +39,6 @@ namespace corsika::process::TrackWriter {
std::ofstream fFile;
};
-} // namespace corsika::process::TrackWriter
+} // namespace corsika::process::track_writer
#endif
--
GitLab