Removing useless flag.

[u/mrichter/AliRoot.git] / TRD / AliTRDpidESD.cxx

diff --git a/TRD/AliTRDpidESD.cxx b/TRD/AliTRDpidESD.cxx
index a09ea31d97ceb31630ff8587e34f02967477425e..705103a4d6fb34831dec6aaa47038aa3335d54b5 100644 (file)
--- a/TRD/AliTRDpidESD.cxx
+++ b/TRD/AliTRDpidESD.cxx
@@ -31,16 +31,13 @@
 //                                                                        //
 ////////////////////////////////////////////////////////////////////////////
 
-#include "AliLog.h"
 #include "AliESDEvent.h"
 #include "AliESDtrack.h"
 #include "AliTracker.h"
-#include "AliRun.h"
 
 #include "AliTRDpidESD.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDcalibDB.h"
-#include "AliTRDtrack.h"
 #include "Cal/AliTRDCalPID.h"
 
 ClassImp(AliTRDpidESD)
@@ -52,7 +49,7 @@ Int_t   AliTRDpidESD::fgMinPlane         = 0;
 //_____________________________________________________________________________
 AliTRDpidESD::AliTRDpidESD()
   :TObject()
-  ,fTrack(0x0)
+  ,fTrack(NULL)
 {
   //
   // Default constructor
@@ -63,7 +60,7 @@ AliTRDpidESD::AliTRDpidESD()
 //_____________________________________________________________________________
 AliTRDpidESD::AliTRDpidESD(const AliTRDpidESD &p)
   :TObject(p)
-  ,fTrack(0x0)
+  ,fTrack(NULL)
 {
   //
   // AliTRDpidESD copy constructor
@@ -106,12 +103,12 @@ void AliTRDpidESD::Copy(TObject &p) const
   ((AliTRDpidESD &) p).fgCheckTrackStatus         = fgCheckTrackStatus;
   ((AliTRDpidESD &) p).fgCheckKinkStatus          = fgCheckKinkStatus;
   ((AliTRDpidESD &) p).fgMinPlane                 = fgMinPlane;
-  ((AliTRDpidESD &) p).fTrack                     = 0x0;
+  ((AliTRDpidESD &) p).fTrack                     = NULL;
   
 }
 
 //_____________________________________________________________________________
-Int_t AliTRDpidESD::MakePID(AliESDEvent *event)
+Int_t AliTRDpidESD::MakePID(AliESDEvent * const event)
 {
   //
   // This function calculates the PID probabilities based on TRD signals
@@ -149,8 +146,8 @@ Int_t AliTRDpidESD::MakePID(AliESDEvent *event)
 
   // Loop through all ESD tracks
   Double_t p[10];
-  AliESDtrack *t = 0x0;
-  Float_t dedx[AliTRDtrack::kNslice], dEdx;
+  AliESDtrack *t = NULL;
+  Float_t dedx[AliTRDCalPID::kNSlicesLQ], dEdx;
   Int_t   timebin;
   Float_t mom, length;
   Int_t   nPlanePID;
@@ -162,7 +159,7 @@ Int_t AliTRDpidESD::MakePID(AliESDEvent *event)
 
             
     // Skip tracks which have no TRD signal at all
-    if (t->GetTRDsignal() == 0.) continue;
+    if (t->GetTRDsignal()<1.e-5) continue;
   
     // Loop over detector layers
     mom          = 0.;
@@ -173,7 +170,7 @@ Int_t AliTRDpidESD::MakePID(AliESDEvent *event)
 
     for (Int_t iLayer = 0; iLayer < AliTRDgeometry::kNlayer; iLayer++) {
       // read data for track segment
-      for(int iSlice=0; iSlice<AliTRDtrack::kNslice; iSlice++)
+      for(int iSlice=0; iSlice<AliTRDCalPID::kNSlicesLQ; iSlice++)
         dedx[iSlice] = t->GetTRDslice(iLayer, iSlice);
       dEdx    = t->GetTRDslice(iLayer, -1);
       timebin = t->GetTRDTimBin(iLayer);
@@ -212,7 +209,7 @@ Int_t AliTRDpidESD::MakePID(AliESDEvent *event)
 
     // book PID to the track
     t->SetTRDpid(p);
-    t->SetTRDpidQuality(nPlanePID);
+    t->SetTRDntracklets(nPlanePID<<3);
   }
   
   return 0;
@@ -220,7 +217,7 @@ Int_t AliTRDpidESD::MakePID(AliESDEvent *event)
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDpidESD::CheckTrack(AliESDtrack *t)
+Bool_t AliTRDpidESD::CheckTrack(AliESDtrack * const t)
 {
   //
   // Check if track is eligible for PID calculations
@@ -240,7 +237,7 @@ Bool_t AliTRDpidESD::CheckTrack(AliESDtrack *t)
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDpidESD::RecalculateTrackSegmentKine(AliESDtrack *esd
+Bool_t AliTRDpidESD::RecalculateTrackSegmentKine(AliESDtrack * const esd
                                               , Int_t layer
                                               , Float_t &mom
                                               , Float_t &length)
@@ -267,7 +264,7 @@ Bool_t AliTRDpidESD::RecalculateTrackSegmentKine(AliESDtrack *esd
     return kFALSE;
   }
 
-  AliExternalTrackParam *param = 0x0;
+  AliExternalTrackParam *param = NULL;
   if(!fTrack){
     fTrack = new AliExternalTrackParam(*op);
     param = fTrack;
@@ -284,13 +281,13 @@ Bool_t AliTRDpidESD::RecalculateTrackSegmentKine(AliESDtrack *esd
     mom    = op->GetP();
     s      = op->GetSnp();
     t      = op->GetTgl();
-          if (s < 1.) length /= TMath::Sqrt((1. - s*s) / (1. + t*t));
+    if (s < 1.) length /= TMath::Sqrt((1.-s)*(1.+s) / (1. + t*t));
     return kFALSE;
   }
   mom        = param->GetP();
   s = param->GetSnp();
   t = param->GetTgl();
-  if (s < 1.) length    /= TMath::Sqrt((1. - s*s) / (1. + t*t));
+  if (s < 1.) length    /= TMath::Sqrt((1.-s)*(1.+s) / (1. + t*t));
 
   // check if track is crossing tracking sector by propagating to chamber exit- maybe is too much :)
   Double_t alpha = param->GetAlpha();