From b4c99bbe5ae76fd5a33d547cdbbac4d14b697f34 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 28 Jan 2021 19:55:08 +0100
Subject: [PATCH] proposal names
---
examples/em_shower.cpp | 17 ++++++++---------
examples/vertical_EAS.cpp | 16 ++++++++--------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/examples/em_shower.cpp b/examples/em_shower.cpp
index 2afddc84e..e4d8b3cc4 100644
--- a/examples/em_shower.cpp
+++ b/examples/em_shower.cpp
@@ -141,11 +141,10 @@ int main(int argc, char** argv) {
// setup processes, decays and interactions
- // PROPOSAL processs proposal{...};
ParticleCut cut(10_GeV, 10_GeV, 100_PeV, 100_PeV, true);
- corsika::proposal::Interaction proposal(env);
- corsika::proposal::ContinuousProcess em_continuous(env);
- InteractionCounter proposalCounted(proposal);
+ corsika::proposal::Interaction emCascade(env);
+ corsika::proposal::ContinuousProcess emContinuous(env);
+ InteractionCounter emCascadeCounted(emCascade);
TrackWriter trackWriter("tracks.dat");
@@ -156,7 +155,7 @@ int main(int argc, char** argv) {
ObservationPlane observationLevel(obsPlane, DirectionVector(rootCS, {1., 0., 0.}),
"particles.dat");
- auto sequence = make_sequence(proposalCounted, em_continuous, longprof, cut,
+ auto sequence = make_sequence(emCascadeCounted, emContinuous, longprof, cut,
observationLevel, trackWriter);
// define air shower object, run simulation
setup::Tracking tracking;
@@ -169,18 +168,18 @@ int main(int argc, char** argv) {
EAS.run();
cut.showResults();
- em_continuous.showResults();
+ emContinuous.showResults();
observationLevel.showResults();
const HEPEnergyType Efinal = cut.getCutEnergy() + cut.getInvEnergy() +
- cut.getEmEnergy() + em_continuous.getEnergyLost() +
+ cut.getEmEnergy() + emContinuous.getEnergyLost() +
observationLevel.getEnergyGround();
cout << "total cut energy (GeV): " << Efinal / 1_GeV << endl
<< "relative difference (%): " << (Efinal / E0 - 1) * 100 << endl;
observationLevel.reset();
cut.reset();
- em_continuous.reset();
+ emContinuous.reset();
- auto const hists = proposalCounted.getHistogram();
+ auto const hists = emCascadeCounted.getHistogram();
save_hist(hists.labHist(), "inthist_lab_emShower.npz", true);
save_hist(hists.CMSHist(), "inthist_cms_emShower.npz", true);
longprof.save("longprof_emShower.txt");
diff --git a/examples/vertical_EAS.cpp b/examples/vertical_EAS.cpp
index a661ca3ed..04ddbb222 100644
--- a/examples/vertical_EAS.cpp
+++ b/examples/vertical_EAS.cpp
@@ -46,7 +46,7 @@
#include <corsika/modules/Pythia8.hpp>
#include <corsika/modules/Sibyll.hpp>
#include <corsika/modules/UrQMD.hpp>
-//#include <corsika/modules/PROPOSAL.hpp>
+#include <corsika/modules/PROPOSAL.hpp>
#include <corsika/setup/SetupStack.hpp>
#include <corsika/setup/SetupTrajectory.hpp>
@@ -222,9 +222,9 @@ int main(int argc, char** argv) {
decaySibyll.printDecayConfig();
ParticleCut cut{60_GeV, 60_GeV, 60_GeV, 60_GeV, true};
- corsika::proposal::Interaction proposal(env);
- corsika::proposal::ContinuousProcess em_continuous(env);
- InteractionCounter proposalCounted(proposal);
+ corsika::proposal::Interaction emCascade(env);
+ corsika::proposal::ContinuousProcess emContinuous(env);
+ InteractionCounter emCascadeCounted(emCascade);
OnShellCheck reset_particle_mass(1.e-3, 1.e-1, false);
TrackWriter trackWriter("tracks.dat");
@@ -256,7 +256,7 @@ int main(int argc, char** argv) {
auto decaySequence = make_sequence(decayPythia, decaySibyll);
auto sequence =
make_sequence(stackInspect, hadronSequence, reset_particle_mass, decaySequence,
- em_continuous, cut, trackWriter, observationLevel, longprof);
+ emContinuous, cut, trackWriter, observationLevel, longprof);
// define air shower object, run simulation
setup::Tracking tracking;
@@ -268,16 +268,16 @@ int main(int argc, char** argv) {
EAS.run();
cut.showResults();
- em_continuous.showResults();
+ emContinuous.showResults();
observationLevel.showResults();
const HEPEnergyType Efinal = cut.getCutEnergy() + cut.getInvEnergy() +
- cut.getEmEnergy() + em_continuous.getEnergyLost() +
+ cut.getEmEnergy() + emContinuous.getEnergyLost() +
observationLevel.getEnergyGround();
cout << "total cut energy (GeV): " << Efinal / 1_GeV << endl
<< "relative difference (%): " << (Efinal / E0 - 1) * 100 << endl;
observationLevel.reset();
cut.reset();
- em_continuous.reset();
+ emContinuous.reset();
auto const hists = sibyllCounted.getHistogram() + sibyllNucCounted.getHistogram() +
urqmdCounted.getHistogram();
--
GitLab