Misalignment according survey data

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

diff --git a/STEER/AliESDpid.cxx b/STEER/AliESDpid.cxx
index 272c07436a04d06a7b32f5227ce7463e7f5ce7e9..8a3daa92f78a97455682433ca63497aef84be150 100644 (file)
--- a/STEER/AliESDpid.cxx
+++ b/STEER/AliESDpid.cxx
@@ -24,13 +24,13 @@
 //-----------------------------------------------------------------
 
 #include "AliESDpid.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliESDtrack.h"
 
 ClassImp(AliESDpid)
 
 //_________________________________________________________________________
-Int_t AliESDpid::MakePID(AliESD *event)
+Int_t AliESDpid::MakePID(AliESDEvent *event)
 {
   //
   // Combine the information of various detectors
@@ -38,7 +38,7 @@ Int_t AliESDpid::MakePID(AliESD *event)
   //
   Int_t ntrk=event->GetNumberOfTracks();
   for (Int_t i=0; i<ntrk; i++) {
-    Int_t ns=AliESDtrack::kSPECIES;
+    Int_t ns=AliPID::kSPECIES;
     Double_t p[10]={1.,1.,1.,1.,1.,1.,1.,1.,1.,1.};
     const Double_t keps=1e-13;
 
@@ -81,18 +81,9 @@ Int_t AliESDpid::MakePID(AliESD *event)
       for (j=0; j<ns; j++) p[j]*=d[j];
     }
 
-    if ((t->GetStatus()&AliESDtrack::kPHOSpid )!=0) {
+    if ((t->GetStatus()&AliESDtrack::kHMPIDpid )!=0) {
       Double_t d[10];
-      t->GetPHOSpid(d);
-      Int_t j, ok=0;
-      for (j=0; j<ns; j++) if (d[j]>keps) ok=1;
-      if (ok) 
-      for (j=0; j<ns; j++) p[j]*=d[j];
-    }
-
-    if ((t->GetStatus()&AliESDtrack::kRICHpid )!=0) {
-      Double_t d[10];
-      t->GetRICHpid(d);
+      t->GetHMPIDpid(d);
       Int_t j, ok=0;
       for (j=0; j<ns; j++) if (d[j]>keps) ok=1;
       if (ok)