Incrementing class version

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

diff --git a/STEER/AliESDtrack.h b/STEER/AliESDtrack.h
index 2ec43397f9b180b379e5ccb4361aeb0749337f5d..c84b4d0450732a1d46cad312ce49c2c296759f10 100644 (file)
--- a/STEER/AliESDtrack.h
+++ b/STEER/AliESDtrack.h
@@ -10,6 +10,7 @@
 //         Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
 #include "TObject.h"
+#include <TBits.h>
 
 class AliKalmanTrack;
 
@@ -50,7 +51,11 @@ public:
 
   void GetInnerPxPyPz(Double_t *p) const;
   void GetInnerXYZ(Double_t *r) const;
-
+  void GetInnerExternalParameters(Double_t &x, Double_t p[5]) const;//skowron
+  void GetInnerExternalCovariance(Double_t cov[15]) const;//skowron
+  Double_t GetInnerAlpha() const {return fIalpha;}
+  
+  
   void GetOuterPxPyPz(Double_t *p) const;
   void GetOuterXYZ(Double_t *r) const;
 
@@ -59,13 +64,16 @@ public:
   Float_t GetITSsignal() const {return fITSsignal;}
   Float_t GetITSchi2() const {return fITSchi2;}
   Int_t GetITSclusters(UInt_t *idx) const;
+  Int_t GetITSLabel() const {return fITSLabel;}
 
   void SetTPCpid(const Double_t *p);
   void GetTPCpid(Double_t *p) const;
   Float_t GetTPCsignal() const {return fTPCsignal;}
   Float_t GetTPCchi2() const {return fTPCchi2;}
   Int_t GetTPCclusters(Int_t *idx) const;
-
+  Int_t GetTPCLabel() const {return fTPCLabel;}
+  const TBits& GetTPCClusterMap(){return fTPCClusterMap;}
+  
   void SetTRDpid(const Double_t *p);
   void GetTRDpid(Double_t *p) const;
   Float_t GetTRDsignal() const {return fTRDsignal;}
@@ -73,6 +81,8 @@ public:
   Int_t GetTRDclusters(UInt_t *idx) const;
   void    SetTRDpid(Int_t iSpecies, Float_t p);
   Float_t GetTRDpid(Int_t iSpecies) const;
+  Int_t GetTRDLabel() const {return fTRDLabel;}
+
 
   void SetTOFsignal(Double_t tof) {fTOFsignal=tof;}
   Float_t GetTOFsignal() const {return fTOFsignal;}
@@ -81,12 +91,13 @@ public:
   void    GetTOFpid(Double_t *p) const;
   UInt_t  GetTOFcluster() const {return fTOFindex;}
   void  SetTOFcluster(UInt_t index) {fTOFindex=index;}
-  
+  Bool_t IsOn(Int_t mask){ return (fFlags&mask)>0;}
   enum {
     kITSin=0x0001,kITSout=0x0002,kITSrefit=0x0004,kITSpid=0x0008,
     kTPCin=0x0010,kTPCout=0x0020,kTPCrefit=0x0040,kTPCpid=0x0080,
     kTRDin=0x0100,kTRDout=0x0200,kTRDrefit=0x0400,kTRDpid=0x0800,
     kTOFin=0x1000,kTOFout=0x2000,kTOFrefit=0x4000,kTOFpid=0x8000,
+    kTRDStop=0x10000,
     kESDpid=0x40000000,
     kTIME=0x80000000
   }; 
@@ -123,21 +134,24 @@ protected:
   Int_t   fITSncls;        // number of clusters assigned in the ITS
   UInt_t  fITSindex[6];    //! indices of the assigned ITS clusters
   Float_t fITSsignal;      // detector's PID signal
-  Float_t fITSr[kSPECIES]; //! "detector response probabilities" (for the PID)
+  Float_t fITSr[kSPECIES]; // "detector response probabilities" (for the PID)
+  Int_t   fITSLabel;       // label according TPC
 
   // TPC related track information
   Float_t fTPCchi2;        // chi2 in the TPC
   Int_t   fTPCncls;        // number of clusters assigned in the TPC
   UInt_t  fTPCindex[180];  //! indices of the assigned TPC clusters
+  TBits   fTPCClusterMap;  // Map of clusters, one bit per padrow; 1 if has a cluster on given padrow
   Float_t fTPCsignal;      // detector's PID signal
   Float_t fTPCr[kSPECIES]; // "detector response probabilities" (for the PID)
-
+  Int_t   fTPCLabel;       // label according TPC
   // TRD related track information
   Float_t fTRDchi2;        // chi2 in the TRD
   Int_t   fTRDncls;        // number of clusters assigned in the TRD
   UInt_t  fTRDindex[90];   //! indices of the assigned TRD clusters
   Float_t fTRDsignal;      // detector's PID signal
-  Float_t fTRDr[kSPECIES]; //! "detector response probabilities" (for the PID)
+  Float_t fTRDr[kSPECIES]; // "detector response probabilities" (for the PID)
+  Int_t   fTRDLabel;       // label according TRD
 
   // TOF related track information
   Float_t fTOFchi2;        // chi2 in the TOF
@@ -147,7 +161,7 @@ protected:
 
   // HMPID related track information
 
-  ClassDef(AliESDtrack,1)  //ESDtrack 
+  ClassDef(AliESDtrack,2)  //ESDtrack 
 };
 
 #endif