New Clusterization by IHEP (yuri)

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

diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx
index 7a125b5ffd31595a00ee9be71bcbdba87aa25699..9f6195285df007e37e9db812950cfbb7f4c2f9ab 100644 (file)
--- a/STEER/AliStack.cxx
+++ b/STEER/AliStack.cxx
@@ -15,6 +15,15 @@
 
 /*
 $Log$
+Revision 1.14  2001/08/30 09:44:06  hristov
+VertexSource_t added to avoid the warnings
+
+Revision 1.13  2001/08/29 13:31:42  morsch
+Protection against (fTreeK == 0) in destructor.
+
+Revision 1.12  2001/07/27 13:03:13  hristov
+Default Branch split level set to 99
+
 Revision 1.11  2001/07/27 12:34:20  jchudoba
 remove the dummy argument in GetEvent method
 
@@ -118,7 +127,7 @@ AliStack::~AliStack()
     delete fParticles;
   }
   delete fParticleMap;
-  delete fTreeK;
+  if (fTreeK) delete fTreeK;
 }
 
 //
@@ -183,8 +192,13 @@ void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom,
 
   if(parent>=0) {
     particle = (TParticle*) fParticleMap->At(parent);
-    particle->SetLastDaughter(fNtrack);
-    if(particle->GetFirstDaughter()<0) particle->SetFirstDaughter(fNtrack);
+    if (particle) {
+      particle->SetLastDaughter(fNtrack);
+      if(particle->GetFirstDaughter()<0) particle->SetFirstDaughter(fNtrack);
+    }
+    else {
+      printf("Error in AliStack::SetTrack: Parent %d does not exist\n",parent);
+    }
   } 
   else { 
     //
@@ -250,8 +264,13 @@ void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg,
 
   if(parent>=0) {
     particle = (TParticle*) fParticleMap->At(parent);
-    particle->SetLastDaughter(fNtrack);
-    if(particle->GetFirstDaughter()<0) particle->SetFirstDaughter(fNtrack);
+    if (particle) {
+      particle->SetLastDaughter(fNtrack);
+      if(particle->GetFirstDaughter()<0) particle->SetFirstDaughter(fNtrack);
+    }
+    else {
+      printf("Error in AliStack::SetTrack: Parent %d does not exist\n",parent);
+    }
   } 
   else { 
     //
@@ -463,7 +482,9 @@ void AliStack::FinishEvent()
       fParticleBuffer = (TParticle*) part;
       fParticleFileMap[i]= (Int_t) fTreeK->GetEntries();
       fTreeK->Fill();
-      (*fParticleMap)[i]=fParticleBuffer=0;      
+      //PH      (*fParticleMap)[i]=fParticleBuffer=0;      
+      fParticleBuffer=0;      
+      fParticleMap->AddAt(0,i);      
       
       // When all primaries were filled no particle!=0
       // should be left => to be removed later.
@@ -563,7 +584,8 @@ TParticle* AliStack::Particle(Int_t i)
   //
   // Return particle with specified ID
   
-  if(!(*fParticleMap)[i]) {
+  //PH  if(!(*fParticleMap)[i]) {
+  if(!fParticleMap->At(i)) {
     Int_t nentries = fParticles->GetEntriesFast();
     // algorithmic way of getting entry index
     // (primary particles are filled after secondaries)
@@ -585,7 +607,8 @@ TParticle* AliStack::Particle(Int_t i)
     new ((*fParticles)[nentries]) TParticle(*fParticleBuffer);
     fParticleMap->AddAt((*fParticles)[nentries],i);
   }
-  return (TParticle *) (*fParticleMap)[i];
+  //PH  return (TParticle *) (*fParticleMap)[i];
+  return (TParticle *) fParticleMap->At(i);
 }
 
 //_____________________________________________________________________________
@@ -614,7 +637,8 @@ void AliStack::DumpPart (Int_t i) const
   // Dumps particle i in the stack
   //
   
-  ((TParticle*) (*fParticleMap)[i])->Print();
+  //PH  ((TParticle*) (*fParticleMap)[i])->Print();
+  ((TParticle*) fParticleMap->At(i))->Print();
 }
 
 //_____________________________________________________________________________