Forgot to remove #include in previous checkin

diff --git a/HLT/hough/AliL3Hough.cxx b/HLT/hough/AliL3Hough.cxx
index 223e737e47d62b5777936674e95834009b7b9337..70385e31129ef7af82cb874b7834ba23ff9a8fa1 100644 (file)
--- a/HLT/hough/AliL3Hough.cxx
+++ b/HLT/hough/AliL3Hough.cxx
@@ -22,7 +22,6 @@
 #include "AliL3DigitData.h"
 #include "AliL3HoughEval.h"
 #include "AliL3Transform.h"
-#include "AliL3Defs.h"
 #include "AliL3TrackArray.h"
 #include "AliL3HoughTrack.h"
 
@@ -115,9 +114,9 @@ void AliL3Hough::CleanUp()
 
 void AliL3Hough::Init()
 {
-  fPeakThreshold = 0;
-  fNPatches = NPatches;
   AliL3Transform::Init(fPath);
+  fPeakThreshold = 0;
+  fNPatches = AliL3Transform::GetNPatches();
   fHoughTransformer = new AliL3HoughBaseTransformer*[fNPatches];
 #ifdef use_aliroot
   fMemHandler = new AliL3FileHandler*[fNPatches];
@@ -188,7 +187,8 @@ void AliL3Hough::ReadData(Int_t slice)
       else //read data from root file
        {
 #ifdef use_aliroot
-         fMemHandler[i]->Init(slice,i,NRows[i]);
+         const Int_t rows[2] = {AliL3Transform::GetFirstRow(i),AliL3Transform::GetLastRow(i)};
+         fMemHandler[i]->Init(slice,i,rows);
          digits=(AliL3DigitRowData *)fMemHandler[i]->AliDigits2Memory(ndigits); 
 #else
          cerr<<"You cannot read from rootfile now"<<endl;
@@ -337,7 +337,7 @@ void AliL3Hough::FindTrackCandidates()
              track->SetTrackParameters(x[k],y[k],weight[k]);
              track->SetEtaIndex(j);
              track->SetEta((Double_t)(j*eta_slice));
-             track->SetRowRange(NRows[0][0],NRows[5][1]);
+             track->SetRowRange(AliL3Transform::GetFirstRow(0),AliL3Transform::GetLastRow(5));
            }
        }
       fTracks[i]->QSort();
@@ -381,7 +381,7 @@ void AliL3Hough::Evaluate(Int_t road_width)
          if(!fEval[i]->LookInsideRoad(track,track->GetEtaIndex()))
            tracks->Remove(j);
          if(fAddHistograms)
-           track->SetRowRange(NRows[0][0],NRows[5][1]);//All rows included
+           track->SetRowRange(AliL3Transform::GetFirstRow(0),AliL3Transform::GetLastRow(5));//All rows included
        }
       tracks->Compress();
       tracks->QSort(); //Sort the tracks according to weight

diff --git a/HLT/hough/AliL3HoughBaseTransformer.cxx b/HLT/hough/AliL3HoughBaseTransformer.cxx
index dc7fd05e11ad4859f61c7fa0d7c7581b870f84a0..28cd6e1b64b5f91ed337db6276a64bdec1d9ddf3 100644 (file)
--- a/HLT/hough/AliL3HoughBaseTransformer.cxx
+++ b/HLT/hough/AliL3HoughBaseTransformer.cxx
@@ -6,7 +6,6 @@
 #include "AliL3MemHandler.h"
 #include "AliL3Logging.h"
 #include "AliL3HoughBaseTransformer.h"
-#include "AliL3Defs.h"
 #include "AliL3DigitData.h"
 #include "AliL3Histogram.h"
 

diff --git a/HLT/hough/AliL3HoughEval.cxx b/HLT/hough/AliL3HoughEval.cxx
index fbb5bb8aa160a006d9a9a8de8766d178d20e1d76..cacef4d7a0ce0dbab5a06a18c52cb7c5b77cc490 100644 (file)
--- a/HLT/hough/AliL3HoughEval.cxx
+++ b/HLT/hough/AliL3HoughEval.cxx
@@ -20,7 +20,6 @@
 #include "AliL3Transform.h"
 #include "AliL3Histogram.h"
 #include "AliL3Histogram1D.h"
-#include "AliL3Defs.h"
 
 //_____________________________________________________________
 // AliL3HoughEval
@@ -56,7 +55,7 @@ void AliL3HoughEval::InitTransformer(AliL3HoughBaseTransformer *transformer)
   fHoughTransformer = transformer;
   fSlice = fHoughTransformer->GetSlice();
   fPatch = fHoughTransformer->GetPatch();
-  fNrows = NRows[fPatch][1] - NRows[fPatch][0] + 1;
+  fNrows = AliL3Transform::GetLastRow(fPatch) - AliL3Transform::GetFirstRow(fPatch) + 1;
   fNEtaSegments = fHoughTransformer->GetNEtaSegments();
   fEtaMin = fHoughTransformer->GetEtaMin();
   fEtaMax = fHoughTransformer->GetEtaMax();
@@ -74,9 +73,9 @@ void AliL3HoughEval::GenerateLUT()
   if(!tempPt)
     printf("\nAliL3HoughEval::GenerateLUT : Zero data pointer\n");
   
-  for(Int_t i=NRows[fPatch][0]; i<=NRows[fPatch][1]; i++)
+  for(Int_t i=AliL3Transform::GetFirstRow(fPatch); i<=AliL3Transform::GetLastRow(fPatch); i++)
     {
-      Int_t prow = i - NRows[fPatch][0];
+      Int_t prow = i - AliL3Transform::GetFirstRow(fPatch);
       fRowPointers[prow] = tempPt;
       AliL3MemHandler::UpdateRowPointer(tempPt);
     }
@@ -99,7 +98,7 @@ Bool_t AliL3HoughEval::LookInsideRoad(AliL3HoughTrack *track,Int_t eta_index,Boo
 
   //Check if the track is leaving the sector at some point
   Float_t maxrow=300;
-  Double_t angle=Pi/18;
+  Double_t angle=AliL3Transform::Pi()/18;
   track->CalculateEdgePoint(angle);
   if(!track->IsPoint())
     {
@@ -110,11 +109,11 @@ Bool_t AliL3HoughEval::LookInsideRoad(AliL3HoughTrack *track,Int_t eta_index,Boo
   else
     maxrow = track->GetPointX();
 
-  for(Int_t padrow = NRows[fPatch][0]; padrow <= NRows[fPatch][1]; padrow++)
+  for(Int_t padrow = AliL3Transform::GetFirstRow(fPatch); padrow <= AliL3Transform::GetLastRow(fPatch); padrow++)
     {
       if(AliL3Transform::Row2X(padrow) > maxrow) break;//The track has left this slice
       rows_crossed++;
-      Int_t prow = padrow - NRows[fPatch][0];
+      Int_t prow = padrow - AliL3Transform::GetFirstRow(fPatch);
       if(!track->GetCrossingPoint(padrow,xyz))  
        {
          //printf("AliL3HoughEval::LookInsideRoad : Track does not cross line!!; pt %f phi0 %f\n",track->GetPt(),track->GetPhi0());
@@ -170,7 +169,7 @@ Bool_t AliL3HoughEval::LookInsideRoad(AliL3HoughTrack *track,Int_t eta_index,Boo
       track->SetEtaIndex(eta_index);
       track->SetWeight(total_charge,kTRUE);
       track->SetEta(eta_track);
-      track->SetRowRange(NRows[fPatch][0],NRows[fPatch][1]);
+      track->SetRowRange(AliL3Transform::GetFirstRow(fPatch),AliL3Transform::GetLastRow(fPatch));
       track->SetSlice(fSlice);
       if(fRemoveFoundTracks)
        LookInsideRoad(track,eta_index,kTRUE);
@@ -201,9 +200,9 @@ void AliL3HoughEval::FindEta(AliL3TrackArray *tracks)
     {
       AliL3HoughTrack *track = (AliL3HoughTrack*)tracks->GetCheckedTrack(ntr);
       if(!track) continue;
-      for(Int_t padrow = NRows[fPatch][0]; padrow <= NRows[fPatch][1]; padrow++)
+      for(Int_t padrow = AliL3Transform::GetFirstRow(fPatch); padrow <= AliL3Transform::GetLastRow(fPatch); padrow++)
        {
-         Int_t prow = padrow - NRows[fPatch][0];
+         Int_t prow = padrow - AliL3Transform::GetFirstRow(fPatch);
          
          if(!track->GetCrossingPoint(padrow,xyz))  
            {
@@ -280,9 +279,9 @@ void AliL3HoughEval::DisplayEtaSlice(Int_t eta_index,AliL3Histogram *hist)
     }
   
   Double_t etaslice = (fEtaMax - fEtaMin)/fNEtaSegments;
-  for(Int_t padrow = NRows[fPatch][0]; padrow <= NRows[fPatch][1]; padrow++)
+  for(Int_t padrow = AliL3Transform::GetFirstRow(fPatch); padrow <= AliL3Transform::GetLastRow(fPatch); padrow++)
     {
-      Int_t prow = padrow - NRows[fPatch][0];
+      Int_t prow = padrow - AliL3Transform::GetFirstRow(fPatch);
                   
       AliL3DigitRowData *tempPt = fRowPointers[prow];
       if(!tempPt) 

diff --git a/HLT/hough/AliL3HoughMerger.cxx b/HLT/hough/AliL3HoughMerger.cxx
index cfc6c094502c3f5b9a0d51ba1f0c565d427491c4..451d6590f2b08248a93a0d1a12b9c09df6454cd7 100644 (file)
--- a/HLT/hough/AliL3HoughMerger.cxx
+++ b/HLT/hough/AliL3HoughMerger.cxx
@@ -4,7 +4,6 @@
 #include <math.h>
 #include <stdlib.h>
 #include "AliL3Logging.h"
-#include "AliL3Defs.h"
 #include "AliL3Transform.h"
 #include "AliL3TrackArray.h"
 #include "AliL3HoughTrack.h"
@@ -148,8 +147,8 @@ void AliL3HoughMerger::Merge()
     AliL3TrackArray *tout = GetOutTracks();
     if(i==subsec) tout = GetInTracks(subsec+1);
     AliL3TrackArray *tin = GetInTracks(i);
-    Double_t xval = AliL3Transform::Row2X(NRows[i][1]);
-    Double_t xmax = AliL3Transform::Row2X(NRows[i+1][1]);
+    Double_t xval = AliL3Transform::Row2X(AliL3Transform::GetLastRow(i));
+    Double_t xmax = AliL3Transform::Row2X(AliL3Transform::GetLastRow(i+1));
     Double_t ymax = xval*tan(edge0);
     for(Int_t out=0;out<tout->GetNTracks();out++){
       AliL3Track *outtrack=tout->GetCheckedTrack(out);

diff --git a/HLT/hough/AliL3HoughTrack.cxx b/HLT/hough/AliL3HoughTrack.cxx
index 3fc41f0b97cb3b72d63feb42c7304666da6638e8..57b4bf309a94f29e8da1d113f2da9665006512db 100644 (file)
--- a/HLT/hough/AliL3HoughTrack.cxx
+++ b/HLT/hough/AliL3HoughTrack.cxx
@@ -6,7 +6,6 @@
 #include <math.h>
 
 #include "AliL3Logging.h"
-#include "AliL3Defs.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3Transform.h"
 
@@ -79,7 +78,7 @@ void AliL3HoughTrack::SetEta(Double_t f)
 
   fEta = f;
   Double_t theta = 2*atan(exp(-1.*fEta));
-  Double_t dipangle = Pi/2 - theta;
+  Double_t dipangle = AliL3Transform::Pi()/2 - theta;
   Double_t tgl = tan(dipangle);
   SetTgl(tgl);
 }
@@ -184,7 +183,7 @@ void AliL3HoughTrack::SetTrackParameters(Double_t kappa,Double_t phi,Int_t weigh
   Double_t charge = -1.*kappa;
   SetCharge((Int_t)copysign(1.,charge));
   
-  Double_t trackPhi0 = GetPsi() + charge*0.5*Pi/fabs(charge);
+  Double_t trackPhi0 = GetPsi() + charge*0.5*AliL3Transform::Pi()/fabs(charge);
   Double_t xc = GetFirstPointX() - GetRadius() * cos(trackPhi0) ;
   Double_t yc = GetFirstPointY() - GetRadius() * sin(trackPhi0) ;
   SetCenterX(xc);

diff --git a/HLT/hough/AliL3HoughTransformer.cxx b/HLT/hough/AliL3HoughTransformer.cxx
index f56e315ac5ca2471fae3752d0071e89a38a63d62..b9830bc0fc0ade02e142bb7cb53158cc014fb54d 100644 (file)
--- a/HLT/hough/AliL3HoughTransformer.cxx
+++ b/HLT/hough/AliL3HoughTransformer.cxx
@@ -6,7 +6,6 @@
 #include "AliL3MemHandler.h"
 #include "AliL3Logging.h"
 #include "AliL3HoughTransformer.h"
-#include "AliL3Defs.h"
 #include "AliL3Transform.h"
 #include "AliL3DigitData.h"
 #include "AliL3Histogram.h"
@@ -63,7 +62,8 @@ void AliL3HoughTransformer::CreateHistograms(Int_t nxbin,Double_t pt_min,
   Double_t bfact = 0.0029980;
   Double_t bfield = 0.2;
   Double_t x = bfact*bfield/pt_min;
-  CreateHistograms(nxbin,-1.*x,x,nybin,phimin*ToRad,phimax*ToRad);
+  Double_t torad = AliL3Transform::Pi()/180;
+  CreateHistograms(nxbin,-1.*x,x,nybin,phimin*torad,phimax*torad);
 }
 
 void AliL3HoughTransformer::CreateHistograms(Int_t nxbin,Double_t xmin,Double_t xmax,
@@ -128,7 +128,7 @@ void AliL3HoughTransformer::TransformCircle()
     }
   
   //Loop over the padrows:
-  for(Int_t i=NRows[GetPatch()][0]; i<=NRows[GetPatch()][1]; i++)
+  for(Int_t i=AliL3Transform::GetFirstRow(GetPatch()); i<=AliL3Transform::GetLastRow(GetPatch()); i++)
     {
       //Get the data on this padrow:
       AliL3DigitData *digPt = tempPt->fDigitData;
@@ -198,7 +198,7 @@ void AliL3HoughTransformer::TransformCircleC(Int_t row_range)
       <<"No input data "<<ENDLOG;
  
   Int_t counter=0;
-  for(Int_t i=NRows[GetPatch()][0]; i<=NRows[GetPatch()][1]; i++)
+  for(Int_t i=AliL3Transform::GetFirstRow(GetPatch()); i<=AliL3Transform::GetLastRow(GetPatch()); i++)
     {
       counter += tempPt->fNDigit;
       AliL3MemHandler::UpdateRowPointer(tempPt);
@@ -223,7 +223,7 @@ void AliL3HoughTransformer::TransformCircleC(Int_t row_range)
   counter=0;
   tempPt = GetDataPointer();
   
-  for(Int_t i=NRows[GetPatch()][0]; i<=NRows[GetPatch()][1]; i++)
+  for(Int_t i=AliL3Transform::GetFirstRow(GetPatch()); i<=AliL3Transform::GetLastRow(GetPatch()); i++)
     {
       AliL3DigitData *digPt = tempPt->fDigitData;
       for(UInt_t di=0; di<tempPt->fNDigit; di++)
@@ -288,8 +288,8 @@ void AliL3HoughTransformer::TransformLine()
        <<"No input data "<<ENDLOG;
       return;
     }
-  
-  for(Int_t i=NRows[GetPatch()][0]; i<=NRows[GetPatch()][1]; i++)
+    
+  for(Int_t i=AliL3Transform::GetFirstRow(GetPatch()); i<=AliL3Transform::GetLastRow(GetPatch()); i++)
     {
       AliL3DigitData *digPt = tempPt->fDigitData;
       if(i != (Int_t)tempPt->fRow)

diff --git a/HLT/src/AliL3ConfMapFit.cxx b/HLT/src/AliL3ConfMapFit.cxx
index 573869935336d2ab1db264d55a934177ae5324a6..38b4d285365332d63539ae3e6482f9100e26529f 100644 (file)
--- a/HLT/src/AliL3ConfMapFit.cxx
+++ b/HLT/src/AliL3ConfMapFit.cxx
@@ -5,7 +5,6 @@
 
 #include <math.h>
 
-#include "AliL3Defs.h"
 #include "AliL3Logging.h"
 #include "AliL3ConfMapFit.h"
 #include "AliL3Vertex.h"

diff --git a/HLT/src/AliL3ConfMapTrack.cxx b/HLT/src/AliL3ConfMapTrack.cxx
index a09083477984017cd0116ad835d7f56a0bafc83e..d9f179a2a711a55ef3f9d17d229489d1ff7c24d5 100644 (file)
--- a/HLT/src/AliL3ConfMapTrack.cxx
+++ b/HLT/src/AliL3ConfMapTrack.cxx
@@ -3,7 +3,6 @@
 // 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"

diff --git a/HLT/src/AliL3ConfMapper.cxx b/HLT/src/AliL3ConfMapper.cxx
index 7e5934811bb67650686f6f5fedb8012b065ea9e7..92f941ed49234953c0fcaaf378472f007f58ec32 100644 (file)
--- a/HLT/src/AliL3ConfMapper.cxx
+++ b/HLT/src/AliL3ConfMapper.cxx
@@ -9,7 +9,6 @@
 #include <sys/time.h>
 #include "AliL3ConfMapper.h"
 
-#include "AliL3Defs.h"
 #include "AliL3Logging.h" 
 #include "AliL3Vertex.h"
 #include "AliL3ConfMapTrack.h"

diff --git a/HLT/src/AliL3Evaluate.cxx b/HLT/src/AliL3Evaluate.cxx
index ebf46aa5614dfc2f6458c2a5682084f257e020bb..c785285f124ea904e1a8d7d1dd5f31ce25e0663a 100644 (file)
--- a/HLT/src/AliL3Evaluate.cxx
+++ b/HLT/src/AliL3Evaluate.cxx
@@ -19,7 +19,6 @@
 #include "AliTPCParam.h"
 #include "AliComplexCluster.h"
 
-#include "AliL3Defs.h"
 #include "AliL3Transform.h"
 #include "AliL3SpacePointData.h"
 #include "AliL3Track.h"

diff --git a/HLT/src/AliL3Fitter.cxx b/HLT/src/AliL3Fitter.cxx
index 6f33c606fcc2ef02390246a109876bdc0bf158f8..5d35396acaf1d613b5b1e381cc12bc013aa81c4c 100644 (file)
--- a/HLT/src/AliL3Fitter.cxx
+++ b/HLT/src/AliL3Fitter.cxx
@@ -5,7 +5,6 @@
 
 #include <math.h>
 
-#include "AliL3Defs.h"
 #include "AliL3Logging.h"
 #include "AliL3Fitter.h"
 #include "AliL3Vertex.h"

diff --git a/HLT/src/AliL3Track.cxx b/HLT/src/AliL3Track.cxx
index 10737eec8f730d6d034db69f803a9bac40834124..1d9e71b00fd25d3ebe63c59ad5e3dbd2187206e9 100644 (file)
--- a/HLT/src/AliL3Track.cxx
+++ b/HLT/src/AliL3Track.cxx
@@ -6,7 +6,6 @@
 
 #include "AliL3RootTypes.h"
 
-#include "AliL3Defs.h"
 #include "AliL3Logging.h"
 #include "AliL3Track.h"
 #include "AliL3Transform.h"