IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 1ce672a3 authored by Ralf Ulrich's avatar Ralf Ulrich
Browse files

Merge branch...

Merge branch '121-please-modify-namespace-corsika-process-trackwriter-trackwriter-to-a-different-name' into 'master'

Resolve "please modify namespace corsika::process::TrackWriter::TrackWriter to a different name."

Closes #121

See merge request !114
parents 8a1c6daa 5a5ea658
No related branches found
No related tags found
1 merge request!114Resolve "please modify namespace corsika::process::TrackWriter::TrackWriter to a different name."
Pipeline #575 passed
...@@ -278,7 +278,7 @@ int main() { ...@@ -278,7 +278,7 @@ int main() {
particles::Code::K0Long, particles::Code::K0Short}}; particles::Code::K0Long, particles::Code::K0Short}};
ProcessCut cut(20_GeV); ProcessCut cut(20_GeV);
process::TrackWriter::TrackWriter trackWriter("tracks.dat"); process::track_writer::TrackWriter trackWriter("tracks.dat");
MyBoundaryCrossingProcess<true> boundaryCrossing("crossings.dat"); MyBoundaryCrossingProcess<true> boundaryCrossing("crossings.dat");
// assemble all processes into an ordered process list // assemble all processes into an ordered process list
......
...@@ -263,8 +263,8 @@ int main() { ...@@ -263,8 +263,8 @@ int main() {
process::sibyll::Decay decay(trackedHadrons); process::sibyll::Decay decay(trackedHadrons);
ProcessCut cut(20_GeV); ProcessCut cut(20_GeV);
process::TrackWriter::TrackWriter trackWriter("tracks.dat"); process::track_writer::TrackWriter trackWriter("tracks.dat");
process::EnergyLoss::EnergyLoss eLoss; process::energy_loss::EnergyLoss eLoss;
// assemble all processes into an ordered process list // assemble all processes into an ordered process list
auto sequence = stackInspect << sibyll << sibyllNuc << decay << eLoss << cut auto sequence = stackInspect << sibyll << sibyllNuc << decay << eLoss << cut
......
...@@ -257,7 +257,7 @@ int main() { ...@@ -257,7 +257,7 @@ int main() {
// process::HadronicElasticModel::HadronicElasticInteraction // process::HadronicElasticModel::HadronicElasticInteraction
// hadronicElastic(env); // hadronicElastic(env);
process::TrackWriter::TrackWriter trackWriter("tracks.dat"); process::track_writer::TrackWriter trackWriter("tracks.dat");
// assemble all processes into an ordered process list // assemble all processes into an ordered process list
// auto sequence = sibyll << decay << hadronicElastic << cut << trackWriter; // auto sequence = sibyll << decay << hadronicElastic << cut << trackWriter;
......
...@@ -261,8 +261,8 @@ int main() { ...@@ -261,8 +261,8 @@ int main() {
// process::HadronicElasticModel::HadronicElasticInteraction // process::HadronicElasticModel::HadronicElasticInteraction
// hadronicElastic(env); // hadronicElastic(env);
process::TrackWriter::TrackWriter trackWriter("tracks.dat"); process::track_writer::TrackWriter trackWriter("tracks.dat");
process::EnergyLoss::EnergyLoss eLoss; process::energy_loss::EnergyLoss eLoss;
// assemble all processes into an ordered process list // assemble all processes into an ordered process list
// cut << trackWriter; // cut << trackWriter;
......
...@@ -28,7 +28,7 @@ using namespace corsika::setup; ...@@ -28,7 +28,7 @@ using namespace corsika::setup;
using Particle = Stack::ParticleType; using Particle = Stack::ParticleType;
using Track = Trajectory; using Track = Trajectory;
namespace corsika::process::EnergyLoss { namespace corsika::process::energy_loss {
auto elab2plab = [](HEPEnergyType Elab, HEPMassType m) { auto elab2plab = [](HEPEnergyType Elab, HEPMassType m) {
return sqrt((Elab - m) * (Elab + m)); return sqrt((Elab - m) * (Elab + m));
...@@ -219,4 +219,4 @@ namespace corsika::process::EnergyLoss { ...@@ -219,4 +219,4 @@ namespace corsika::process::EnergyLoss {
} }
} }
} // namespace corsika::process::EnergyLoss } // namespace corsika::process::energy_loss
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <map> #include <map>
namespace corsika::process::EnergyLoss { namespace corsika::process::energy_loss {
class EnergyLoss : public corsika::process::ContinuousProcess<EnergyLoss> { class EnergyLoss : public corsika::process::ContinuousProcess<EnergyLoss> {
...@@ -55,6 +55,6 @@ namespace corsika::process::EnergyLoss { ...@@ -55,6 +55,6 @@ namespace corsika::process::EnergyLoss {
std::map<int, double> fProfile; // longitudinal profile std::map<int, double> fProfile; // longitudinal profile
}; };
} // namespace corsika::process::EnergyLoss } // namespace corsika::process::energy_loss
#endif #endif
...@@ -22,7 +22,7 @@ using namespace corsika::setup; ...@@ -22,7 +22,7 @@ using namespace corsika::setup;
using Particle = Stack::ParticleType; using Particle = Stack::ParticleType;
using Track = Trajectory; using Track = Trajectory;
namespace corsika::process::TrackWriter { namespace corsika::process::track_writer {
void TrackWriter::Init() { void TrackWriter::Init() {
using namespace std::string_literals; using namespace std::string_literals;
...@@ -51,4 +51,4 @@ namespace corsika::process::TrackWriter { ...@@ -51,4 +51,4 @@ namespace corsika::process::TrackWriter {
return units::si::meter * std::numeric_limits<double>::infinity(); return units::si::meter * std::numeric_limits<double>::infinity();
} }
} // namespace corsika::process::TrackWriter } // namespace corsika::process::track_writer
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* the license. * the license.
*/ */
#ifndef _Processes_TrackWriter_h_ #ifndef _Processes_track_writer_TrackWriter_h_
#define _Processes_TrackWriter_h_ #define _Processes_track_writer_TrackWriter_h_
#include <corsika/process/ContinuousProcess.h> #include <corsika/process/ContinuousProcess.h>
#include <corsika/units/PhysicalUnits.h> #include <corsika/units/PhysicalUnits.h>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
namespace corsika::process::TrackWriter { namespace corsika::process::track_writer {
class TrackWriter : public corsika::process::ContinuousProcess<TrackWriter> { class TrackWriter : public corsika::process::ContinuousProcess<TrackWriter> {
...@@ -39,6 +39,6 @@ namespace corsika::process::TrackWriter { ...@@ -39,6 +39,6 @@ namespace corsika::process::TrackWriter {
std::ofstream fFile; std::ofstream fFile;
}; };
} // namespace corsika::process::TrackWriter } // namespace corsika::process::track_writer
#endif #endif
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