Merged Bergen, mergen Cvetan TransformerRow and

[u/mrichter/AliRoot.git] / HLT / hough / AliL3HoughIntMerger.cxx

diff --git a/HLT/hough/AliL3HoughIntMerger.cxx b/HLT/hough/AliL3HoughIntMerger.cxx
index 35450c4b7edfb5199bf5b89d9ce8bd5254759ca1..abe8585014db1e9a5e9b68459c1bee9408350d4e 100644 (file)
--- a/HLT/hough/AliL3HoughIntMerger.cxx
+++ b/HLT/hough/AliL3HoughIntMerger.cxx
@@ -1,8 +1,10 @@
+// @(#) $Id$
+
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
-//*-- Copyright &copy ASV 
+//*-- Copyright &copy ALICE HLT Group
+
+#include "AliL3StandardIncludes.h"
 
-#include <math.h>
-#include <iostream.h>
 #include "AliL3Logging.h"
 #include "AliL3HoughIntMerger.h"
 #include "AliL3HoughTrack.h"
@@ -10,15 +12,20 @@
 #include "AliL3Transform.h"
 #include "AliL3TrackArray.h"
 
+#if __GNUC__ == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // Hough Inter merger
 // Merging of multiple reconstructed tracks
 
 ClassImp(AliL3HoughIntMerger)
 
-AliL3HoughIntMerger::AliL3HoughIntMerger() : AliL3Merger(1,"AliL3HoughTrack")
+AliL3HoughIntMerger::AliL3HoughIntMerger()
 {
   //Default constructor
+  InitMerger(1,"AliL3HoughTrack");
   fRowMax = fRowMin = 0;
   SetParameters(0.001,0.05,10);
   Is2Global(kFALSE);
@@ -63,7 +70,7 @@ Bool_t AliL3HoughIntMerger::IsTrack(AliL3Track *innertrack,AliL3Track *outertrac
   return kTRUE;//Tracks could be merged
 }
 
-AliL3Track *AliL3HoughIntMerger::MultiMerge(AliL3TrackArray *mergedtrack,AliL3Track **tracks, Int_t ntrack)
+AliL3Track *AliL3HoughIntMerger::MultiMerge(AliL3TrackArray *mergedtrack,AliL3Track **tracks, Int_t /*ntrack*/)
 {
   //Called by the track merger