X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliExternalTrackParam.h;h=112ffb85baeb97af448228ffcffd415b31b36759;hb=ab557934fe585eff24a4645eb201426baaa5cca5;hp=f35621f73b091735918c78b4022b53d12f97e37d;hpb=67be2d2905fe8ef9255192eaffb5e7899284d286;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliExternalTrackParam.h b/STEER/AliExternalTrackParam.h
index f35621f73b0..112ffb85bae 100644
--- a/STEER/AliExternalTrackParam.h
+++ b/STEER/AliExternalTrackParam.h
@@ -25,8 +25,6 @@
 const Double_t kVeryBig=1./kAlmost0;
 const Double_t kMostProbablePt=0.35;
 
-Double_t ApproximateBetheBloch(Double_t);
-
 class AliVVertex;
 class TPolyMarker3D; 
 
@@ -42,8 +40,14 @@ class AliExternalTrackParam: public AliVTrack {
 			Double_t cv[21],Short_t sign);
   virtual ~AliExternalTrackParam(){}
 
-  void Set(Double_t x,Double_t alpha,
-			const Double_t param[5], const Double_t covar[15]);
+  template <typename T>
+  void Set(T x, T alpha, const T param[5], const T covar[15]) {
+    //  Sets the parameters
+    fX=x; fAlpha=alpha;
+    for (Int_t i = 0; i < 5; i++)  fP[i] = param[i];
+    for (Int_t i = 0; i < 15; i++) fC[i] = covar[i];
+  }
+
   void Set(Double_t xyz[3],Double_t pxpypz[3],Double_t cv[21],Short_t sign);
 
   static void SetMostProbablePt(Double_t pt) { fgMostProbablePt=pt; }
@@ -100,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
@@ -114,17 +118,42 @@ 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; 
   Bool_t CorrectForMeanMaterial(Double_t xOverX0, Double_t xTimesRho, 
         Double_t mass,  Bool_t anglecorr=kFALSE,
-	Double_t (*f)(Double_t)=ApproximateBetheBloch);
+	Double_t (*f)(Double_t)=AliExternalTrackParam::BetheBlochSolid);
+
+  //
+  // Bethe-Bloch formula parameterizations
+  //
+  static Double_t BetheBlochAleph(Double_t bg,
+                                  Double_t kp1=0.76176e-1,
+                                  Double_t kp2=10.632,
+                                  Double_t kp3=0.13279e-4,
+                                  Double_t kp4=1.8631,
+                                  Double_t kp5=1.9479
+				  );
+  static Double_t BetheBlochGeant(Double_t bg,
+                                  Double_t kp0=2.33,
+                                  Double_t kp1=0.20,
+                                  Double_t kp2=3.00,
+                                  Double_t kp3=173e-9,
+                                  Double_t kp4=0.49848
+				  );
+    
+  static Double_t BetheBlochSolid(Double_t bg);
+  static Double_t BetheBlochGas(Double_t bg);
+
   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;
+
+  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);
 
@@ -132,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;
@@ -160,16 +191,19 @@ class AliExternalTrackParam: public AliVTrack {
 
   //Deprecated
   Bool_t CorrectForMaterial(Double_t d, Double_t x0, Double_t mass,
-			    Double_t (*f)(Double_t)=ApproximateBetheBloch);
+	 Double_t (*f)(Double_t)=AliExternalTrackParam::BetheBlochSolid);
 
   Bool_t GetDistance(AliExternalTrackParam *param2, Double_t x, Double_t dist[3], Double_t b);
-  Int_t GetIndex(Int_t i, Int_t j) const {return i+(j+1)*j/2;}
+  Int_t GetIndex(Int_t i, Int_t j) const;
   Int_t GetLabel() const {return -1;} 
   //
   // visualization (M. Ivanov)
   //
   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];}