Changes needed by the updated track references

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

diff --git a/STEER/AliExternalTrackParam.h b/STEER/AliExternalTrackParam.h
index a06eb9511cadede9d407052d11a08284fdcebc85..eb7650deaa044444039b78f1a88e5c8944739450 100644 (file)
--- a/STEER/AliExternalTrackParam.h
+++ b/STEER/AliExternalTrackParam.h
@@ -43,14 +43,12 @@ class AliExternalTrackParam: public TObject {
 
   void Set(Double_t x,Double_t alpha,
                        const Double_t param[5], const Double_t covar[15]);
+
+  static void SetMostProbablePt(Double_t pt) { fgMostProbablePt=pt; }
+  static Double_t GetMostProbablePt() { return fgMostProbablePt; }
+
   void Reset();
-  void ResetCovariance(Double_t s2) {
-    fC[0]*= s2;
-    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]*=s2;
-  }
+  void ResetCovariance(Double_t s2);
 
   const Double_t *GetParameter() const {return fP;}
   const Double_t *GetCovariance() const {return fC;}
@@ -89,9 +87,15 @@ 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,
-                           Double_t (*f)(Double_t)=ApproximateBetheBloch);
+  Bool_t CorrectForMeanMaterial(Double_t xOverX0, Double_t xTimesRho, 
+        Double_t mass, Double_t (*f)(Double_t)=ApproximateBetheBloch);
   Double_t GetPredictedChi2(Double_t p[2],Double_t cov[3]) const;
+
+  Double_t 
+    GetPredictedChi2(Double_t p[3],Double_t covyz[3],Double_t covxyz[3]) const;
+  Bool_t 
+    PropagateTo(Double_t p[3],Double_t covyz[3],Double_t covxyz[3],Double_t b);
+
   Bool_t Update(Double_t p[2],Double_t cov[3]);
   Bool_t Rotate(Double_t alpha);
   Bool_t PropagateTo(Double_t x, Double_t b);
@@ -120,17 +124,34 @@ class AliExternalTrackParam: public TObject {
   void Print(Option_t* option = "") const;
   Double_t GetSnpAt(Double_t x,Double_t b) const;
 
+  //Deprecated
+  Bool_t CorrectForMaterial(Double_t d, Double_t x0, Double_t mass,
+                           Double_t (*f)(Double_t)=ApproximateBetheBloch);
+
 protected:
   Double_t &Par(Int_t i) {return fP[i];}
   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
-
-  ClassDef(AliExternalTrackParam, 4)
+  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
+
+  static Double32_t    fgMostProbablePt; // "Most probable" pt
+                                         // (to be used if Bz=0)
+  ClassDef(AliExternalTrackParam, 6)
 };
 
+inline void AliExternalTrackParam::ResetCovariance(Double_t s2) {
+  //
+  // Reset the covarince matrix to "something big"
+  //
+    fC[0]*= s2;
+    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]*=s2;
+}
+
 #endif