More fixes for running on the grid

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

diff --git a/STEER/AliESDpid.h b/STEER/AliESDpid.h
index 8cb88734f243d9bb33fcfa9b295349deb5a1368e..e1f15d6c7cd473b0b3d4c2255ec61a6c8f7576ac 100644 (file)
--- a/STEER/AliESDpid.h
+++ b/STEER/AliESDpid.h
@@ -9,70 +9,61 @@
 //                    Combined PID class
 //           for the Event Summary Data class
 //   Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
+//   Modified: Jens Wiechula, Uni Tuebingen, jens.wiechula@cern.ch
 //-------------------------------------------------------
 #include <Rtypes.h>
 #include "AliESDtrack.h" // Needed for inline functions
-#include "AliTPCPIDResponse.h"
-#include "AliITSPIDResponse.h"
-#include "AliTOFPIDResponse.h"
+
 //#include "HMPID/AliHMPID.h"
 //#include "TRD/AliTRDpidESD.h"
 
+#include "AliPIDResponse.h"
+
 class AliESDEvent;
+class AliVEvent;
+class AliVParticle;
 
-class AliESDpid {
+class AliESDpid : public AliPIDResponse  {
 public:
-  AliESDpid(): fRange(5.), fITSPIDmethod(kITSTruncMean), fTPCResponse(), fITSResponse(), fTOFResponse() {;}
+  AliESDpid(Bool_t forMC=kFALSE): AliPIDResponse(forMC), fRange(5.), fRangeTOFMismatch(5.), fITSPIDmethod(kITSTruncMean) {;}
   virtual ~AliESDpid() {}
-  Int_t MakePID(AliESDEvent *event, Bool_t TPCOnly = kFALSE, Float_t TimeZeroTOF=0) const;
+  
+  Int_t MakePID(AliESDEvent *event, Bool_t TPCOnly = kFALSE, Float_t timeZeroTOF=9999) const;
   void MakeTPCPID(AliESDtrack *track) const;
   void MakeITSPID(AliESDtrack *track) const;
-  void MakeTOFPID(AliESDtrack *track, Float_t TimeZeroTOF) const;
+  void MakeTOFPID(AliESDtrack *track, Float_t /*timeZeroTOF*/) const;
+  Bool_t CheckTOFMatching(AliESDtrack *track) const;
   //  void MakeHMPIDPID(AliESDtrack *track);
-  //  void MakeTRDPID(AliESDtrack *track);
+  void MakeTRDPID(AliESDtrack *track) const;
   void CombinePID(AliESDtrack *track) const;
 
   enum ITSPIDmethod { kITSTruncMean, kITSLikelihood };
   void SetITSPIDmethod(ITSPIDmethod pmeth) { fITSPIDmethod = pmeth; }
+  
+  virtual Float_t NumberOfSigmasTOF(const AliVParticle *vtrack, AliPID::EParticleType type, const Float_t timeZeroTOF) const;
+  virtual Float_t NumberOfSigmasTOF(const AliVParticle *vtrack, AliPID::EParticleType type) const {return NumberOfSigmasTOF(vtrack,type,0); }
+  
+  void SetTOFResponse(AliVEvent *vevent,EStartTimeType_t option);
 
-  Float_t NumberOfSigmasTPC(const AliESDtrack *track, AliPID::EParticleType type) const;
-  Float_t NumberOfSigmasTOF(const AliESDtrack *track, AliPID::EParticleType type, const Float_t TimeZeroTOF) const;
-  Float_t NumberOfSigmasITS(const AliESDtrack *track, AliPID::EParticleType type) const;
-
-  AliITSPIDResponse &GetITSResponse() {return fITSResponse;}
-  AliTPCPIDResponse &GetTPCResponse() {return fTPCResponse;}
-  AliTOFPIDResponse &GetTOFResponse() {return fTOFResponse;}
-
+  void SetNMaxSigmaTOFTPCMismatch(Float_t range) {fRangeTOFMismatch=range;}
+  Float_t GetNMaxSigmaTOFTPCMismatch() const {return fRangeTOFMismatch;}
 
 private:
   Float_t           fRange;          // nSigma max in likelihood
+  Float_t           fRangeTOFMismatch; // nSigma max for TOF matching with TPC
   ITSPIDmethod      fITSPIDmethod;   // 0 = trunc mean; 1 = likelihood 
-  AliTPCPIDResponse fTPCResponse;
-  AliITSPIDResponse fITSResponse;
-  AliTOFPIDResponse fTOFResponse;
-  // AliHMPIDPIDResponse fHMPIDResponse;
-  // AliTRDPIDResponse fTRDResponse;
 
-  ClassDef(AliESDpid,3)  // PID calculation class
+  ClassDef(AliESDpid,6)  // PID calculation class
 };
 
-inline Float_t AliESDpid::NumberOfSigmasTPC(const AliESDtrack *track, AliPID::EParticleType type) const {
-  Double_t mom = track->GetP();
-  const AliExternalTrackParam *in = track->GetTPCInnerParam();
-  if (in)
-    mom = in->GetP();
-  return fTPCResponse.GetNumberOfSigmas(mom,track->GetTPCsignal(),track->GetTPCsignalN(),type); 
-}
 
-inline Float_t AliESDpid::NumberOfSigmasTOF(const AliESDtrack *track, AliPID::EParticleType type, const Float_t TimeZeroTOF) const {
+inline Float_t AliESDpid::NumberOfSigmasTOF(const AliVParticle *vtrack, AliPID::EParticleType type, const Float_t /*timeZeroTOF*/) const {
+  AliESDtrack *track=(AliESDtrack*)vtrack;
   Double_t times[AliPID::kSPECIES];
   track->GetIntegratedTimes(times);
-  return (track->GetTOFsignal() - TimeZeroTOF - times[type])/fTOFResponse.GetExpectedSigma(track->GetP(),times[type],AliPID::ParticleMass(type));
+  return (track->GetTOFsignal() - fTOFResponse.GetStartTime(track->GetP()) - times[type])/fTOFResponse.GetExpectedSigma(track->GetP(),times[type],AliPID::ParticleMass(type));
 }
 
-inline Float_t AliESDpid::NumberOfSigmasITS(const AliESDtrack *track, AliPID::EParticleType type) const {
-  return fITSResponse.GetNumberOfSigmas(track->GetP(),track->GetITSsignal(),type); 
-}
 #endif