Changes to speed up creating of status and status map (Laurent)

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

diff --git a/MUON/AliMUONPadStatusMapMaker.h b/MUON/AliMUONPadStatusMapMaker.h
index 209679291ed94583e2bad7b6deec9cd4f3ebd951..5a6b5378bd85314a8d560329a32910d5afe657d0 100644 (file)
--- a/MUON/AliMUONPadStatusMapMaker.h
+++ b/MUON/AliMUONPadStatusMapMaker.h
@@ -16,29 +16,29 @@
 #  include "TObject.h"
 #endif
 
 #  include "TObject.h"
 #endif
 

-class AliMUONCalibrationData;
-class AliMUONVStore;
+class AliMUONPadStatusMaker;

 class AliMUONVCalibParam;
 class AliMUONVCalibParam;

-class AliMpPad;
-class AliMpVSegmentation;
-class TObjArray;
-class TVector2;
+class AliMUONVStore;

 
 class AliMUONPadStatusMapMaker : public TObject
 {
 public:
 
 class AliMUONPadStatusMapMaker : public TObject
 {
 public:

-  AliMUONPadStatusMapMaker(const AliMUONCalibrationData& calibData);
+  AliMUONPadStatusMapMaker(const AliMUONPadStatusMaker& padStatusMaker,
+                           Int_t mask,
+                           Bool_t deferredInitialization=kTRUE);

   virtual ~AliMUONPadStatusMapMaker();
   
   virtual ~AliMUONPadStatusMapMaker();
   

+  /** Get access to internal status map store (for debug only, as it may not be complete,
+    depending on whether you've already called StatusMap() for all possible de,manu,channel
+    combinations or not...
+    */
+  AliMUONVStore* StatusMap() const { return fStatusMap; }
+  
+  Int_t StatusMap(Int_t detElemId, Int_t manuId, Int_t manuChannel) const;
+  

   /// Return status bit map to tell a pad is bad
   static Int_t SelfDeadMask() { return fgkSelfDead; }
   
   /// Return status bit map to tell a pad is bad
   static Int_t SelfDeadMask() { return fgkSelfDead; }
   

-  AliMUONVStore* MakePadStatusMap(const AliMUONVStore& status,
-                                    Int_t mask);
-  
-  static AliMUONVStore* MakeEmptyPadStatusMap();
-
-

 private:
   /// Not implemented
   AliMUONPadStatusMapMaker(const AliMUONPadStatusMapMaker&);
 private:
   /// Not implemented
   AliMUONPadStatusMapMaker(const AliMUONPadStatusMapMaker&);


@@ -46,15 +46,12 @@ private:
   AliMUONPadStatusMapMaker& operator=(const AliMUONPadStatusMapMaker&);
 
 private:
   AliMUONPadStatusMapMaker& operator=(const AliMUONPadStatusMapMaker&);
 
 private:

-  Int_t ComputeStatusMap(const AliMUONVCalibParam& neighbours, 
-                        Int_t manuChannel, Int_t detElemId) const;
-  
-  Int_t GetPadStatus(Int_t detElemId, Int_t manuId, Int_t manuChannel) const;
+    
+  AliMUONVCalibParam* ComputeStatusMap(Int_t detElemId, Int_t manuId) const;

   
 private:
   
 private:

-    static Int_t fgkSelfDead; //!< status bit map to tell a pad is bad
-  const AliMUONVStore* fStatus; //!< status store
-  Int_t fMask; //!< mask to be tested
+  
+  static Int_t fgkSelfDead; //!< status bit map to tell a pad is bad

 
   /// Bit numbers
   enum EBitNumbers
 
   /// Bit numbers
   enum EBitNumbers


@@ -69,7 +66,10 @@ private:
     kRightBit = 17,
     kRightTopBit = 18
   };
     kRightBit = 17,
     kRightTopBit = 18
   };

-  const AliMUONCalibrationData& fCalibrationData; //!< to access neighbourStore
+  
+  const AliMUONPadStatusMaker& fStatusMaker; //!< to access pad statuses
+  Int_t fMask; //!< mask to be tested
+  mutable AliMUONVStore* fStatusMap; //!< status map

   
   ClassDef(AliMUONPadStatusMapMaker,0) // Pad status map maker
 };
   
   ClassDef(AliMUONPadStatusMapMaker,0) // Pad status map maker
 };