Fix for Savannah bug report 59287

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

diff --git a/STEER/AliExternalTrackParam.h b/STEER/AliExternalTrackParam.h
index 86b49026041bb51d245b623e41abc411adb7efdf..112ffb85baeb97af448228ffcffd415b31b36759 100644 (file)
--- a/STEER/AliExternalTrackParam.h
+++ b/STEER/AliExternalTrackParam.h
@@ -104,7 +104,7 @@ class AliExternalTrackParam: public AliVTrack {
   virtual Double_t M() const;
   Double_t Eta() const;
   virtual Double_t Y() const;
-  Short_t  Charge() const { return (Short_t)GetSign(); }
+  virtual Short_t  Charge() const { return (Short_t)GetSign(); }
   virtual const Double_t *PID() const { return 0x0; }
 
   // additional functions from AliVTrack
@@ -118,7 +118,7 @@ class AliExternalTrackParam: public AliVTrack {
     return (TMath::Abs(fP[4])>kAlmost0) ? 1./fP[4]:TMath::Sign(kVeryBig,fP[4]);
   }
   Double_t Get1P() const;
-  Double_t GetC(Double_t b) const {return fP[4]*b*kB2C;}
+  virtual Double_t GetC(Double_t b) const {return fP[4]*b*kB2C;}
   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; 
@@ -151,6 +151,9 @@ class AliExternalTrackParam: public AliVTrack {
 
   Double_t 
     GetPredictedChi2(Double_t p[3],Double_t covyz[3],Double_t covxyz[3]) const;
+
+  Double_t GetPredictedChi2(const AliExternalTrackParam *t) const;
+
   Bool_t 
     PropagateTo(Double_t p[3],Double_t covyz[3],Double_t covxyz[3],Double_t b);
 
@@ -158,20 +161,22 @@ class AliExternalTrackParam: public AliVTrack {
   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);
-  Bool_t Propagate(Double_t alpha, Double_t x, Double_t b) {
-    if (Rotate(alpha))
-      if (PropagateTo(x,b)) return kTRUE;
-    return kFALSE;
-  }
+  Bool_t Propagate(Double_t alpha, Double_t x, Double_t b);
+  Bool_t PropagateBxByBz(Double_t alpha, Double_t x, Double_t b[3]);
   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;
 
+  static void g3helx3(Double_t qfield, Double_t step, Double_t vect[7]); 
+  Bool_t PropagateToBxByBz(Double_t x, const Double_t b[3]);
+
   void GetHelixParameters(Double_t h[6], Double_t b) const;
   Double_t GetDCA(const AliExternalTrackParam *p, Double_t b,
     Double_t &xthis,Double_t &xp) const;
   Double_t PropagateToDCA(AliExternalTrackParam *p, Double_t b);
   Bool_t PropagateToDCA(const AliVVertex *vtx, Double_t b, Double_t maxd,
                         Double_t dz[2]=0, Double_t cov[3]=0);
+  Bool_t PropagateToDCABxByBz(const AliVVertex *vtx, Double_t b[3], 
+         Double_t maxd, Double_t dz[2]=0, Double_t cov[3]=0);
   
   void GetDirection(Double_t d[3]) const;
   Bool_t GetPxPyPz(Double_t *p) const;
@@ -196,6 +201,9 @@ class AliExternalTrackParam: public AliVTrack {
   //
   virtual void FillPolymarker(TPolyMarker3D *pol, Float_t magf, Float_t minR, Float_t maxR, Float_t stepR);
   virtual void DrawTrack(Float_t magF, Float_t minR, Float_t maxR, Float_t stepR);
+
+  virtual Bool_t Translate(Double_t *vTrasl,Double_t *covV);
+
  protected:
   Double_t &Par(Int_t i) {return fP[i];}
   Double_t &Cov(Int_t i) {return fC[i];}