Moved all the constants from AliL3Defs.h to static AliL3Transform. No

[u/mrichter/AliRoot.git] / HLT / src / AliL3Track.cxx

diff --git a/HLT/src/AliL3Track.cxx b/HLT/src/AliL3Track.cxx
index 17a56e860d3d6d912bb510205ef7edc0ddf89761..10737eec8f730d6d034db69f803a9bac40834124 100644 (file)
--- a/HLT/src/AliL3Track.cxx
+++ b/HLT/src/AliL3Track.cxx
@@ -17,6 +17,11 @@
 // AliL3Track
 //
 // Track base class
+//Begin_Html
+/*
+<img src="track_coordinates.gif">
+*/
+//End_Html
 
 ClassImp(AliL3Track)
 
@@ -105,22 +110,21 @@ void AliL3Track::Rotate(Int_t slice,Bool_t tolocal)
   //If flag tolocal is set, the track is rotated
   //to local coordinates.
 
-  AliL3Transform *transform = new AliL3Transform();
   
   Float_t psi[1] = {GetPsi()};
   if(!tolocal)
-    transform->Local2GlobalAngle(psi,slice);
+    AliL3Transform::Local2GlobalAngle(psi,slice);
   else
-    transform->Global2LocalAngle(psi,slice);
+    AliL3Transform::Global2LocalAngle(psi,slice);
   SetPsi(psi[0]);
   Float_t first[3];
   first[0] = GetFirstPointX();
   first[1] = GetFirstPointY();
   first[2] = GetFirstPointZ();
   if(!tolocal)
-    transform->Local2Global(first,slice);
+    AliL3Transform::Local2Global(first,slice);
   else
-    transform->Global2Local(first,slice,kTRUE);
+    AliL3Transform::Global2Local(first,slice,kTRUE);
   
   SetFirstPoint(first[0],first[1],first[2]);
   Float_t last[3];
@@ -128,16 +132,16 @@ void AliL3Track::Rotate(Int_t slice,Bool_t tolocal)
   last[1] = GetLastPointY();
   last[2] = GetLastPointZ();
   if(!tolocal)
-    transform->Local2Global(last,slice);
+    AliL3Transform::Local2Global(last,slice);
   else
-    transform->Global2Local(last,slice,kTRUE);
+    AliL3Transform::Global2Local(last,slice,kTRUE);
   SetLastPoint(last[0],last[1],last[2]);
   
   Float_t center[3] = {GetCenterX(),GetCenterY(),0};
   if(!tolocal)
-    transform->Local2Global(center,slice);
+    AliL3Transform::Local2Global(center,slice);
   else
-    transform->Global2Local(center,slice,kTRUE);
+    AliL3Transform::Global2Local(center,slice,kTRUE);
   SetCenterX(center[0]);
   SetCenterY(center[1]);
   
@@ -145,14 +149,13 @@ void AliL3Track::Rotate(Int_t slice,Bool_t tolocal)
     fIsLocal=kFALSE;
   else
     fIsLocal=kTRUE;
-  delete transform;
 }
 
 void AliL3Track::CalculateHelix(){
   //Calculate Radius, CenterX and Centery from Psi, X0, Y0
   //
   
-  fRadius = fPt / (BFACT*BField);
+  fRadius = fPt / (BFACT*AliL3Transform::GetBField());
   if(fRadius) fKappa = -fQ*1./fRadius;
   else fRadius = 999999;  //just zero
   Double_t trackPhi0 = fPsi + fQ *0.5 * pi;
@@ -193,15 +196,13 @@ Bool_t AliL3Track::GetCrossingPoint(Int_t padrow,Float_t *xyz)
 {
   //Assumes the track is given in local coordinates
 
-  AliL3Transform *transform = new AliL3Transform();
-  
   if(!IsLocal())
     {
       printf("GetCrossingPoint: Track is given on global coordinates\n");
       return false;
     }
   
-  Double_t xHit = transform->Row2X(padrow);
+  Double_t xHit = AliL3Transform::Row2X(padrow);
 
   xyz[0] = xHit;
   Double_t aa = (xHit - GetCenterX())*(xHit - GetCenterX());
@@ -217,23 +218,22 @@ Bool_t AliL3Track::GetCrossingPoint(Int_t padrow,Float_t *xyz)
   
   Double_t yHit = xyz[1];
   Double_t angle1 = atan2((yHit - GetCenterY()),(xHit - GetCenterX()));
-  if(angle1 < 0) angle1 += 2.*Pi;
+  if(angle1 < 0) angle1 += 2.*AliL3Transform::Pi();
   Double_t angle2 = atan2((GetFirstPointY() - GetCenterY()),(GetFirstPointX() - GetCenterX()));
-  if(angle2 < 0) angle2 += 2.*Pi;
+  if(angle2 < 0) angle2 += 2.*AliL3Transform::Pi();
   Double_t diff_angle = angle1 - angle2;
-  diff_angle = fmod(diff_angle,2*Pi);
-  if((GetCharge()*diff_angle) > 0) diff_angle = diff_angle - GetCharge()*2.*Pi;
+  diff_angle = fmod(diff_angle,2*AliL3Transform::Pi());
+  if((GetCharge()*diff_angle) > 0) diff_angle = diff_angle - GetCharge()*2.*AliL3Transform::Pi();
   Double_t s_tot = fabs(diff_angle)*GetRadius();
   Double_t zHit = GetFirstPointZ() + s_tot*GetTgl();
   xyz[2] = zHit;
   
-  delete transform;
   return true;
 }
 
 
 Bool_t AliL3Track::CalculateReferencePoint(Double_t angle,Double_t radius){
-  // Global coordinate: crossing point with y = ax+ b; a=tan(angle-Pi/2);
+  // Global coordinate: crossing point with y = ax+ b; a=tan(angle-AliL3Transform::Pi()/2);
   //
   const Double_t rr=radius;//132; //position of referece plane
   const Double_t xr = cos(angle) *rr;
@@ -409,15 +409,15 @@ void AliL3Track::GetClosestPoint(AliL3Vertex *vertex,Double_t &closest_x,Double_
   
   //Get the z coordinate:
   Double_t angle1 = atan2((closest_y-GetCenterY()),(closest_x-GetCenterX()));
-  if(angle1 < 0) angle1 = angle1 + 2*Pi;
+  if(angle1 < 0) angle1 = angle1 + 2*AliL3Transform::Pi();
  
   Double_t angle2 = atan2((GetFirstPointY()-GetCenterY()),(GetFirstPointX()-GetCenterX()));
-  if(angle2 < 0) angle2 = angle2 + 2*Pi;
+  if(angle2 < 0) angle2 = angle2 + 2*AliL3Transform::Pi();
   
   Double_t diff_angle = angle1 - angle2;
-  diff_angle = fmod(diff_angle,2*Pi);
+  diff_angle = fmod(diff_angle,2*AliL3Transform::Pi());
   
-  if((GetCharge()*diff_angle) < 0) diff_angle = diff_angle + GetCharge()*2*Pi;
+  if((GetCharge()*diff_angle) < 0) diff_angle = diff_angle + GetCharge()*2*AliL3Transform::Pi();
   Double_t s_tot = fabs(diff_angle)*GetRadius();
   
   closest_z = GetFirstPointZ() - s_tot*GetTgl();