X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerEfficiencyCells.h;h=4df354b0981bb728255f6a6bd6bca7b3991a145b;hb=8d2be5505127f31369d3a8da8afaae3035332f67;hp=03816e30b846d1f195e4c51009672a8902369833;hpb=3e0aa963244ef31fab94e2a0e82f4cba8e08efbc;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerEfficiencyCells.h b/MUON/AliMUONTriggerEfficiencyCells.h
index 03816e30b84..4df354b0981 100755
--- a/MUON/AliMUONTriggerEfficiencyCells.h
+++ b/MUON/AliMUONTriggerEfficiencyCells.h
@@ -1,6 +1,8 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+// $Id$
+
 /// \ingroup calib
 /// \class AliMUONTriggerEfficiencyCells
 /// \brief Store and give access to the trigger chamber efficiency.
@@ -11,84 +13,63 @@
 #define ALIMUONTRIGGEREFFICIENCYCELLS_H
 
 #include "TObject.h"
-#include "TArrayF.h"
-#include "TArrayI.h"
-#include "TVector2.h"
-#include "TMatrix.h"
-#include "TH1F.h"
-#include "TList.h"
+class TH1F;
+class TList;
 
 class AliMUONTriggerEfficiencyCells : public TObject
 {
 public:
   AliMUONTriggerEfficiencyCells();
-  AliMUONTriggerEfficiencyCells(const Char_t* filename);
-  AliMUONTriggerEfficiencyCells(TList *countHistoList, TList *noCountHistoList);
+  AliMUONTriggerEfficiencyCells(const Char_t* filename, const Char_t* listname="triggerChamberEff");
+  AliMUONTriggerEfficiencyCells(TList *countHistoList);
 
   AliMUONTriggerEfficiencyCells(const AliMUONTriggerEfficiencyCells& other); // copy constructor
   AliMUONTriggerEfficiencyCells& operator=(const AliMUONTriggerEfficiencyCells& other); // assignment operator
 
   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);
-
-  /// Set the list of fired strips
-  void SetFiredStrips(TList *firedStrips){fFiredStrips = firedStrips;}
-  void CheckFiredStrips(const Char_t *geoFilename="geometry.root");
-                                // Check for strips with lower counts than others:
-                                // syntomatic of possible read-out problems in boards
-  void Reset();
-    
+  enum {
+    kBendingEff,     ///< Bending plane fired
+    kNonBendingEff,  ///< Non-bending plane fired
+    kBothPlanesEff,  ///< Both planes fired
+    kAllTracks,      ///< tracks used for calculation
+    kNcounts         ///< Number of count type
+  };
+
+  enum {
+    kHboardCount,   ///< Counts per board index 
+    kHslatCount,    ///< Counts per slat index
+    kHchamberCount  ///< Counts per chamber index
+  };
+
+  const Char_t* GetHistoName(Int_t histoType, Int_t countType, 
+			     Int_t chamber = -1);
+
+  /// Get list of histograms
+  TList* GetHistoList() { return fCountHistoList; }
+
+  TH1F* GetOldEffHisto(Int_t hType, Int_t ich, Int_t icath) const; // obsolete
+
 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 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,
-			     Bool_t failuresAsInput);
+    void ResetHistos(Bool_t deleteObjects = kFALSE);
 
+    void ReadFile(const Char_t* filename, 
+		  const Char_t* listname);
 
 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");
-    
-    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
-
-    TList *fCountHistoList; ///<list of efficiency numerators
-    TList *fNoCountHistoList; ///<list of efficiency denominators
-    TList *fFiredStrips; ///<list of fired strips for efficiency check
+    TH1F *fBoardEfficiency[fgkNplanes];///< the boards content (obsolete)
+    TH1F *fSlatEfficiency[fgkNplanes];///< the slats content (obsolete)
 
-    TList *fDisplayHistoList; //!< list of efficiency histograms for display
-    TList *fBoardLabelList; //!< list of board labels for display
-    TList *fFiredFitHistoList; //!< list of fired strips for checks
-    TList *fFiredDisplayHistoList; //!< list of fired strips for display
+    TList *fCountHistoList; ///< list of histograms for efficiency calculation
+    TList *fNoCountHistoList; ///<list of efficiency denominators (obsolete)
+    TList *fFiredStrips; ///<list of fired strips for efficiency check (obsolete)
 
-    ClassDef(AliMUONTriggerEfficiencyCells,5) // Trigger efficiency store
+    ClassDef(AliMUONTriggerEfficiencyCells,6) // Trigger efficiency store
 };
 #endif