X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONCluster.h;h=f96eade5d3e5d201651d7d4dca415a7d38ca37fd;hb=7bf353da0b857a295b8c6a6e02168c835c92d210;hp=f61e0a5e2a5066466910892a25a6b9ad7afa7f9b;hpb=00de388fa96132e4afc75aace664ba3b6109241b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONCluster.h b/MUON/AliMUONCluster.h
index f61e0a5e2a5..f96eade5d3e 100644
--- a/MUON/AliMUONCluster.h
+++ b/MUON/AliMUONCluster.h
@@ -27,12 +27,15 @@
 #ifndef ALI_MP_DIRECTION_H
 #  include "AliMpDirection.h"
 #endif
-#ifndef ALI_MP_INT_PAIR_H
-#  include "AliMpIntPair.h"
+#ifndef ALI_MP_ENCODE_PAIR_H
+#  include "AliMpEncodePair.h"
+#endif
+
+#ifndef ROOT_TObjArray
+#  include "TObjArray.h"
 #endif
 
 class AliMUONPad;
-class TObjArray;
 
 class AliMUONCluster : public TObject
 {
@@ -99,10 +102,10 @@ public:
   Int_t Multiplicity(Int_t cathode) const;
 
   /// Compute number of pads in X and Y direction for a given cathode.  
-  AliMpIntPair NofPads(Int_t cathode, Int_t statusMask, Bool_t matchMask) const;
+  Long_t NofPads(Int_t cathode, Int_t statusMask, Bool_t matchMask) const;
   
   /// Number of pads in (X,Y) direction, whatever the cathode.
-  AliMpIntPair NofPads(Int_t statusMask, Bool_t matchMask=kTRUE) const;
+  Long_t NofPads(Int_t statusMask, Bool_t matchMask=kTRUE) const;
   
   /// Return true as the function Compare is implemented
   Bool_t IsSortable() const { return kTRUE; }
@@ -150,11 +153,13 @@ public:
 
   void Clear(Option_t* opt="");
   
-private:
+  Bool_t IsMonoCathode() const;
+
+//private:
     void DumpMe() const;
   
 private:
-  TObjArray* fPads; ///< AliMUONPad(s) composing this cluster
+  TObjArray fPads; ///< AliMUONPad(s) composing this cluster
   Bool_t fHasPosition; ///< false for pre-cluster (i.e. not yet computed)
   TVector2 fPosition; ///< (x,y) of that cluster (only valid if fHasPosition is kTRUE)
   TVector2 fPositionError; ///< errors on (x,y)
@@ -165,7 +170,7 @@ private:
   Float_t fChi2; ///< chi2 of the RawCharge fit (if any)
   Bool_t fIsSaturated[2]; ///< saturation status of cathodes
   
-  ClassDef(AliMUONCluster,2) // A cluster of AliMUONPad
+  ClassDef(AliMUONCluster,3) // A cluster of AliMUONPad
 };
 
 #endif