New versions of the DA executables to comply with DAQ DA file naming conventions

[u/mrichter/AliRoot.git] / TPC / AliTPCpidESD.cxx

diff --git a/TPC/AliTPCpidESD.cxx b/TPC/AliTPCpidESD.cxx
index 1b43f43f950824251152a74b95012585d53ab882..58f66383a311435fe9e64437a97f096c60363766 100644 (file)
--- a/TPC/AliTPCpidESD.cxx
+++ b/TPC/AliTPCpidESD.cxx
@@ -20,13 +20,16 @@
 //-----------------------------------------------------------------
 
 #include "AliTPCpidESD.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliESDtrack.h"
 
 ClassImp(AliTPCpidESD)
 
 //_________________________________________________________________________
-AliTPCpidESD::AliTPCpidESD(Double_t *param)
+  AliTPCpidESD::AliTPCpidESD(Double_t *param):
+    fMIP(0.),
+    fRes(0.),
+    fRange(0.)
 {
   //
   //  The main constructor
@@ -50,7 +53,7 @@ Double_t AliTPCpidESD::Bethe(Double_t bg) {
 }
 
 //_________________________________________________________________________
-Int_t AliTPCpidESD::MakePID(AliESD *event)
+Int_t AliTPCpidESD::MakePID(AliESDEvent *event)
 {
   //
   //  This function calculates the "detector response" PID probabilities 
@@ -60,21 +63,35 @@ Int_t AliTPCpidESD::MakePID(AliESD *event)
     AliESDtrack *t=event->GetTrack(i);
     if ((t->GetStatus()&AliESDtrack::kTPCin )==0)
       if ((t->GetStatus()&AliESDtrack::kTPCout)==0) continue;
-    Int_t ns=AliPID::kSPECIES;
     Double_t p[10];
-    for (Int_t j=0; j<ns; j++) {
+    Double_t mom=t->GetP();
+    const AliExternalTrackParam *in=t->GetInnerParam();
+    if (in) mom=in->GetP();
+    Double_t dedx=t->GetTPCsignal()/fMIP;
+    Bool_t mismatch=kTRUE, heavy=kTRUE;
+    for (Int_t j=0; j<AliPID::kSPECIES; j++) {
       Double_t mass=AliPID::ParticleMass(j);
-      Double_t mom=t->GetP();
-      Double_t dedx=t->GetTPCsignal()/fMIP;
       Double_t bethe=Bethe(mom/mass); 
       Double_t sigma=fRes*bethe;
       if (TMath::Abs(dedx-bethe) > fRange*sigma) {
        p[j]=TMath::Exp(-0.5*fRange*fRange)/sigma;
-        continue;
+      } else {
+        p[j]=TMath::Exp(-0.5*(dedx-bethe)*(dedx-bethe)/(sigma*sigma))/sigma;
+        mismatch=kFALSE;
       }
-      p[j]=TMath::Exp(-0.5*(dedx-bethe)*(dedx-bethe)/(sigma*sigma))/sigma;
+
+      // Check for particles heavier than (AliPID::kSPECIES - 1)
+      if (dedx < (bethe + fRange*sigma)) heavy=kFALSE;
+
     }
+
+    if (mismatch)
+       for (Int_t j=0; j<AliPID::kSPECIES; j++) p[j]=1/AliPID::kSPECIES;
+
     t->SetTPCpid(p);
+
+    if (heavy) t->ResetStatus(AliESDtrack::kTPCpid);
+
   }
   return 0;
 }