Double check if SM is running added. Some redundant output removed from SM

[u/mrichter/AliRoot.git] / RAW / AliHoughFilter.cxx

diff --git a/RAW/AliHoughFilter.cxx b/RAW/AliHoughFilter.cxx
index 78c640eb893b9e02379a41fecb2a5021a5fc5776..1c43ced5136e6782a79247e424eed613c105371c 100644 (file)
--- a/RAW/AliHoughFilter.cxx
+++ b/RAW/AliHoughFilter.cxx
@@ -36,9 +36,9 @@
 
 #include "AliRawReaderRoot.h"
 #include <AliMagF.h>
-#include <AliMagFMaps.h>
 #include <AliKalmanTrack.h>
 #include <AliITSgeom.h>
+#include <AliESDVertex.h>
 
 ClassImp(AliHoughFilter)
 
@@ -64,7 +64,7 @@ fITSgeom(NULL)
     AliError("HLT initialization failed!");
 
   // Init magnetic field
-  AliMagF* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., AliMagFMaps::k5kG);
+  AliMagF* field = (AliMagF*)TGeoGlobalMagField::Instance();
   AliTracker::SetFieldMap(field,kTRUE);
   fPtmin = 0.1*AliHLTTransform::GetSolenoidField();
 
@@ -79,7 +79,7 @@ fITSgeom(NULL)
 }
 
 //_____________________________________________________________________________
-Bool_t AliHoughFilter::Filter(AliRawEvent* event, AliESD* esd)
+Bool_t AliHoughFilter::Filter(AliRawVEvent* event, AliESDEvent* esd)
 {
   // Run fast online reconstruction
   // based on the HLT tracking algorithms
@@ -105,7 +105,7 @@ Bool_t AliHoughFilter::Filter(AliRawEvent* event, AliESD* esd)
 }
 
 //_____________________________________________________________________________
-void AliHoughFilter::RunITSclusterer(AliRawEvent* event, TTree *treeClusters)
+void AliHoughFilter::RunITSclusterer(AliRawVEvent* event, TTree *treeClusters)
 {
   // Run ITS Clusterer
   // The clusters are stored in a tree
@@ -113,9 +113,7 @@ void AliHoughFilter::RunITSclusterer(AliRawEvent* event, TTree *treeClusters)
   TStopwatch timer;
   timer.Start();
 
-  if(!fITSgeom)
-    AliError("ITS geometry not created!");
-  AliHLTITSclusterer clusterer(fITSgeom);
+  AliHLTITSclusterer clusterer(0);
   AliRawReader *itsrawreader=new AliRawReaderRoot(event);
   clusterer.Digits2Clusters(itsrawreader,treeClusters);
   delete itsrawreader;
@@ -125,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
@@ -141,7 +139,7 @@ void AliHoughFilter::RunITSvertexer(AliESD* esd, TTree *treeClusters)
 }
 
 //_____________________________________________________________________________
-void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESD* esd)
+void AliHoughFilter::RunTPCtracking(AliRawVEvent* event, AliESDEvent* esd)
 {
   // Run hough transform tracking in TPC
   // The z of the vertex is taken from the ESD
@@ -150,7 +148,7 @@ void AliHoughFilter::RunTPCtracking(AliRawEvent* event, AliESD* esd)
   timer.Start();
 
   const AliESDVertex *vertex = esd->GetVertex();
-  Float_t zvertex = vertex->GetZv();
+  Float_t zvertex = vertex->GetZ();
 
   AliHLTHough *hough1 = new AliHLTHough();
     
@@ -215,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