Redundant Print removed

[u/mrichter/AliRoot.git] / PHOS / AliPHOSRecParticle.cxx

diff --git a/PHOS/AliPHOSRecParticle.cxx b/PHOS/AliPHOSRecParticle.cxx
index 5215fd03492b021fe92bef914b9ac12bc91338c4..0bf30b95ff0af907a4e5853a1342a7337bfdc958 100644 (file)
--- a/PHOS/AliPHOSRecParticle.cxx
+++ b/PHOS/AliPHOSRecParticle.cxx
@@ -35,7 +35,10 @@
 #include "AliLog.h"
 
 //____________________________________________________________________________
-  AliPHOSRecParticle::AliPHOSRecParticle(): fPHOSTrackSegment(0)  ,  fDebug( kFALSE )
+AliPHOSRecParticle::AliPHOSRecParticle(): 
+  fPHOSTrackSegment(0),
+  fDebug(kFALSE),
+  fPos()
 {
   // ctor
   const Int_t nSPECIES = AliPID::kSPECIESN;
@@ -45,13 +48,13 @@
 
 
 //____________________________________________________________________________
- AliPHOSRecParticle::AliPHOSRecParticle(const AliPHOSRecParticle & rp)
-   : AliPHOSFastRecParticle(rp)
+AliPHOSRecParticle::AliPHOSRecParticle(const AliPHOSRecParticle & rp):
+  AliPHOSFastRecParticle(rp),
+  fPHOSTrackSegment(rp.fPHOSTrackSegment),
+  fDebug(kFALSE),
+  fPos()
 {
   // copy ctor
-
-  fPHOSTrackSegment = rp.fPHOSTrackSegment ; 
-  fDebug            = kFALSE ; 
   fType             = rp.fType ; 
   fIndexInList      = rp.fIndexInList ;
 
@@ -113,7 +116,9 @@ const TParticle * AliPHOSRecParticle::GetPrimary() const
   Int_t module ;
   const AliPHOSGeometry * geom = gime->PHOSGeometry() ;
    Double_t x,z ;
-  geom->ImpactOnEmc(static_cast<double>(Theta()),static_cast<double>(Phi()), module,z,x);
+//DP to be fixed: Why do we use this method here??? M.B. use RecPoint???
+  Double_t vtx[3]={0.,0.,0.} ;
+  geom->ImpactOnEmc(vtx,static_cast<double>(Theta()),static_cast<double>(Phi()), module,z,x);
   Int_t amp = 0 ;
   Int_t iPrim=-1 ;
   if(module != 0){
@@ -141,7 +146,7 @@ const TParticle * AliPHOSRecParticle::GetPrimary() const
 } 
   
 //____________________________________________________________________________
-const Int_t AliPHOSRecParticle::GetPrimaryIndex() const  
+Int_t AliPHOSRecParticle::GetPrimaryIndex() const  
 {
   // Get the primary track index in TreeK which deposits the most energy
   // in Digits which forms EmcRecPoint, which produces TrackSegment,
@@ -151,7 +156,8 @@ const Int_t AliPHOSRecParticle::GetPrimaryIndex() const
   AliPHOSGetter * gime = AliPHOSGetter::Instance() ; 
   if (!gime) 
     AliError(Form("Getter not yet instantiated")) ; 
-  gime->Event(gime->EventNumber(), "DRTX") ; 
+  //PH  gime->Event(gime->EventNumber(), "DRTX") ; 
+  gime->Event(gime->EventNumber(), "DRT") ; 
   
   // Get TrackSegment corresponding to this RecParticle
   AliPHOSTrackSegment *ts          = gime->TrackSegment(fPHOSTrackSegment);
@@ -164,7 +170,7 @@ const Int_t AliPHOSRecParticle::GetPrimaryIndex() const
   // Get the list of digits forming this EmcRecParticle
   Int_t  nDigits   = emcRecPoint->GetDigitsMultiplicity();
   Int_t *digitList = emcRecPoint->GetDigitsList();
-  
+
   // Find the digit with maximum amplitude
   AliPHOSDigit *digit = 0;
   Int_t maxAmp = 0;
@@ -176,40 +182,73 @@ const Int_t AliPHOSRecParticle::GetPrimaryIndex() const
       bestDigitIndex = iDigit;
     }
   }
-  digit = gime->Digit(digitList[bestDigitIndex]);
+  if (bestDigitIndex>-1)
+    digit = gime->Digit(digitList[bestDigitIndex]);
+  if (digit==0) return -12345;
 
+  
   // Get the list of primary tracks producing this digit
   // and find which track has more track energy.
-  Int_t nPrimary = digit->GetNprimary();
-  TParticle *track = 0;
-  Double_t energyEM     = 0;
-  Double_t energyHadron = 0;
-  Int_t    trackEM      = 0;
-  Int_t    trackHadron  = 0;
-  for (Int_t iPrim=0; iPrim<nPrimary; iPrim++) {
-    Int_t iPrimary = digit->GetPrimary(iPrim);
-    if (iPrimary == -1)
-      continue ; 
-    track = gime->Primary(iPrimary);
-    Int_t pdgCode   = track->GetPdgCode();
-    Double_t energy = track->Energy();
-    if (pdgCode==22 || TMath::Abs(pdgCode)==11) {
-      if (energy > energyEM) {
-       energyEM = energy;
-       trackEM = iPrimary;
-      }
-    }
-    else {
-      if (energy > energyHadron) {
-       energyHadron = energy;
-       trackHadron = iPrimary;
+  //Int_t nPrimary = digit->GetNprimary();
+  //TParticle *track = 0;
+  //Double_t energyEM     = 0;
+  //Double_t energyHadron = 0;
+  //Int_t    trackEM      = -1;
+  //Int_t    trackHadron  = -1;
+  //for (Int_t iPrim=0; iPrim<nPrimary; iPrim++) {
+  //  Int_t iPrimary = digit->GetPrimary(iPrim+1);
+  //  if (iPrimary == -1 || TMath::Abs(iPrimary)>10000000)
+  //    continue ;  //PH 10000000 is the shift of the track 
+  //                //PH indexes in the underlying event
+  //  track = gime->Primary(iPrimary);
+  //  Int_t pdgCode   = track->GetPdgCode();
+  //  Double_t energy = track->Energy();
+  //  if (pdgCode==22 || TMath::Abs(pdgCode)==11) {
+  //    if (energy > energyEM) {
+  //   energyEM = energy;
+  //   trackEM = iPrimary;
+  //      }
+  //   }
+  //  else {
+  //     if (energy > energyHadron) {
+  //   energyHadron = energy;
+  //   trackHadron = iPrimary;
+       //    }
+  //  }
+  //}
+  // Preferences are given to electromagnetic tracks
+  //if (trackEM     != -1) return trackEM;     // track is gamma or e+-
+  //if (trackHadron != -1) return trackHadron; // track is hadron
+  //return -12345;                             // no track found :(
+
+
+  // Get the list of hits producing this digit,
+  // find which hit has deposited more energy 
+  // and find the primary track.
+
+  AliPHOSHit *hit = 0;
+  TClonesArray *hits = gime->Hits();
+  if (hits==0) return -12345;
+
+  Double_t maxedep  =  0;
+  Int_t    maxtrack = -1;
+  Int_t    nHits    = hits ->GetEntries();
+  Int_t    id       = digit->GetId();
+
+  for (Int_t iHit=0; iHit<nHits; iHit++) {
+    hit = gime->Hit(iHit);
+    if(hit->GetId() == id){
+      Double_t edep  = hit->GetEnergy();
+      Int_t    track = hit->GetPrimary();
+      if(edep > maxedep){
+       maxedep  = edep;
+       maxtrack = track;
       }
     }
   }
-  // Preferences are given to electromagnetic tracks
-  if (trackEM     != 0) return trackEM;     // track is gamma or e+-
-  if (trackHadron != 0) return trackHadron; // track is hadron
-  return -12345;                              // no track found :(
+
+  if (maxtrack != -1) return maxtrack; // track is hadron
+  return -12345;                       // no track found :(
 }
 
 //____________________________________________________________________________
@@ -234,7 +273,7 @@ const TParticle * AliPHOSRecParticle::GetPrimary(Int_t index) const
 }
 
 //____________________________________________________________________________
-void AliPHOSRecParticle::SetPID(Int_t type, Double_t weight)
+void AliPHOSRecParticle::SetPID(Int_t type, Float_t weight)
 {
   // Set the probability densities that this reconstructed particle
   // has a type of i: