Fixes for memory leaks (Christian)

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

diff --git a/MUON/AliMUONTriggerEfficiencyCells.h b/MUON/AliMUONTriggerEfficiencyCells.h
index 42b1589683bdaf7bcce8bb9fda2603aa2bba46a8..22ad6f1af55bdb7a647c2cf818122081053f48b4 100755 (executable)
--- a/MUON/AliMUONTriggerEfficiencyCells.h
+++ b/MUON/AliMUONTriggerEfficiencyCells.h
@@ -1,7 +1,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/// \ingroup base
+/// \ingroup calib
 /// \class AliMUONTriggerEfficiencyCells
 /// \brief Store and give access to the trigger chamber efficiency.
 ///
@@ -11,9 +11,11 @@
 #define ALIMUONTRIGGEREFFICIENCYCELLS_H
 
 #include "TObject.h"
+#include "TArrayF.h"
 #include "TArrayI.h"
 #include "TVector2.h"
 #include "TString.h"
+#include "TMatrix.h"
 
 class AliMUONTriggerEfficiencyCells : public TObject
 {
@@ -23,32 +25,40 @@ public:
 
   virtual ~AliMUONTriggerEfficiencyCells();
 
-  Float_t GetCellEfficiency(Int_t detElemId, Int_t cathode, Float_t x, Float_t y);
-  void GetCellEfficiency(Int_t detElemId, Float_t x, Float_t y, Float_t &eff1, Float_t &eff2);
+  void GetCellEfficiency(Int_t detElemId, Float_t x, Float_t y, Float_t &eff1, Float_t &eff2) const;
+  void GetCellEfficiency(Int_t detElemId, Int_t localBoard, Float_t &eff1, Float_t &eff2) const;
     
-  Bool_t IsTriggered(Int_t detElemId, Int_t cathode, Float_t x, Float_t y);
-  void IsTriggered(Int_t detElemId, Float_t x, Float_t y, Bool_t &trig1, Bool_t &trig2);
+  void IsTriggered(Int_t detElemId, Float_t x, Float_t y, Bool_t &trig1, Bool_t &trig2) const;
+  void IsTriggered(Int_t detElemId, Int_t localBoard, Bool_t &trig1, Bool_t &trig2) const;
 
   TVector2 ChangeReferenceFrame(Float_t x, Float_t y, Float_t x0, Float_t y0);
 
   void Reset();
     
 protected:
-    TArrayI CellByCoord(Int_t detElemId, Float_t x, Float_t y);
+    TArrayI CellByCoord(Int_t detElemId, Float_t x, Float_t y) const;
     void ReadFile(const char* filename="$ALICE_ROOT/MUON/data/efficiencyCells.dat");
 
 private:
-    Int_t FindChamberIndex(Int_t detElemId);
-    Int_t FindSlatIndex(Int_t detElemId);
+    void CheckConstants() const;
+    Int_t FindChamberIndex(Int_t detElemId) const;
+    Int_t FindSlatIndex(Int_t detElemId) const;
+    void ReadFileXY(ifstream &file);
+    void ReadFileBoards(ifstream &file);
+    void ReadHistoBoards(const char* filename="MUON.TriggerEfficiencyMap.root");
     
-    static const Int_t fgkNofCells=80; ///< Number of cells
-    
-    /// Cell content [trig. chambers][RPCs][cathode][cellsX][cellsY]
-    Float_t fCellContent[4][18][2][fgkNofCells][fgkNofCells]; //[trig. chambers][RPCs][cathode][cellsX][cellsY]
+    static const Int_t fgkNcells=80;   ///< Number of cells
+    static const Int_t fgkNcathodes=2; ///<Number of cathodes
+    static const Int_t fgkNchambers=4; ///<Number of chambers
+    static const Int_t fgkNplanes=8;   ///<Number of planes
+    static const Int_t fgkNslats=18;   ///<Number of slats
 
-    Float_t fCellSize[4][18][2]; ///< the size of the cells
-    Int_t fCellNumber[4][18][2]; ///< id of the cells
     
-    ClassDef(AliMUONTriggerEfficiencyCells,1) // Trigger efficiency store
+    TMatrixF fCellContent[fgkNplanes][fgkNslats]; ///< the cells content
+    TArrayF  fCellSize[fgkNplanes];    ///< the size of the cells
+    TArrayI  fCellNumber[fgkNplanes];  ///< id of the cells
+    TArrayF  fBoardContent[fgkNplanes];///< the boards content
+
+    ClassDef(AliMUONTriggerEfficiencyCells,3) // Trigger efficiency store
 };
 #endif