IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 1ab99a5f authored by ralfulrich's avatar ralfulrich
Browse files

a few fixes

parent 87226195
No related branches found
No related tags found
No related merge requests found
......@@ -125,7 +125,7 @@ public:
}
template <typename Particle, typename Stack>
EProcessReturn DoContinuous(Particle& p, setup::Trajectory& t, Stack& s) const {
EProcessReturn DoContinuous(Particle&, setup::Trajectory&, Stack&) const {
// cout << "ProcessCut: DoContinous: " << p.GetPID() << endl;
// cout << " is em: " << isEmParticle( p.GetPID() ) << endl;
// cout << " is inv: " << isInvisible( p.GetPID() ) << endl;
......@@ -148,7 +148,7 @@ public:
}
template <typename Particle, typename Stack>
void DoDiscrete(Particle& p, Stack& s) const {
void DoDiscrete(Particle& p, Stack&) const {
cout << "ProcessCut: DoDiscrete: " << p.GetPID() << endl;
const Code pid = p.GetPID();
if (isEmParticle(pid)) {
......@@ -499,7 +499,7 @@ int main() {
ProcessSplit p1;
corsika::process::sibyll::ProcessDecay p2;
ProcessEMCut p3;
const auto sequence = p0 + p1 + p2 + p3;
const auto sequence = /*p0 +*/ p1 + p2 + p3;
setup::Stack stack;
corsika::cascade::Cascade EAS(tracking, sequence, stack);
......@@ -513,6 +513,9 @@ int main() {
particle.SetEnergy(E0);
particle.SetMomentum(plab);
particle.SetPID(Code::Proton);
particle.SetTime(0_ns);
Point p(rootCS, 0_m, 0_m, 0_m);
particle.SetPosition(p);
EAS.Init();
EAS.Run();
cout << "Result: E0=" << E0 / 1_GeV
......
......@@ -95,6 +95,7 @@ namespace corsika::process {
const double gamma = E / m;
TimeType t0 = GetLifetime(p.GetPID());
cout << "ProcessDecay: code: " << (p.GetPID()) << endl;
cout << "ProcessDecay: MinStep: t0: " << t0 << endl;
cout << "ProcessDecay: MinStep: gamma: " << gamma << endl;
cout << "ProcessDecay: MinStep: density: " << density << endl;
......
......@@ -26,7 +26,7 @@ using namespace corsika::process::stack_inspector;
template <typename Stack>
StackInspector<Stack>::StackInspector(const bool aReport)
: fReport(aReport) {}
: fReport(aReport), fCountStep(0) {}
template <typename Stack>
StackInspector<Stack>::~StackInspector() {}
......@@ -34,7 +34,6 @@ StackInspector<Stack>::~StackInspector() {}
template <typename Stack>
process::EProcessReturn StackInspector<Stack>::DoContinuous(Particle&, setup::Trajectory&,
Stack& s) const {
static int countStep = 0;
if (!fReport) return EProcessReturn::eOk;
[[maybe_unused]] int i = 0;
EnergyType Etot = 0_GeV;
......@@ -49,8 +48,8 @@ process::EProcessReturn StackInspector<Stack>::DoContinuous(Particle&, setup::Tr
<< iterP.GetPID() << " E=" << setw(15) << scientific << (E / 1_GeV) << " GeV, "
<< " pos=" << pos << endl;
}
countStep++;
cout << "StackInspector: nStep=" << countStep << " stackSize=" << s.GetSize()
fCountStep++;
cout << "StackInspector: nStep=" << fCountStep << " stackSize=" << s.GetSize()
<< " Estack=" << Etot / 1_GeV << " GeV" << endl;
return EProcessReturn::eOk;
}
......@@ -61,7 +60,9 @@ void StackInspector<Stack>::MinStepLength(Particle&, setup::Trajectory&) const {
}
template <typename Stack>
void StackInspector<Stack>::Init() {}
void StackInspector<Stack>::Init() {
fCountStep = 0;
}
#include <corsika/setup/SetupStack.h>
......
......@@ -40,6 +40,7 @@ namespace corsika::process {
private:
bool fReport;
mutable int fCountStep = 0;
};
} // namespace stack_inspector
......
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