X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=MUON%2FAliMUONTriggerEfficiencyCells.h;h=660cb6a9e8e28cdaa8271cd4d503c3c4ead140a2;hp=03816e30b846d1f195e4c51009672a8902369833;hb=683cb6c5538805954750251a818e556da428b79f;hpb=9d1dc1b5ddd980ddd1f4b7b2926ae5c1a16a580f;ds=sidebyside

diff --git a/MUON/AliMUONTriggerEfficiencyCells.h b/MUON/AliMUONTriggerEfficiencyCells.h
index 03816e30b84..660cb6a9e8e 100755
--- a/MUON/AliMUONTriggerEfficiencyCells.h
+++ b/MUON/AliMUONTriggerEfficiencyCells.h
@@ -11,10 +11,7 @@
 #define ALIMUONTRIGGEREFFICIENCYCELLS_H
 
 #include "TObject.h"
-#include "TArrayF.h"
 #include "TArrayI.h"
-#include "TVector2.h"
-#include "TMatrix.h"
 #include "TH1F.h"
 #include "TList.h"
 
@@ -30,25 +27,29 @@ public:
 
   virtual ~AliMUONTriggerEfficiencyCells();
 
-  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;
     
-  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;
 
-  void DisplayEfficiency(Bool_t perSlat=kFALSE, const Char_t* geoFilename="geometry.root");
   Bool_t SumRunEfficiency(const AliMUONTriggerEfficiencyCells &other);
 
+
+  // Methods for display
+  void DisplayEfficiency(Bool_t perSlat=kFALSE,
+			 const Char_t* geoFilename="geometry.root",
+			 const Char_t* cdbStorage = "local://$ALICE_ROOT",
+			 Int_t runNumber=0);
+
+  // Methods for efficiency check
   /// Set the list of fired strips
   void SetFiredStrips(TList *firedStrips){fFiredStrips = firedStrips;}
-  void CheckFiredStrips(const Char_t *geoFilename="geometry.root");
+  void CheckFiredStrips(const Char_t *geoFilename="geometry.root",
+			const Char_t* cdbStorage = "local://$ALICE_ROOT",
+			Int_t runNumber=0);
                                 // Check for strips with lower counts than others:
                                 // syntomatic of possible read-out problems in boards
-  void Reset();
-    
 protected:
-    TArrayI CellByCoord(Int_t detElemId, Float_t x, Float_t y) const;
-    TVector2 ChangeReferenceFrame(Float_t x, Float_t y, Float_t x0, Float_t y0);
+    void Reset();
     void ReadFile(const Char_t* filename="$ALICE_ROOT/MUON/data/efficiencyCells.dat");
     void CalculateEfficiency(Int_t trigger44, Int_t trigger34,
 			     Float_t &efficiency, Float_t &error,
@@ -58,25 +59,18 @@ protected:
 private:
     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_t* filename="MUON.TriggerEfficiencyMap.root");
     void InitHistos();
     void FillHistosFromList();
-    Bool_t GetListsForCheck(const Char_t* geoFilename="geometry.root");
+    Bool_t GetListsForCheck(const Char_t* geoFilename,
+			    const Char_t* cdbStorage, Int_t runNumber);
     
-    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
 
     
-    TMatrixF fCellContent[fgkNplanes][fgkNslats]; ///< the cells content
-    TArrayF  fCellSize[fgkNplanes];    ///< the size of the cells
-    TArrayI  fCellNumber[fgkNplanes];  ///< id of the cells
-    
     TH1F *fBoardEfficiency[fgkNplanes];///< the boards content
     TH1F *fSlatEfficiency[fgkNplanes];///< the slats content
 
@@ -89,6 +83,6 @@ private:
     TList *fFiredFitHistoList; //!< list of fired strips for checks
     TList *fFiredDisplayHistoList; //!< list of fired strips for display
 
-    ClassDef(AliMUONTriggerEfficiencyCells,5) // Trigger efficiency store
+    ClassDef(AliMUONTriggerEfficiencyCells,6) // Trigger efficiency store
 };
 #endif