Minor changes (Yu.Belikov)

diff --git a/STEER/AliExternalTrackParam.cxx b/STEER/AliExternalTrackParam.cxx
index 3d6859fbb0265846cfb69b634da12678a09cc5fc..6861b0b1a64f823dc6b1814af8c34d93b40f9b48 100644 (file)
--- a/STEER/AliExternalTrackParam.cxx
+++ b/STEER/AliExternalTrackParam.cxx
@@ -195,7 +195,8 @@ CorrectForMaterial(Double_t d,  Double_t x0, Double_t mass) {
   Double_t &fC43=fC[13];
   Double_t &fC44=fC[14];
 
-  Double_t p2=(1.+ fP3*fP3)/(fP4*fP4);
+  Double_t p=GetP();
+  Double_t p2=p*p;
   Double_t beta2=p2/(p2 + mass*mass);
   d*=TMath::Sqrt((1.+ fP3*fP3)/(1.- fP2*fP2));
 

diff --git a/STEER/AliExternalTrackParam.h b/STEER/AliExternalTrackParam.h
index 7a6f6b136008b13391727c0ad39e88aa0d6e556d..6bbc7d9d3aa57b9c023f2a30b02b5fde894567c6 100644 (file)
--- a/STEER/AliExternalTrackParam.h
+++ b/STEER/AliExternalTrackParam.h
@@ -27,8 +27,7 @@ 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;
 
@@ -48,7 +47,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;}

diff --git a/STEER/AliTracker.cxx b/STEER/AliTracker.cxx
index 75d16017ad040f577d2c690b1156d1d6790aa833..e0262c5125fa01f54e600624bc7c7b7ee81cc40d 100644 (file)
--- a/STEER/AliTracker.cxx
+++ b/STEER/AliTracker.cxx
@@ -23,12 +23,13 @@
 #include <TClass.h>
 #include <TMath.h>
 
+#include "AliMagF.h"
 #include "AliTracker.h"
 #include "AliCluster.h"
 #include "AliKalmanTrack.h"
 
 Bool_t AliTracker::fgUniformField=kTRUE;
-Double_t AliTracker::fgBz=0.;
+Double_t AliTracker::fgBz=kAlmost0Field;
 const AliMagF *AliTracker::fgkFieldMap=0;
 
 ClassImp(AliTracker)
@@ -83,7 +84,7 @@ void AliTracker::SetFieldMap(const AliMagF* map, Bool_t uni) {
   //Double_t bz=-b[2];
  
   Double_t bz=-map->SolenoidField();
-  fgBz=TMath::Sign(1e-13,bz) + bz;
+  fgBz=TMath::Sign(kAlmost0Field,bz) + bz;
 
 }
 
@@ -147,3 +148,12 @@ void AliTracker::UseClusters(const AliKalmanTrack *t, Int_t from) const {
      c->Use();   
   }
 }
+
+Double_t AliTracker::GetBz(Float_t *r) {
+  //------------------------------------------------------------------
+  // Returns Bz (kG) at the point "r" .
+  //------------------------------------------------------------------
+    Float_t b[3]; fgkFieldMap->Field(r,b);
+    Double_t bz=-Double_t(b[2]);
+    return  (TMath::Sign(kAlmost0Field,bz) + bz);
+}

diff --git a/STEER/AliTracker.h b/STEER/AliTracker.h
index 9995ccd651d9a640e53365ef90f15c8eeeda4dd2..0b5fbdf8cd6c99de60f56cfc1f4b29015ee81da8 100644 (file)
--- a/STEER/AliTracker.h
+++ b/STEER/AliTracker.h
@@ -11,8 +11,8 @@
 //       Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
 #include <TObject.h>
-#include "AliMagF.h"
 
+class AliMagF;
 class AliCluster;
 class TTree;
 class AliKalmanTrack;
@@ -47,11 +47,7 @@ public:
 
   static void SetFieldMap(const AliMagF* map, Bool_t uni);
   static const AliMagF *GetFieldMap() {return fgkFieldMap;}
-  static Double_t GetBz(Float_t *r) {
-    Float_t b[3]; fgkFieldMap->Field(r,b);
-    Double_t bz=-Double_t(b[2]);
-    return  (TMath::Sign(1e-13,bz) + bz);
-  }
+  static Double_t GetBz(Float_t *r); 
   static Double_t GetBz(Double_t *r) {
     Float_t rr[]={r[0],r[1],r[2]};
     return GetBz(rr);