Getting bfield from common file; AliL3Defs.h

diff --git a/HLT/src/AliL3ConfMapFit.cxx b/HLT/src/AliL3ConfMapFit.cxx
index a7381632377910d194bac9a3479f6e2d34307fb3..4478370182a3536b50749f9161eff0eba3f5df28 100644 (file)
--- a/HLT/src/AliL3ConfMapFit.cxx
+++ b/HLT/src/AliL3ConfMapFit.cxx
@@ -1,8 +1,11 @@
+//$Id$
+
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
 #include <math.h>
 
+#include "AliL3Defs.h"
 #include "AliL3Logging.h"
 #include "AliL3ConfMapFit.h"
 #include "AliL3Vertex.h"
@@ -24,7 +27,6 @@ AliL3ConfMapFit::AliL3ConfMapFit(AliL3ConfMapTrack *track,AliL3Vertex *vertex)
   fTrack = track;
   fVertex = vertex;
   BFACT = 0.0029980;
-  bField = 0.2;
   
 }
 
@@ -371,7 +373,7 @@ Int_t AliL3ConfMapFit::FitCircle()
   psi  = psi + q * 0.5F * pi ;
   if ( psi < 0 ) psi = psi + 2*pi;
   
-  pt   = (Double_t)(BFACT * bField * radius ) ;
+  pt   = (Double_t)(BFACT * BField * radius ) ;
   fTrack->SetPsi(psi);
   fTrack->SetPt(pt);
 
@@ -401,7 +403,7 @@ Int_t AliL3ConfMapFit::FitLine ( )
   //find sum , sums ,sumz, sumss 
   // 
   Double_t dx, dy ;
-  Double_t radius = (Double_t)(fTrack->GetPt() / ( BFACT * bField ) ) ;
+  Double_t radius = (Double_t)(fTrack->GetPt() / ( BFACT * BField ) ) ;
 
   //TObjArray *hits = fTrack->GetHits();
   //Int_t num_of_hits = fTrack->GetNumberOfPoints();

diff --git a/HLT/src/AliL3ConfMapFit.h b/HLT/src/AliL3ConfMapFit.h
index 8cfb69a21b34b56901b43fed684236f4b26fbffb..40c7d770c9fb42d285bdb3ac6b03eb294396d040 100644 (file)
--- a/HLT/src/AliL3ConfMapFit.h
+++ b/HLT/src/AliL3ConfMapFit.h
@@ -12,8 +12,7 @@ class AliL3ConfMapFit {
   AliL3ConfMapTrack *fTrack; //!
   AliL3Vertex *fVertex; //!
   Double_t BFACT;
-  Double_t bField;
-
+  
   static Double_t pi;
 
  public:

diff --git a/HLT/src/AliL3ConfMapTrack.cxx b/HLT/src/AliL3ConfMapTrack.cxx
index 2a7835b8dfe146a24cf316226f97e4f1af6aadd0..ec0f246956c445fabc801475905cfc41aa6be8ec 100644 (file)
--- a/HLT/src/AliL3ConfMapTrack.cxx
+++ b/HLT/src/AliL3ConfMapTrack.cxx
@@ -1,6 +1,9 @@
+//$Id$
+
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ASV 
 
+#include "AliL3Defs.h"
 #include "AliL3RootTypes.h"
 #include "AliL3Logging.h"
 #include "AliL3Vertex.h"
@@ -162,8 +165,8 @@ void AliL3ConfMapTrack::Fill(AliL3Vertex *vertex,Double_t max_Dca)
   Double_t radius = sqrt(a2Xy*a2Xy+1)/(2*fabs(a1Xy));
   SetRadius(radius);
 
-  //fPt = (Double_t)(BFACT * bField * fRadius);
-  Double_t pt = (Double_t)(BFACT * bField * GetRadius());
+  //fPt = (Double_t)(BFACT * BField * fRadius);
+  Double_t pt = (Double_t)(BFACT * BField * GetRadius());
   SetPt(pt);
 
   if(GetPt() > max_Dca) //go for fit of helix in real space
@@ -201,7 +204,7 @@ void AliL3ConfMapTrack::UpdateToFirstPoint()
   Double_t tPhi0 = GetPsi() + GetCharge() * 0.5 * pi / fabs(GetCharge()) ;
   Double_t x0    = GetR0() * cos(GetPhi0()) ;
   Double_t y0    = GetR0() * sin(GetPhi0()) ;
-  Double_t rc    = fabs(GetPt()) / ( BFACT * bField )  ;
+  Double_t rc    = fabs(GetPt()) / ( BFACT * BField )  ;
   Double_t xc    = x0 - rc * cos(tPhi0) ;
   Double_t yc    = y0 - rc * sin(tPhi0) ;
   

diff --git a/HLT/src/AliL3Defs.h b/HLT/src/AliL3Defs.h
index e34faeb2b71627088c864d222cdd86c37e18b13e..e2fef9ddc2d7ce7a020ab10733f0745cb4707c31 100644 (file)
--- a/HLT/src/AliL3Defs.h
+++ b/HLT/src/AliL3Defs.h
@@ -3,9 +3,9 @@
 
 #include "AliL3RootTypes.h"
 
-const Int_t NRows[5][2] = {{ 0, 45},{46,77},{78,109},{110,141},{142,175}};
+//const Int_t NRows[5][2] = {{ 0, 45},{46,77},{78,109},{110,141},{142,175}};
 const Double_t Pi = 3.14159265358979323846;
 const Double_t ToRad = Pi/180.;
-
+const Double_t BField = 0.4;
 
 #endif /* _ALIL3DEFS_H_ */