reverting...

[u/mrichter/AliRoot.git] / MUON / AliMUONPadStatusMapMaker.h

diff --git a/MUON/AliMUONPadStatusMapMaker.h b/MUON/AliMUONPadStatusMapMaker.h
index e5d1aeaf07296b6d806fc4060d71409de53612eb..5d356b95de2323398ad4f96ca0fa010cb6ea88f4 100644 (file)
--- a/MUON/AliMUONPadStatusMapMaker.h
+++ b/MUON/AliMUONPadStatusMapMaker.h
@@ -16,19 +16,21 @@
 #  include "TObject.h"
 #endif
 
+class AliMUONCalibrationData;
 class AliMUONV2DStore;
+class AliMUONVCalibParam;
 class AliMpPad;
-class TObjArray;
 class AliMpVSegmentation;
+class TObjArray;
 class TVector2;
-class TStopwatch;
 
 class AliMUONPadStatusMapMaker : public TObject
 {
 public:
-  AliMUONPadStatusMapMaker();
+  AliMUONPadStatusMapMaker(const AliMUONCalibrationData& calibData);
   virtual ~AliMUONPadStatusMapMaker();
   
+  /// Return status bit map to tell a pad is bad
   static Int_t SelfDeadMask() { return fgkSelfDead; }
   
   AliMUONV2DStore* MakePadStatusMap(const AliMUONV2DStore& status,
@@ -38,25 +40,23 @@ public:
 
 
 private:
+  /// Not implemented
   AliMUONPadStatusMapMaker(const AliMUONPadStatusMapMaker&);
+  /// Not implemented
   AliMUONPadStatusMapMaker& operator=(const AliMUONPadStatusMapMaker&);
 
 private:
-    
-  Int_t BitNumber(const AliMpPad& centerPad, const AliMpPad& testPad) const;
-
-  Int_t ComputeStatusMap(const TObjArray& neighbours, Int_t detElemId) const;
-  
-  Int_t GetPadStatus(Int_t detElemId, const AliMpPad& pad) const;
+  Int_t ComputeStatusMap(const AliMUONVCalibParam& neighbours, 
+                        Int_t manuChannel, Int_t detElemId) const;
   
-  Bool_t IsValid(const AliMpPad& pad, const TVector2& shift) const;
+  Int_t GetPadStatus(Int_t detElemId, Int_t manuId, Int_t manuChannel) const;
   
 private:
     static Int_t fgkSelfDead; //!< status bit map to tell a pad is bad
   const AliMUONV2DStore* fStatus; //!< status store
   Int_t fMask; //!< mask to be tested
-  const AliMpVSegmentation* fSegmentation; //!< segmentation of current de
-  
+
+  /// Bit numbers
   enum EBitNumbers
   {
     kLeftBottomBit = 6,
@@ -69,8 +69,7 @@ private:
     kRightBit = 17,
     kRightTopBit = 18
   };
-  
-  TStopwatch* fTimerComputeStatusMap; //!< to time the ComputeStatusMap() method
+  const AliMUONCalibrationData& fCalibrationData; //!< to access neighbourStore
   
   ClassDef(AliMUONPadStatusMapMaker,0) // Pad status map maker
 };