Propagate first and second daughters to the Stack

Author: preghenella

DataFormats/simulation/include/SimulationDataFormat/Stack.h

@@ -88,6 +88,10 @@ class Stack : public FairGenericStack
                  Double_t vx, Double_t vy, Double_t vz, Double_t time, Double_t polx, Double_t poly, Double_t polz,
                  TMCProcess proc, Int_t& ntr, Double_t weight, Int_t is, Int_t secondParentId) override;
 
+  void PushTrack(Int_t toBeDone, Int_t parentID, Int_t pdgCode, Double_t px, Double_t py, Double_t pz, Double_t e,
+                 Double_t vx, Double_t vy, Double_t vz, Double_t time, Double_t polx, Double_t poly, Double_t polz,
+                 TMCProcess proc, Int_t& ntr, Double_t weight, Int_t is, Int_t secondParentId, Int_t daughter1Id, Int_t daughter2Id);
+
   // similar function taking a particle
   void PushTrack(Int_t toBeDone, TParticle&);
 

DataFormats/simulation/src/Stack.cxx

@@ -182,6 +182,13 @@ void Stack::PushTrack(Int_t toBeDone, Int_t parentId, Int_t pdgCode, Double_t px
 void Stack::PushTrack(Int_t toBeDone, Int_t parentId, Int_t pdgCode, Double_t px, Double_t py, Double_t pz, Double_t e,
                       Double_t vx, Double_t vy, Double_t vz, Double_t time, Double_t polx, Double_t poly, Double_t polz,
                       TMCProcess proc, Int_t& ntr, Double_t weight, Int_t is, Int_t secondparentId)
+{
+  PushTrack(toBeDone, parentId, pdgCode, px, py, pz, e, vx, vy, vz, time, polx, poly, polz, proc, ntr, weight, is, secondparentId, -1, -1);
+}
+
+void Stack::PushTrack(Int_t toBeDone, Int_t parentId, Int_t pdgCode, Double_t px, Double_t py, Double_t pz, Double_t e,
+                      Double_t vx, Double_t vy, Double_t vz, Double_t time, Double_t polx, Double_t poly, Double_t polz,
+                      TMCProcess proc, Int_t& ntr, Double_t weight, Int_t is, Int_t secondparentId, Int_t daughter1Id, Int_t daughter2Id)
 {
   //  printf("Pushing %s toBeDone %5d parentId %5d pdgCode %5d is %5d entries %5d \n",
   //	 proc == kPPrimary ? "Primary:   " : "Secondary: ",
@@ -200,8 +207,8 @@ void Stack::PushTrack(Int_t toBeDone, Int_t parentId, Int_t pdgCode, Double_t px
   Int_t trackId = mNumberOfEntriesInParticles;
   // Set track variable
   ntr = trackId;
-  Int_t daughter1Id = -1;
-  Int_t daughter2Id = -1;
+  //  Int_t daughter1Id = -1;
+  //  Int_t daughter2Id = -1;
   Int_t iStatus = (proc == kPPrimary) ? is : trackId;
   TParticle p(pdgCode, iStatus, parentId, secondparentId, daughter1Id, daughter2Id, px, py, pz, e, vx, vy, vz, time);
   p.SetPolarisation(polx, poly, polz);

Generators/src/PrimaryGenerator.cxx

@@ -14,6 +14,7 @@
 #include "Generators/Generator.h"
 #include "Generators/InteractionDiamondParam.h"
 #include "SimulationDataFormat/MCEventHeader.h"
+#include "SimulationDataFormat/Stack.h"
 #include "FairLogger.h"
 
 #include "FairGenericStack.h"
@@ -186,9 +187,14 @@ void PrimaryGenerator::AddTrack(Int_t pdgid, Double_t px, Double_t py, Double_t
   }
 
   /** add track to stack **/
-  fStack->PushTrack(doTracking, mother1, pdgid, px, py, pz,
-                    e, vx, vy, vz, tof, polx, poly, polz, proc, ntr,
-                    weight, status, mother2);
+  auto stack = dynamic_cast<o2::data::Stack*>(fStack);
+  if (!stack) {
+    LOG(FATAL) << "Stack must be an o2::data:Stack";
+    return; // must be the o2 stack
+  }
+  stack->PushTrack(doTracking, mother1, pdgid, px, py, pz,
+                   e, vx, vy, vz, tof, polx, poly, polz, proc, ntr,
+                   weight, status, mother2, daughter1, daughter2);
 
   fNTracks++;
 }