Fix of parsing bug related to the reading of the calib header. Added consistency...

[u/mrichter/AliRoot.git] / ITS / AliITSClusterFinderV2.h

diff --git a/ITS/AliITSClusterFinderV2.h b/ITS/AliITSClusterFinderV2.h
index 04602a9b5e8f76dd33106de950039ec52665dd3d..f669cd339408ebd923f8af710b505cea3c9aba83 100644 (file)
--- a/ITS/AliITSClusterFinderV2.h
+++ b/ITS/AliITSClusterFinderV2.h
@@ -9,13 +9,12 @@
 ////////////////////////////////////////////////////////////////////  
 #include "AliITSClusterFinder.h" 
 
-class AliITSclusterV2;
+class AliITSRecPoint;
 class AliRawReader;
-class AliITSgeom;
 
 class AliITSClusterFinderV2 : public AliITSClusterFinder {
 public:
-  AliITSClusterFinderV2(AliITSgeom* geom);
+  AliITSClusterFinderV2(AliITSDetTypeRec* dettyp);
   virtual ~AliITSClusterFinderV2() {;}
 
   void SetEvent(Int_t event) { fEvent=event; }
@@ -41,10 +40,11 @@ protected:
   };
   class AliBin {
   public:
-    AliBin() {fIndex=0; fQ=0; fMask=0xFFFFFFFE;}
+    AliBin():fIndex(0),fMask(0xFFFFFFFE),fQ(0){}
     void SetIndex(UInt_t idx) {fIndex=idx;}
     void SetQ(UShort_t q)  {fQ=q;}
     void SetMask(UInt_t m) {fMask=m;}
+    void Reset() {fIndex=0; fMask=0xFFFFFFFE; fQ=0;}
 
     void Use() {fMask&=0xFFFFFFFE;}
     Bool_t IsNotUsed() const {return (fMask&1);}
@@ -58,12 +58,10 @@ protected:
     UInt_t fMask; //peak mask
     UShort_t fQ;  //signal
   };
+  void MakeCluster(Int_t k,Int_t max,AliBin *bins,UInt_t m,AliITSRecPoint &c);
   static Bool_t IsMaximum(Int_t k, Int_t max, const AliBin *bins);
   static void FindPeaks(Int_t k,Int_t m,AliBin*b,Int_t*idx,UInt_t*msk,Int_t&n);
   static void MarkPeak(Int_t k, Int_t max, AliBin *bins, UInt_t m);
-  static void MakeCluster(Int_t k,Int_t max,AliBin *bins,UInt_t m,
-   AliITSclusterV2 &c);
-
   static void FindCluster(Int_t k,Int_t maxz,AliBin *bins,Int_t &n,Int_t *idx);
 
 protected: