X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDtrack.h;h=8c96176a570244cab19fa5bfcd7869b3eaf31b95;hb=c712cb2f4fb2f464fc616e692d6a72ce3fabe10a;hp=fd0cd4456714b2435776fb8d3b9ae1d2d38aabb2;hpb=b9d0a01d7a0723a09071b0b56200d72f59a9c2b6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDtrack.h b/TRD/AliTRDtrack.h
index fd0cd445671..8c96176a570 100644
--- a/TRD/AliTRDtrack.h
+++ b/TRD/AliTRDtrack.h
@@ -1,14 +1,19 @@
 #ifndef ALITRDTRACK_H
-#define ALITRDTRACK_H  
+#define ALITRDTRACK_H
 
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */ 
+ * See cxx source for full Copyright notice                               */
 
 #include <AliKalmanTrack.h>
-#include <TMath.h>   
+#include <TMath.h>
+
+#include "AliBarrelTrack.h"
+#include "AliTRDgeometry.h"
+#include "TVector2.h"
 
 class AliTRDcluster;
-class AliTPCtrack; 
+class AliTPCtrack;
+class AliESDtrack;
 
 const unsigned kMAX_CLUSTERS_PER_TRACK=210; 
 
@@ -23,17 +28,23 @@ public:
                const Double_t cc[15], Double_t xr, Double_t alpha);  
    AliTRDtrack(const AliTRDtrack& t);    
    AliTRDtrack(const AliKalmanTrack& t, Double_t alpha); 
+   AliTRDtrack(const AliESDtrack& t);    
 
    Int_t    Compare(const TObject *o) const;
    void     CookdEdx(Double_t low=0.05, Double_t up=0.70);   
 
    Double_t GetAlpha() const {return fAlpha;}
+   Int_t    GetSector() const {
+     //if (fabs(fAlpha) < AliTRDgeometry::GetAlpha()/2) return 0;
+     return Int_t(TVector2::Phi_0_2pi(fAlpha)/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;}
+
    Double_t GetC()     const {return fC;}
    Int_t    GetClusterIndex(Int_t i) const {return fIndex[i];}    
    Float_t  GetClusterdQdl(Int_t i) const {return fdQdl[i];}    
 
    void     GetCovariance(Double_t cov[15]) const;  
-   Float_t  GetdEdx()  const {return fdEdx;}
+   Double_t GetdEdx()  const {return fdEdx;}
+   Double_t GetPIDsignal()  const {return GetdEdx();}
    Double_t GetEta()   const {return fE;}
 
    void     GetExternalCovariance(Double_t cov[15]) const ;   
@@ -41,11 +52,11 @@ public:
 
    Double_t GetLikelihoodElectron() const { return fLhElectron; };
 
-   Double_t Get1Pt()   const {return TMath::Abs(fC*GetConvConst());} 
+   Double_t Get1Pt()   const {return (1e-9*TMath::Abs(fC)/fC + fC)*GetConvConst(); } 
    Double_t GetP()     const {  
      return TMath::Abs(GetPt())*sqrt(1.+GetTgl()*GetTgl());
    }
-   Double_t GetPredictedChi2(const AliTRDcluster*) const ;
+   Double_t GetPredictedChi2(const AliTRDcluster*, Double_t h01) const ;
    Double_t GetPt()    const {return 1./Get1Pt();}   
    void     GetPxPyPz(Double_t &px, Double_t &py, Double_t &pz) const ;
    void     GetGlobalXYZ(Double_t &x, Double_t &y, Double_t &z) const ;
@@ -60,8 +71,7 @@ public:
    Double_t GetY()    const {return fY;}
    Double_t GetZ()    const {return fZ;}
 
-   Int_t    PropagateTo(Double_t xr,
-                   Double_t x0=8.72,Double_t rho=5.86e-3,Double_t pm=0.139);
+   Int_t    PropagateTo(Double_t xr, Double_t x0=8.72, Double_t rho=5.86e-3);
    void     ResetCovariance();   
    Int_t    Rotate(Double_t angle);
 
@@ -76,7 +86,17 @@ public:
 
    void     SetSeedLabel(Int_t lab) { fSeedLab=lab; }
 
-   Int_t    Update(const AliTRDcluster* c, Double_t chi2, UInt_t i);
+   Int_t    Update(const AliTRDcluster* c, Double_t chi2, UInt_t i, 
+                   Double_t h01);
+
+  //
+  void GetBarrelTrack(AliBarrelTrack *track);
+  void AddNWrong() {fNWrong++;}
+  
+  Int_t GetNWrong() const {return fNWrong;}
+  Int_t GetNRotate() const {return fNRotate;}
+  //
+
 
 protected:
 
@@ -86,23 +106,26 @@ protected:
    Double_t fAlpha;       // rotation angle
    Double_t fX;           // running local X-coordinate of the track (time bin)
 
-   Double_t fY;           // Y-coordinate of the track
-   Double_t fZ;           // Z-coordinate of the track
-   Double_t fC;           // track curvature
-   Double_t fE;           // C*x0
-   Double_t fT;           // tangent of the track dip angle   
+
+   Double_t fY;             // Y-coordinate of the track
+   Double_t fZ;             // Z-coordinate of the track
+   Double_t fE;             // C*x0
+   Double_t fT;             // tangent of the track momentum dip angle
+   Double_t fC;             // track curvature
 
    Double_t fCyy;                         // covariance
    Double_t fCzy, fCzz;                   // matrix
-   Double_t fCcy, fCcz, fCcc;             // of the
-   Double_t fCey, fCez, fCec, fCee;       // track
-   Double_t fCty, fCtz, fCtc, fCte, fCtt; // parameters   
-
+   Double_t fCey, fCez, fCee;             // of the
+   Double_t fCty, fCtz, fCte, fCtt;       // track
+   Double_t fCcy, fCcz, fCce, fCct, fCcc; // parameters   
+   
    UInt_t  fIndex[kMAX_CLUSTERS_PER_TRACK];  // global indexes of clusters  
    Float_t fdQdl[kMAX_CLUSTERS_PER_TRACK];   // cluster amplitudes corrected 
                                              // for track angles    
-			   
+                           
    Float_t fLhElectron;    // Likelihood to be an electron    
+   Int_t fNWrong;    // number of wrong clusters
+   Int_t fNRotate;
 
    ClassDef(AliTRDtrack,2) // TRD reconstructed tracks