X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=RAW%2FAliHoughFilter.cxx;h=d5a650580b6f39106fdea013984270e71b44d491;hb=d40e79ac384e32bdcbe0e65068deb6e33b4be636;hp=29b04f84bc58228d2d9528e9576a9cb26cb533ce;hpb=c27411e78632688cdf25434d23a07a3a10788c82;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RAW/AliHoughFilter.cxx b/RAW/AliHoughFilter.cxx
index 29b04f84bc5..d5a650580b6 100644
--- a/RAW/AliHoughFilter.cxx
+++ b/RAW/AliHoughFilter.cxx
@@ -23,51 +23,50 @@
 
 #include <TStopwatch.h>
 
-#include "AliL3StandardIncludes.h"
-#include "AliL3Logging.h"
-#include "AliL3Transform.h"
-#include "AliL3Hough.h"
+#include "AliHLTStandardIncludes.h"
+#include "AliHLTLogging.h"
+#include "AliHLTTransform.h"
+#include "AliHLTHough.h"
 #include "AliLog.h"
-#include <AliL3ITSclusterer.h>
-#include <AliL3ITSVertexerZ.h>
-#include <AliL3ITStracker.h>
+#include <AliHLTITSclusterer.h>
+#include <AliHLTITSVertexerZ.h>
+#include <AliHLTITStracker.h>
 
 #include "AliHoughFilter.h"
 
 #include "AliRawReaderRoot.h"
 #include <AliMagF.h>
-#include <AliMagFMaps.h>
 #include <AliKalmanTrack.h>
 #include <AliITSgeom.h>
+#include <AliESDVertex.h>
 
 ClassImp(AliHoughFilter)
 
 //_____________________________________________________________________________
-AliHoughFilter::AliHoughFilter()
+AliHoughFilter::AliHoughFilter():
+fPtmin(0),
+fITSgeom(NULL)
 {
 // default constructor
 
   // Init debug level
-  AliL3Log::fgLevel = AliL3Log::kError;
-  if (AliDebugLevel() > 0) AliL3Log::fgLevel = AliL3Log::kWarning;
-  if (AliDebugLevel() > 1) AliL3Log::fgLevel = AliL3Log::kInformational;
-  if (AliDebugLevel() > 2) AliL3Log::fgLevel = AliL3Log::kDebug;
+  AliHLTLog::fgLevel = AliHLTLog::kError;
+  if (AliDebugLevel() > 0) AliHLTLog::fgLevel = AliHLTLog::kWarning;
+  if (AliDebugLevel() > 1) AliHLTLog::fgLevel = AliHLTLog::kInformational;
+  if (AliDebugLevel() > 2) AliHLTLog::fgLevel = AliHLTLog::kDebug;
 
   // Init TPC HLT geometry
   const char *path = gSystem->Getenv("ALICE_ROOT");
   Char_t pathname[1024];
   strcpy(pathname,path);
   strcat(pathname,"/HLT/src");
-  if (!AliL3Transform::Init(pathname, kFALSE))
+  if (!AliHLTTransform::Init(pathname, kFALSE))
     AliError("HLT initialization failed!");
 
   // Init magnetic field
-  AliKalmanTrack::SetConvConst(
-     1000/0.299792458/AliL3Transform::GetSolenoidField()
-  );
-  AliMagF* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., AliMagFMaps::k5kG);
-  AliTracker::SetFieldMap(field);
-  fPtmin = 0.1*AliL3Transform::GetSolenoidField();
+  AliMagF* field = (AliMagF*)TGeoGlobalMagField::Instance();
+  AliTracker::SetFieldMap(field,kTRUE);
+  fPtmin = 0.1*AliHLTTransform::GetSolenoidField();
 
   // Init ITS geometry
   fITSgeom = new AliITSgeom();
@@ -80,7 +79,7 @@ AliHoughFilter::AliHoughFilter()
 }
 
 //_____________________________________________________________________________
-Bool_t AliHoughFilter::Filter(AliRawEvent* event, AliESD* esd)
+Bool_t AliHoughFilter::Filter(AliRawEvent* event, AliESDEvent* esd)
 {
   // Run fast online reconstruction
   // based on the HLT tracking algorithms
@@ -114,9 +113,7 @@ void AliHoughFilter::RunITSclusterer(AliRawEvent* event, TTree *treeClusters)
   TStopwatch timer;
   timer.Start();
 
-  if(!fITSgeom)
-    AliError("ITS geometry not created!");
-  AliL3ITSclusterer clusterer(fITSgeom);
+  AliHLTITSclusterer clusterer(0);
   AliRawReader *itsrawreader=new AliRawReaderRoot(event);
   clusterer.Digits2Clusters(itsrawreader,treeClusters);
   delete itsrawreader;
@@ -126,7 +123,7 @@ void AliHoughFilter::RunITSclusterer(AliRawEvent* event, TTree *treeClusters)
 
 
 //_____________________________________________________________________________
-void AliHoughFilter::RunITSvertexer(AliESD* esd, TTree *treeClusters)
+void AliHoughFilter::RunITSvertexer(AliESDEvent* esd, TTree *treeClusters)
 {
   // Run SPD vertexerZ
   // Store the result in the ESD
@@ -134,7 +131,7 @@ void AliHoughFilter::RunITSvertexer(AliESD* esd, TTree *treeClusters)
   TStopwatch timer;
   timer.Start();
 
-  AliL3ITSVertexerZ vertexer;
+  AliHLTITSVertexerZ vertexer;
   AliESDVertex *vertex = vertexer.FindVertexForCurrentEvent(fITSgeom,treeClusters);
   esd->SetVertex(vertex);
   AliInfo(Form("ITS vertexer has finished in %f seconds\n",timer.RealTime()));
@@ -142,7 +139,7 @@ void AliHoughFilter::RunITSvertexer(AliESD* esd, TTree *treeClusters)
 }
 
 //_____________________________________________________________________________
-void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESD* esd)
+void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESDEvent* esd)
 {
   // Run hough transform tracking in TPC
   // The z of the vertex is taken from the ESD
@@ -153,7 +150,7 @@ void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESD* esd)
   const AliESDVertex *vertex = esd->GetVertex();
   Float_t zvertex = vertex->GetZv();
 
-  AliL3Hough *hough1 = new AliL3Hough();
+  AliHLTHough *hough1 = new AliHLTHough();
     
   hough1->SetThreshold(4);
   hough1->CalcTransformerParams(fPtmin);
@@ -161,7 +158,7 @@ void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESD* esd)
   hough1->Init(100,4,event,zvertex);
   hough1->SetAddHistograms();
 
-  AliL3Hough *hough2 = new AliL3Hough();
+  AliHLTHough *hough2 = new AliHLTHough();
   
   hough2->SetThreshold(4);
   hough2->CalcTransformerParams(fPtmin);
@@ -175,9 +172,9 @@ void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESD* esd)
   hough2->StartProcessInThread(18,35);
 
   if(hough1->WaitForThreadFinish())
-    ::Fatal("AliL3Hough::WaitForThreadFinish"," Can not join the required thread! ");
+    ::Fatal("AliHLTHough::WaitForThreadFinish"," Can not join the required thread! ");
   if(hough2->WaitForThreadFinish())
-    ::Fatal("AliL3Hough::WaitForThreadFinish"," Can not join the required thread! ");
+    ::Fatal("AliHLTHough::WaitForThreadFinish"," Can not join the required thread! ");
 
     /* In case we run HLT code in the main thread
     for(Int_t slice=0; slice<=17; slice++)
@@ -216,7 +213,7 @@ void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESD* esd)
 }
 
 //_____________________________________________________________________________
-void AliHoughFilter::RunITStracking(AliESD* esd, TTree *treeClusters)
+void AliHoughFilter::RunITStracking(AliESDEvent* esd, TTree *treeClusters)
 {
   // Run the ITS tracker
   // The tracks from the HT TPC tracking are used as seeds
@@ -229,7 +226,7 @@ void AliHoughFilter::RunITStracking(AliESD* esd, TTree *treeClusters)
   const AliESDVertex *vertex = esd->GetVertex();
   vertex->GetXYZ(vtxPos);
 
-  AliL3ITStracker itsTracker(fITSgeom);
+  AliHLTITStracker itsTracker(0);
   itsTracker.SetVertex(vtxPos,vtxErr);
 
   itsTracker.LoadClusters(treeClusters);