just Fixing Log info

[u/mrichter/AliRoot.git] / STEER / AliStack.cxx

diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx
index fbf97c7e11875caff8881c2e844b0a6926602daf..724e5310fd15c0457c04bc970d87553d5a05221f 100644 (file)
--- a/STEER/AliStack.cxx
+++ b/STEER/AliStack.cxx
@@ -47,6 +47,7 @@ AliStack::AliStack():
   fParticleMap(0),
   fParticleFileMap(0),
   fParticleBuffer(0),
+  fCurrentTrack(0),
   fTreeK(0),
   fNtrack(0),
   fNprimary(0),
@@ -67,6 +68,7 @@ AliStack::AliStack(Int_t size, const char* evfoldname):
   fParticleMap(new TObjArray(size)),
   fParticleFileMap(0),
   fParticleBuffer(0),
+  fCurrentTrack(0),
   fTreeK(0),
   fNtrack(0),
   fNprimary(0),
@@ -88,13 +90,15 @@ AliStack::AliStack(const AliStack& st):
   fParticleMap(0),
   fParticleFileMap(0),
   fParticleBuffer(0),
+  fCurrentTrack(0),
   fTreeK(0),
   fNtrack(0),
   fNprimary(0),
   fCurrent(-1),
   fCurrentPrimary(-1),
   fHgwmk(0),
-  fLoadPoint(0)
+  fLoadPoint(0),
+  fEventFolderName()
 {
   //
   // Copy constructor
@@ -364,6 +368,7 @@ void AliStack::PurifyKine()
       }
     }
   }
+
   
   // Now loop on all registered hit lists
   TList* hitLists = gAlice->GetMCApp()->GetHitLists();
@@ -427,7 +432,7 @@ void AliStack::ReorderKine()
   //
   // Howmany secondaries have been produced ?
   Int_t nNew = fNtrack - fHgwmk - 1;
-  
+    
   if (nNew > 0) {
       Int_t i, j;
       TObjArray &particles = *fParticleMap;
@@ -438,13 +443,7 @@ void AliStack::ReorderKine()
       
       for (i = 0; i < nNew; i++) {
          if (particles.At(fHgwmk + 1 + i)) {
-//           tmp[i] = (TParticle*) (particles.At(fHgwmk + 1 + i))->Clone();
              tmp[i] = (TParticle*) (particles.At(fHgwmk + 1 + i));
-
-//           if (((TParticle*) (particles.At(fHgwmk + 1 + i)))->TestBit(kKeepBit))
-//               tmp[i]->SetBit(kKeepBit);
-//           if (((TParticle*) (particles.At(fHgwmk + 1 + i)))->TestBit(kDoneBit))
-//               tmp[i]->SetBit(kDoneBit);
          } else {
              tmp[i] = 0x0;
          }
@@ -461,7 +460,7 @@ void AliStack::ReorderKine()
       // The outer loop is over parents, the inner over children.
       // -1 refers to the primary particle
       //
-      for (i = -1; i < nNew - 1; i++) {
+      for (i = -1; i < nNew-1; i++) {
          Int_t ipa;
          TParticle* parP;
          if (i == -1) {
@@ -476,9 +475,12 @@ void AliStack::ReorderKine()
              parP = tmp[i];
          }
           // Reset daughter information
+
+         Int_t idaumin = parP->GetFirstDaughter() - fHgwmk - 1;
+         Int_t idaumax = parP->GetLastDaughter()  - fHgwmk - 1;
          parP->SetFirstDaughter(-1);
          parP->SetLastDaughter(-1);
-         for (j = i + 1; j < nNew; j++) {
+         for (j = idaumin; j <= idaumax; j++) {
               // Skip deleted particles
              if (!tmp[j])        continue;
               // Skip particles already handled