Some changes resulting from last week work. The mc stuff has been removed.

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

diff --git a/HLT/src/AliL3ConfMapper.cxx b/HLT/src/AliL3ConfMapper.cxx
index 7e5934811bb67650686f6f5fedb8012b065ea9e7..293e1423f2d4aac77d8df1b7cac2ca96779804cf 100644 (file)
--- a/HLT/src/AliL3ConfMapper.cxx
+++ b/HLT/src/AliL3ConfMapper.cxx
@@ -3,13 +3,10 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
  
-#include <iostream.h>
-#include <time.h>
-#include <math.h>
+#include "AliL3StandardIncludes.h"
 #include <sys/time.h>
-#include "AliL3ConfMapper.h"
 
-#include "AliL3Defs.h"
+#include "AliL3ConfMapper.h"
 #include "AliL3Logging.h" 
 #include "AliL3Vertex.h"
 #include "AliL3ConfMapTrack.h"
@@ -69,7 +66,7 @@ void AliL3ConfMapper::InitVolumes()
   
   //Should be done after setting the track parameters
   
-  fNumRowSegmentPlusOne = 176;//NumRows[0]; //Maximum 32.
+  fNumRowSegmentPlusOne = AliL3Transform::GetNRows();//NumRows[0]; //Maximum 32.
   fNumPhiSegmentPlusOne = fNumPhiSegment+1;
   fNumEtaSegmentPlusOne = fNumEtaSegment+1;
   fNumPhiEtaSegmentPlusOne = fNumPhiSegmentPlusOne*fNumEtaSegmentPlusOne;
@@ -120,7 +117,7 @@ void AliL3ConfMapper::InitSector(Int_t sector,Int_t *rowrange,Float_t *etarange)
   else //complete sector
     {
       fRowMin = 0;
-      fRowMax = 175;
+      fRowMax = AliL3Transform::GetNRows() - 1;
     }
   if(etarange)
     {
@@ -141,10 +138,12 @@ void AliL3ConfMapper::InitSector(Int_t sector,Int_t *rowrange,Float_t *etarange)
   nTracks=0;
   fMainVertexTracks = 0;
   fClustersUnused = 0;
+  fEtaHitsOutOfRange=0;
+  fPhiHitsOutOfRange=0;
   
   fNumRowSegment = fRowMax - fRowMin; //number of rows to be considered by tracker
   LOG(AliL3Log::kInformational,"AliL3ConfMapper::InitSector","B-field")
-    <<"Tracker initializing assuming magnetic field of "<<AliL3Transform::GetBField()<<ENDLOG;
+    <<"Tracker initializing with a magnetic field of "<<AliL3Transform::GetBField()<<ENDLOG;
   
   fTrack->Reset();
 }
@@ -746,7 +745,7 @@ Double_t AliL3ConfMapper::CalcDistance(const AliL3ConfMapPoint *hit1,const AliL3
   Double_t phi_diff = fabs( hit1->GetPhi() - hit2->GetPhi() );
   if (phi_diff > pi) phi_diff = twopi - phi_diff;
   
-  return todeg*fabs(hit1->GetPadRow() - hit2->GetPadRow()) * (phi_diff + fabs( hit1->GetEta() - hit2->GetEta() ));
+  return todeg*fabs((Float_t)((hit1->GetPadRow() - hit2->GetPadRow()) * (phi_diff + fabs( hit1->GetEta() - hit2->GetEta()))));
 }
 
 Bool_t AliL3ConfMapper::VerifyRange(const AliL3ConfMapPoint *hit1,const AliL3ConfMapPoint *hit2) const