DP:Misalignment of CPV added

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

diff --git a/STEER/AliExternalTrackParam.h b/STEER/AliExternalTrackParam.h
index 7a6f6b136008b13391727c0ad39e88aa0d6e556d..fbf32af269c2196a557d1de8e177e693577118aa 100644 (file)
--- a/STEER/AliExternalTrackParam.h
+++ b/STEER/AliExternalTrackParam.h
@@ -27,11 +27,12 @@ const Double_t kVeryBig=1./kAlmost0;
 
 const Double_t kB2C=0.299792458e-3;
 const Double_t kAlmost0Field=1.e-13;
-const Double_t kVeryBigConvConst=1/kB2C/kAlmost0Field;
-const Double_t kMostProbableMomentum=0.35;
+const Double_t kMostProbablePt=0.35;
 
 class AliESDVertex;
 
+Double_t ApproximateBetheBloch(Double_t);
+
 class AliExternalTrackParam: public TObject {
  public:
   AliExternalTrackParam();
@@ -48,7 +49,7 @@ class AliExternalTrackParam: public TObject {
     fC[1] = 0.;  fC[2]*= s2;
     fC[3] = 0.;  fC[4] = 0.;  fC[5]*= s2;
     fC[6] = 0.;  fC[7] = 0.;  fC[8] = 0.;  fC[9]*= s2;
-    fC[10]= 0.;  fC[11]= 0.;  fC[12]= 0.;  fC[13]= 0.;  fC[14]*=10.;
+    fC[10]= 0.;  fC[11]= 0.;  fC[12]= 0.;  fC[13]= 0.;  fC[14]*=s2;
   }
 
   const Double_t *GetParameter() const {return fP;}
@@ -88,7 +89,8 @@ class AliExternalTrackParam: public TObject {
   void GetDZ(Double_t x,Double_t y,Double_t z,Double_t b,Float_t dz[2]) const; 
   Double_t GetD(Double_t xv, Double_t yv, Double_t b) const; 
   Double_t GetLinearD(Double_t xv, Double_t yv) const; 
-  Bool_t CorrectForMaterial(Double_t d, Double_t x0, Double_t mass);
+  Bool_t CorrectForMaterial(Double_t d, Double_t x0, Double_t mass,
+                           Double_t (*f)(Double_t)=ApproximateBetheBloch);
   Double_t GetPredictedChi2(Double_t p[2],Double_t cov[3]) const;
   Bool_t Update(Double_t p[2],Double_t cov[3]);
   Bool_t Rotate(Double_t alpha);
@@ -98,6 +100,8 @@ class AliExternalTrackParam: public TObject {
       if (PropagateTo(x,b)) return kTRUE;
     return kFALSE;
   }
+  void   Propagate(Double_t len,Double_t x[3],Double_t p[3],Double_t bz) const;
+  Bool_t Intersect(Double_t pnt[3], Double_t norm[3], Double_t bz) const;
 
   void GetHelixParameters(Double_t h[6], Double_t b) const;
   Double_t GetDCA(const AliExternalTrackParam *p, Double_t b,
@@ -105,6 +109,7 @@ class AliExternalTrackParam: public TObject {
   Double_t PropagateToDCA(AliExternalTrackParam *p, Double_t b);
   Bool_t PropagateToDCA(const AliESDVertex *vtx, Double_t b, Double_t maxd);
 
+  void GetDirection(Double_t d[3]) const;
   Bool_t GetPxPyPz(Double_t *p) const;
   Bool_t GetXYZ(Double_t *p) const;
   Bool_t GetCovarianceXYZPxPyPz(Double_t cv[21]) const;
@@ -120,12 +125,12 @@ protected:
   Double_t &Cov(Int_t i) {return fC[i];}
 
 private:
-  Double_t             fX;     // X coordinate for the point of parametrisation
-  Double_t             fAlpha; // Local <-->global coor.system rotation angle
-  Double_t             fP[5];  // The track parameters
-  Double_t             fC[15]; // The track parameter covariance matrix
+  Double32_t           fX;     // X coordinate for the point of parametrisation
+  Double32_t           fAlpha; // Local <-->global coor.system rotation angle
+  Double32_t           fP[5];  // The track parameters
+  Double32_t           fC[15]; // The track parameter covariance matrix
 
-  ClassDef(AliExternalTrackParam, 4)
+  ClassDef(AliExternalTrackParam, 5)
 };
 
 #endif