diff --git a/Framework/Cascade/SibStack.h b/Framework/Cascade/SibStack.h
index 053bcdeb16763269eaf207429f7cd6539716da9a..d38bf0da9a6c021cfd63e00ab53599a360c76c05 100644
--- a/Framework/Cascade/SibStack.h
+++ b/Framework/Cascade/SibStack.h
@@ -6,6 +6,7 @@
#include <corsika/stack/Stack.h>
#include <corsika/cascade/sibyll2.3c.h>
+#include <corsika/process/sibyll/ParticleConversion.h>
using namespace std;
using namespace corsika::stack;
@@ -17,8 +18,8 @@ class SibStackData {
void Clear() { s_plist_.np = 0; }
- int GetSize() const { return s_plist_.np-1; }
- int GetCapacity() const { return s_plist_.np-1; }
+ int GetSize() const { return s_plist_.np; }
+ int GetCapacity() const { return 8000; }
void SetId(const int i, const int v) { s_plist_.llist[i]=v; }
@@ -45,6 +46,9 @@ class ParticleInterface : public ParticleBase<StackIteratorInterface> {
public:
void SetEnergy(const double v) { GetStackData().SetEnergy(GetIndex(), v); }
double GetEnergy() const { return GetStackData().GetEnergy(GetIndex()); }
+ void SetPID(const int v) { GetStackData().SetId(GetIndex(), v); }
+ corsika::process::sibyll::SibyllCode GetPID() const { return static_cast<corsika::process::sibyll::SibyllCode> (GetStackData().GetId(GetIndex())); }
+
};
diff --git a/Framework/Cascade/sibyll2.3c.h b/Framework/Cascade/sibyll2.3c.h
index 4a00010fcbcf29003921cea384864be521286b50..0899d02ee17f37f4d784d7ba4d455d032f5966c4 100644
--- a/Framework/Cascade/sibyll2.3c.h
+++ b/Framework/Cascade/sibyll2.3c.h
@@ -23,6 +23,14 @@ extern"C"{
}s_plist_;
+ extern struct {
+ double cbr[223+16+12+8];
+ int kdec[1338+6*(16+12+8)];
+ int lbarp[99];
+ int idb[99];
+ }s_csydec_;
+
+
// additional particle stack for the mother particles of unstable particles
// stable particles have entry zero
extern struct {
diff --git a/Processes/Sibyll/code_generator.py b/Processes/Sibyll/code_generator.py
index a2929fdaa1fca5e544f153a197af02fbdc4e1649..4049bb9cd3d667efcaf347861234b55bf1626f95 100755
--- a/Processes/Sibyll/code_generator.py
+++ b/Processes/Sibyll/code_generator.py
@@ -28,7 +28,11 @@ def read_sibyll_codes(filename, pythia_db):
line = line.strip()
if line[0] == '#':
continue
+<<<<<<< HEAD
identifier, sib_code, canInteractFlag, xsType = line.split()
+=======
+ identifier, sib_code, canInteractFlag, xsctnId = line.split()
+>>>>>>> ca4ed4f568320603f81b9a4f0c19a45fb6dd1d58
try:
pythia_db[identifier]["sibyll_code"] = int(sib_code)
pythia_db[identifier]["sibyll_canInteract"] = int(canInteractFlag)
diff --git a/Processes/Sibyll/sibyll_codes.dat b/Processes/Sibyll/sibyll_codes.dat
index 19e35384e6df654c00a40bc625a432281c2095ba..fc8515886b07c5f5a8f7a9307a7f06b88a65366c 100644
--- a/Processes/Sibyll/sibyll_codes.dat
+++ b/Processes/Sibyll/sibyll_codes.dat
@@ -14,7 +14,8 @@ NuTau 92 0 0
NuTauBar 93 0 0
Gamma 1 0 0
Pi0 6 1 2
-Rho0 27 1 2
+# rho0 could interact but sibyll has no cross section/interaction length. was used for gamma had int
+Rho0 27 0 0
K0Long 11 1 3
PiPlus 7 1 2
PiMinus 8 1 2
diff --git a/Processes/Sibyll/testSibyll.cc b/Processes/Sibyll/testSibyll.cc
index 15e9fa2e7117f09b2e8642719a95b3216db7eb32..1f10c2f586097d796dc5ca780450f8374f4f3dae 100644
--- a/Processes/Sibyll/testSibyll.cc
+++ b/Processes/Sibyll/testSibyll.cc
@@ -33,11 +33,16 @@ TEST_CASE("Sibyll", "[processes]") {
13 );
}
+<<<<<<< HEAD
SECTION("handledBySibyll") {
+=======
+ SECTION("KnownBySibyll") {
+>>>>>>> ca4ed4f568320603f81b9a4f0c19a45fb6dd1d58
REQUIRE(process::sibyll::KnownBySibyll(corsika::particles::Electron::GetCode()));
REQUIRE_FALSE(
process::sibyll::KnownBySibyll(corsika::particles::XiPrimeC0::GetCode()));
+<<<<<<< HEAD
}
SECTION("canInteractInSibyll") {
@@ -48,5 +53,7 @@ TEST_CASE("Sibyll", "[processes]") {
process::sibyll::CanInteract(corsika::particles::Electron::GetCode()));
REQUIRE_FALSE(
process::sibyll::CanInteract(corsika::particles::SigmaC0::GetCode()));
+=======
+>>>>>>> ca4ed4f568320603f81b9a4f0c19a45fb6dd1d58
}
}