Fix for bug #66122: Backward compatibility in AliMultiplicity

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

diff --git a/STEER/AliESDtrack.h b/STEER/AliESDtrack.h
index c94bd6a920b3d9d686039dedafbddc2ed05123ff..0257e83a32a34b408a511d97f32dc1a86d741cc4 100644 (file)
--- a/STEER/AliESDtrack.h
+++ b/STEER/AliESDtrack.h
@@ -49,7 +49,8 @@ public:
     kTOFin=0x1000,kTOFout=0x2000,kTOFrefit=0x4000,kTOFpid=0x8000,
     kHMPIDout=0x10000,kHMPIDpid=0x20000,
     kEMCALmatch=0x40000,
-    kTRDbackup=0x80000,
+    kPHOSmatch=0x200000,
+    kTRDbackup =0x80000,
     kTRDStop=0x20000000,
     kESDpid=0x40000000,
     kTIME=0x80000000,
@@ -98,7 +99,7 @@ public:
   Double_t GetIntegratedLength() const {return fTrackLength;}
   void GetIntegratedTimes(Double_t *times) const;
   Double_t GetMass() const;
-  Double_t M() const { return GetMass(); }
+  Double_t M() const;
   Double_t E() const;
   Double_t Y() const;
 
@@ -288,6 +289,10 @@ public:
   Double_t GetTOFsignalDz() const {return fTOFsignalDz;}
   void    SetTOFsignalDx(Double_t dx) {fTOFsignalDx=dx;}
   Double_t GetTOFsignalDx() const {return fTOFsignalDx;}
+  void     SetTOFDeltaBC(Short_t deltaBC) {fTOFdeltaBC=deltaBC;};
+  Short_t  GetTOFDeltaBC() const {return fTOFdeltaBC;}
+  void     SetTOFL0L1(Short_t l0l1) {fTOFl0l1=l0l1;};
+  Short_t  GetTOFL0L1() const {return fTOFl0l1;}
   Double_t GetTOFchi2() const {return fTOFchi2;}
   void    SetTOFpid(const Double_t *p);
   void    SetTOFLabel(const Int_t *p);
@@ -325,10 +330,18 @@ public:
   Bool_t  IsPureITSStandalone() const {return fFlags&kITSpureSA;}
 
 
-  Int_t GetEMCALcluster() {return fEMCALindex;}
-  void SetEMCALcluster(Int_t index) {fEMCALindex=index;}
+  Int_t GetEMCALcluster() {return fCaloIndex;}
+  void SetEMCALcluster(Int_t index) {fCaloIndex=index;}
   Bool_t IsEMCAL() const {return fFlags&kEMCALmatch;}
 
+  Int_t GetPHOScluster() {return fCaloIndex;}
+  void SetPHOScluster(Int_t index) {fCaloIndex=index;}
+  Bool_t IsPHOS() const {return fFlags&kPHOSmatch;}
+  Double_t GetPHOSdx()const{return fCaloDx ;}
+  Double_t GetPHOSdz()const{return fCaloDz ;}
+  void SetPHOSdxdz(Double_t dx, Double_t dz){fCaloDx=dx,fCaloDz=dz;}
+
+
   void SetTrackPointArray(AliTrackPointArray *points) {
     fFriendTrack->SetTrackPointArray(points);
   }
@@ -389,7 +402,7 @@ protected:
   Int_t     fTOFindex;       // index of the assigned TOF cluster
   Int_t     fHMPIDqn;         // 1000000*number of photon clusters + QDC
   Int_t     fHMPIDcluIdx;     // 1000000*chamber id + cluster idx of the assigned MIP cluster
-  Int_t     fEMCALindex;     // index of associated EMCAL cluster (AliESDCaloCluster)
+  Int_t     fCaloIndex;       // index of associated EMCAL/PHOS cluster (AliESDCaloCluster)
 
 
   Int_t     fKinkIndexes[3]; // array of indexes of posible kink candidates 
@@ -446,6 +459,11 @@ protected:
   Double32_t fTOFsignalDz;    // local z  of track's impact on the TOF pad 
   Double32_t fTOFsignalDx;    // local x  of track's impact on the TOF pad 
   Double32_t fTOFInfo[10];    //! TOF informations
+  Short_t    fTOFdeltaBC;     // detector's Delta Bunch Crossing correction
+  Short_t    fTOFl0l1;        // detector's L0L1 latency correction
+
+  Double32_t fCaloDx ;        // [0.,0.,8] distance to calorimeter cluster in calo plain (phi direction)
+  Double32_t fCaloDz ;        // [0.,0.,8] distance to calorimeter cluster in calo plain (z direction)
 
   Double32_t fHMPIDtrkX;       // x of the track impact, LORS 
   Double32_t fHMPIDtrkY;       // y of the track impact, LORS 
@@ -475,7 +493,7 @@ protected:
  private:
 
   AliESDtrack & operator=(const AliESDtrack & );
-  ClassDef(AliESDtrack,55)  //ESDtrack 
+  ClassDef(AliESDtrack,57)  //ESDtrack 
 };