Fix for Mac and gcc 4

[u/mrichter/AliRoot.git] / HLT / src / AliL3GlobalMerger.h

diff --git a/HLT/src/AliL3GlobalMerger.h b/HLT/src/AliL3GlobalMerger.h
index 4e0f30d0eaa3e8bbb59eccd58973bebe89dc0c33..b933ab7b21e6240f02d7691731480d56977dce5c 100644 (file)
--- a/HLT/src/AliL3GlobalMerger.h
+++ b/HLT/src/AliL3GlobalMerger.h
@@ -1,3 +1,5 @@
+// @(#) $Id$
+
 #ifndef ALIL3_GLOBALMERGER_H
 #define ALIL3_GLOBALMERGER_H
 
@@ -5,6 +7,8 @@
 #include "AliL3Merger.h"
 #endif
 
+#include "AliL3RootTypes.h"
+
 class AliL3GlobalMerger : public AliL3Merger{
 
  private:
@@ -12,16 +16,18 @@ class AliL3GlobalMerger : public AliL3Merger{
   Int_t fFirst;
   Int_t fLast;
 
+  Double_t CheckTracks(AliL3Track *innertrack,AliL3Track *outertrack,Int_t slice);
+  
  public:
   AliL3GlobalMerger();
-  AliL3GlobalMerger(Int_t first,Int_t last);
   virtual ~AliL3GlobalMerger();
-
+  
+  void Setup(Int_t first,Int_t last);
   void InitSlice(Int_t slice);
-  void SlowMerge();
+  void SlowMerge(Char_t *path="./");
   void Merge();  //Loop over tracks from different sectors
 
-  ClassDef(AliL3GlobalMerger,1) 
+  ClassDef(AliL3GlobalMerger,1) //Slice merger
 };
 
 #endif