IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 0047c686 authored by ralfulrich's avatar ralfulrich
Browse files

merge

parents c2725ac5 e9685ae3
No related branches found
No related tags found
No related merge requests found
...@@ -227,8 +227,8 @@ namespace corsika::process { ...@@ -227,8 +227,8 @@ namespace corsika::process {
} }
}; };
/// the + operator assembles many BaseProcess, ContinuousProcess, and /// the << operator assembles many BaseProcess, ContinuousProcess, and
/// InteractionProcess objects into a ProcessSequence, all combinatorics /// Interaction/DecayProcess objects into a ProcessSequence, all combinatorics
/// must be allowed, this is why we define a macro to define all /// must be allowed, this is why we define a macro to define all
/// combinations here: /// combinations here:
...@@ -255,6 +255,7 @@ namespace corsika::process { ...@@ -255,6 +255,7 @@ namespace corsika::process {
OPSEQ(DecayProcess, ContinuousProcess) OPSEQ(DecayProcess, ContinuousProcess)
OPSEQ(DecayProcess, DecayProcess) OPSEQ(DecayProcess, DecayProcess)
/// marker to identify objectas ProcessSequence
template <typename A, typename B> template <typename A, typename B>
struct is_process_sequence<corsika::process::ProcessSequence<A, B> > { struct is_process_sequence<corsika::process::ProcessSequence<A, B> > {
static const bool value = true; static const bool value = true;
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <corsika/process/DecayProcess.h> #include <corsika/process/DecayProcess.h>
#include <corsika/process/sibyll/ParticleConversion.h> #include <corsika/process/sibyll/ParticleConversion.h>
#include <corsika/process/sibyll/SibStack.h> #include <corsika/process/sibyll/SibStack.h>
#include <corsika/setup/SetupStack.h> #include <corsika/setup/SetupStack.h>
#include <corsika/setup/SetupTrajectory.h> #include <corsika/setup/SetupTrajectory.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <corsika/random/RNGManager.h> #include <corsika/random/RNGManager.h>
#include <corsika/units/PhysicalUnits.h> #include <corsika/units/PhysicalUnits.h>
namespace corsika::process::sibyll { namespace corsika::process::sibyll {
class Interaction : public corsika::process::InteractionProcess<Interaction> { class Interaction : public corsika::process::InteractionProcess<Interaction> {
...@@ -217,6 +218,7 @@ namespace corsika::process::sibyll { ...@@ -217,6 +218,7 @@ namespace corsika::process::sibyll {
// running sibyll, filling stack // running sibyll, filling stack
sibyll_(kBeam, kTarget, sqs); sibyll_(kBeam, kTarget, sqs);
// running decays // running decays
// setTrackedParticlesStable();
decsib_(); decsib_();
// print final state // print final state
int print_unit = 6; int print_unit = 6;
......
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