Updates.

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

diff --git a/STEER/AliHit.cxx b/STEER/AliHit.cxx
index 6decbcb2c84be9cd61fea258eae7e5247aeeeecd..1b180deb97e004b0075f4a53e1137d1a48a3068b 100644 (file)
--- a/STEER/AliHit.cxx
+++ b/STEER/AliHit.cxx
@@ -13,32 +13,70 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-*/
+/* $Id$ */
+
+//-----------------------------------------------------------------------
+//    Base Hit class for all detectors
+//    Contains the coordinates of the hit (single energy deposition)
+//    and the number of correspondent track
+//    Author:
+//-----------------------------------------------------------------------
 
-#include "AliHit.h"
 #include "TParticle.h"
+
+#include "AliHit.h"
 #include "AliRun.h"
- 
+#include "AliMC.h"
+#include "AliStack.h"
+
 ClassImp(AliHit)
 
-AliHit::AliHit()
+//_______________________________________________________________________
+AliHit::AliHit():
+  fTrack(0),
+  fX(0),
+  fY(0),
+  fZ(0)
 {
-       fTrack=0;       
+  //
+  // Default constructor
+  //
 }
 
-AliHit::AliHit(Int_t shunt, Int_t track)
+//_______________________________________________________________________
+AliHit::AliHit(Int_t shunt, Int_t track):
+  fTrack(0),
+  fX(0),
+  fY(0),
+  fZ(0)
 {
-  TClonesArray &particles = *(gAlice->Particles());
-  if(shunt) {
-    int primary = gAlice->GetPrimary(track);
-    ((TParticle *)particles[primary])->SetBit(Keep_Bit);
+  //
+  // Standard constructor
+  //
+  if(shunt == 1) {
+    int primary = gAlice->GetMCApp()->GetPrimary(track);
+    gAlice->GetMCApp()->Particle(primary)->SetBit(kKeepBit);
     fTrack=primary;
+  } 
+
+  else if (shunt == 2) {
+    // the "primary" particle associated to the hit is
+    // the last track that has been flagged in the StepManager
+    // used by PHOS to associate the hit with the decay gamma
+    // rather than with the original pi0 
+    TParticle *part;
+    Int_t current;
+    Int_t parent=track;
+    while (1) {
+      current=parent;
+      part = gAlice->GetMCApp()->Particle(current);
+      parent=part->GetFirstMother();    
+      if(parent<0 || part->TestBit(kKeepBit))
+       break;
+    }
+    fTrack=current;   
   } else {
     fTrack=track;
-    gAlice->FlagTrack(fTrack);
+    gAlice->GetMCApp()->FlagTrack(fTrack);
   }
 }
-
-