From 813a49b9a2fcdad912d07576efde629e412fda55 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 18 Dec 2018 22:34:01 +0100
Subject: [PATCH] a bit more printout
---
Documentation/Examples/cascade_example.cc | 20 +++++++++----------
Framework/Units/PhysicalUnits.h | 1 -
.../SuperStupidStack/testSuperStupidStack.cc | 4 ++--
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index e26258a7..4fe3368a 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -45,19 +45,16 @@ using namespace corsika::environment;
using namespace std;
using namespace corsika::units::hep;
-static EnergyType fEnergy = 0. * 1_GeV;
-
-// FOR NOW: global static variables for ParticleCut process
-// this is just wrong...
-static EnergyType fEmEnergy;
-static int fEmCount;
-
-static EnergyType fInvEnergy;
-static int fInvCount;
-
class ProcessCut : public corsika::process::ContinuousProcess<ProcessCut> {
+
EnergyType fECut;
+ mutable EnergyType fEnergy = 0_GeV;
+ mutable EnergyType fEmEnergy = 0_GeV;
+ mutable int fEmCount = 0;
+ mutable EnergyType fInvEnergy = 0_GeV;
+ mutable int fInvCount = 0;
+
public:
ProcessCut(const EnergyType v)
: fECut(v) {}
@@ -139,7 +136,8 @@ public:
EProcessReturn DoContinuous(Particle& p, setup::Trajectory&, Stack&) const {
const Code pid = p.GetPID();
EnergyType energy = p.GetEnergy();
- cout << "ProcessCut: DoContinuous: " << pid << " E= " << energy << endl;
+ cout << "ProcessCut: DoContinuous: " << pid << " E= " << energy
+ << ", EcutTot=" << (fEmEnergy + fInvEnergy + fEnergy) / 1_GeV << " GeV" << endl;
EProcessReturn ret = EProcessReturn::eOk;
if (isEmParticle(pid)) {
cout << "removing em. particle..." << endl;
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index 1ad2d642..fe4e284a 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -12,7 +12,6 @@
on. This breaks ADL (argument-dependent lookup). Here we "fix" this:
*/
namespace phys::units {
- // using namespace phys::units::io;
using phys::units::io::operator<<;
} // namespace phys::units
diff --git a/Stack/SuperStupidStack/testSuperStupidStack.cc b/Stack/SuperStupidStack/testSuperStupidStack.cc
index 6047fc85..dbb585a2 100644
--- a/Stack/SuperStupidStack/testSuperStupidStack.cc
+++ b/Stack/SuperStupidStack/testSuperStupidStack.cc
@@ -46,8 +46,8 @@ TEST_CASE("SuperStupidStack", "[stack]") {
REQUIRE(pout.GetPID() == particles::Code::Electron);
REQUIRE(pout.GetEnergy() == 1.5_GeV);
// REQUIRE(pout.GetMomentum() == stack::super_stupid::MomentumVector(dummyCS, {1_GeV,
- // 1_GeV, 1_GeV})); REQUIRE(pout.GetPosition() == Point(dummyCS, {1 * meter, 1 * meter,
- // 1 * meter}));
+ // 1_GeV, 1_GeV})); REQUIRE(pout.GetPosition() == Point(dummyCS, {1 * meter, 1 *
+ // meter, 1 * meter}));
REQUIRE(pout.GetTime() == 100_s);
}
--
GitLab