From 3971ea8926a52e4dcf9ceb8f9558b2fe136bba9a Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu>
Date: Tue, 28 May 2019 20:42:44 -0300
Subject: [PATCH] removed merging remnant
---
Documentation/Examples/vertical_EAS.cc | 28 --------------------------
1 file changed, 28 deletions(-)
diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index d3ddf37d4..cb3d30cba 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -12,13 +12,8 @@
#include <corsika/process/ProcessSequence.h>
#include <corsika/process/StackProcess.h>
#include <corsika/process/energy_loss/EnergyLoss.h>
-<<<<<<< HEAD
#include <corsika/process/particle_cut/ParticleCut.h>
#include <corsika/process/switch_process/SwitchProcess.h>
-=======
-#include <corsika/process/hadronic_elastic_model/HadronicElasticModel.h>
-#include <corsika/process/stack_inspector/StackInspector.h>
->>>>>>> master
#include <corsika/process/tracking_line/TrackingLine.h>
#include <corsika/setup/SetupStack.h>
@@ -35,14 +30,11 @@
#include <corsika/process/sibyll/Interaction.h>
#include <corsika/process/sibyll/NuclearInteraction.h>
-<<<<<<< HEAD
#include <corsika/process/pythia/Decay.h>
#include <corsika/process/urqmd/UrQMD.h>
#include <corsika/process/particle_cut/ParticleCut.h>
-=======
->>>>>>> master
#include <corsika/process/track_writer/TrackWriter.h>
#include <corsika/process/particle_cut/ParticleCut.h>
@@ -239,26 +231,6 @@ int main() {
beamCode, E0, plab, pos, 0_ns});
}
- // setup processes, decays and interactions
- tracking_line::TrackingLine tracking;
- stack_inspector::StackInspector<setup::Stack> stackInspect(1, true, E0);
-
- const std::vector<particles::Code> trackedHadrons = {
- particles::Code::PiPlus, particles::Code::PiMinus, particles::Code::KPlus,
- particles::Code::KMinus, particles::Code::K0Long, particles::Code::K0Short};
-
- random::RNGManager::GetInstance().RegisterRandomStream("s_rndm");
- process::sibyll::Interaction sibyll;
- process::sibyll::NuclearInteraction sibyllNuc(sibyll, env);
- process::sibyll::Decay decay(trackedHadrons);
- process::particle_cut::ParticleCut cut(20_GeV);
-
- process::track_writer::TrackWriter trackWriter("tracks.dat");
- process::energy_loss::EnergyLoss eLoss;
-
- // assemble all processes into an ordered process list
- auto sequence = sibyll << sibyllNuc << decay << eLoss << cut << stackInspect;
-
// define air shower object, run simulation
cascade::Cascade EAS(env, tracking, sequence, stack);
EAS.Init();
--
GitLab