Coding violation fixes.

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

diff --git a/HLT/src/AliL3TrackMerger.h b/HLT/src/AliL3TrackMerger.h
index a5c6304604f87c23b1c2dc4d79a89adb46da51a6..be66669ff8599d9c18e77b245336329d22b4638d 100644 (file)
--- a/HLT/src/AliL3TrackMerger.h
+++ b/HLT/src/AliL3TrackMerger.h
@@ -1,24 +1,24 @@
+// @(#) $Id$
+

 #ifndef ALIL3TRACKMERGER_H
 #define ALIL3TRACKMERGER_H
 
 #ifndef ALIL3TRACKMERGER_H
 #define ALIL3TRACKMERGER_H
 

+//-------------------------------------------------------------------------
+//                Class AliL3TrackMerger
+//   This class is responsible for the merging of the HLT tracks
+//   between TPC sectors and readout patches
+//-------------------------------------------------------------------------

 
 #ifndef __CINT__ 
 #include "AliL3Merger.h"
 #endif
 
 
 #ifndef __CINT__ 
 #include "AliL3Merger.h"
 #endif
 

+#include "AliL3RootTypes.h"
+

 class AliL3Merger;
 
 class AliL3TrackMerger : public AliL3Merger {
 
 class AliL3Merger;
 
 class AliL3TrackMerger : public AliL3Merger {
 

- private:
-
-  Int_t fSubSector;
-  Int_t fNSubSector;
-  Int_t *fRowMin;//!
-  Int_t *fRowMax;//!
-  Bool_t fSlow;
-  void SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout,Double_t xval);
-  Int_t Merge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout);

  public:
   AliL3TrackMerger();
   AliL3TrackMerger(Int_t nsubsectors);
  public:
   AliL3TrackMerger();
   AliL3TrackMerger(Int_t nsubsectors);


@@ -29,6 +29,15 @@ class AliL3TrackMerger : public AliL3Merger {
   void SlowMerge();
   void Merge();  //Loop over tracks from different subsectors
   void InterMerge();
   void SlowMerge();
   void Merge();  //Loop over tracks from different subsectors
   void InterMerge();

+
+ private:
+  Int_t fSubSector;//Index of the readout patch inside given TPC sector
+  Int_t fNSubSector;//Number of readout patches inside given TPC sector
+  Int_t *fRowMin;//!
+  Int_t *fRowMax;//!
+  Bool_t fSlow;//Slow or fast merging
+  void SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout,Double_t xval);
+  Int_t Merge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout);

   
   ClassDef(AliL3TrackMerger,1) //Track merging class 
 };
   
   ClassDef(AliL3TrackMerger,1) //Track merging class 
 };