Merge branch 'sibyll' of gitlab.ikp.kit.edu:AirShowerPhysics/corsika into sibyll

Documentation/Examples/cascade_example.cc

@@ -32,6 +32,7 @@ using namespace corsika::process;
 using namespace corsika::units;
 using namespace corsika::particles;
 using namespace corsika::random;
+using namespace corsika::setup;
 
 #include <iostream>
 #include <typeinfo>
@@ -238,8 +239,8 @@ public:
     int kBeam = process::sibyll::GetSibyllXSCode(corsikaBeamId);
 
     bool kInteraction = process::sibyll::CanInteract(corsikaBeamId);
-
-    /*
+    
+    /* 
        the target should be defined by the Environment,
        ideally as full particle object so that the four momenta
        and the boosts can be defined..
@@ -350,10 +351,10 @@ public:
 
       // get energy of particle from stack
       /*
-        stack is in GeV in lab. frame
-        convert to GeV in cm. frame
-        (assuming proton at rest as target AND
-        assuming no pT, i.e. shower frame-z is aligned with hadron-int-frame-z)
+	stack is in GeV in lab. frame
+	convert to GeV in cm. frame 
+	(assuming proton at rest as target AND 
+	assuming no pT, i.e. shower frame-z is aligned with hadron-int-frame-z)
       */
       // total energy: E_beam + E_target
       // in lab. frame: E_beam + m_target*c**2
@@ -473,6 +474,7 @@ public:
     setTrackedParticlesStable();
   }
 
+  
   int GetCount() { return fCount; }
   EnergyType GetEnergy() { return fEnergy; }
 
@@ -486,12 +488,14 @@ double s_rndm_(int&) {
   return rmng() / (double)rmng.max();
 }
 
+
 int main() {
 
   CoordinateSystem& rootCS = RootCoordinateSystem::GetInstance().GetRootCS();
 
   tracking_line::TrackingLine<setup::Stack> tracking;
   stack_inspector::StackInspector<setup::Stack> p0(true);
+
   ProcessSplit p1;
   corsika::process::sibyll::ProcessDecay p2;
   ProcessEMCut p3;

Framework/Cascade/SibStack.h

@@ -6,6 +6,7 @@
 
 #include <corsika/cascade/sibyll2.3c.h>
 #include <corsika/process/sibyll/ParticleConversion.h>
+#include <corsika/units/PhysicalUnits.h>
 #include <corsika/stack/Stack.h>
 #include <corsika/units/PhysicalUnits.h>
 

Stack/SuperStupidStack/SuperStupidStack.h

@@ -134,7 +134,7 @@ namespace corsika::stack {
       void IncrementSize() {
         fDataPID.push_back(Code::Unknown);
         fDataE.push_back(0 * joule);
-#warning this here makes no sense: see issue #48
+	//#TODO this here makes no sense: see issue #48
         geometry::CoordinateSystem& dummyCS =
             geometry::RootCoordinateSystem::GetInstance().GetRootCS();
         fMomentum.push_back(MomentumVector(