X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerDisplay.h;h=5af7efa65c8a42a326002084074fef1e32665ec9;hb=e865f048f889667fb36f0cb0955871250f2d0d20;hp=750fe4b337daeba6fdfbe2ee1a889a5ca9749162;hpb=aef183f7976ac649c9d96880891015d97e6f38e8;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerDisplay.h b/MUON/AliMUONTriggerDisplay.h
index 750fe4b337d..5af7efa65c8 100644
--- a/MUON/AliMUONTriggerDisplay.h
+++ b/MUON/AliMUONTriggerDisplay.h
@@ -5,7 +5,7 @@
 
 // $Id$
 
-/// \ingroup rec
+/// \ingroup calib
 /// \class AliMUONTriggerDisplay
 /// \brief Converts histograms as a function of strip/board/slat number in human readable histograms
 ///
@@ -17,23 +17,27 @@
 
 class TArrayD;
 class TString;
+class TGraph;
 
 class AliMUONTriggerDisplay: public TObject {
 
 public:
   AliMUONTriggerDisplay();
   virtual ~AliMUONTriggerDisplay();
-
+  
+  /// Display element inidices (strip,board,slat)
   enum EDisplayType {
     kDisplayStrips,    ///< Draw strips
     kDisplayBoards,    ///< Draw boards
     kDisplaySlats      ///< Draw slats
   };
 
+  /// Display options inidices
   enum EDisplayOption {
     kDefaultDisplay,   ///< Default display
     kNumbered,         ///< Histogram filled with board numbers
-    kShowZeroes        ///< Displays strip/board/slat content even if it is 0
+    kShowZeroes,       ///< Displays strip/board/slat content even if it is 0
+    kNormalizeToArea   ///< Draw input histo divided by element area
   };
 
   TH2* GetEmptyDisplayHisto(TString displayHistoName, EDisplayType displayType,
@@ -47,23 +51,32 @@ public:
 			   EDisplayType displayType, Int_t cathode,
 			   Int_t chamber=11, TString displayHistoTitle="",
 			   EDisplayOption displayOpt=kDefaultDisplay);
+
+  TH2* GetDisplayHistogram(TGraph* inputGraph, TString displayHistoName,
+			   EDisplayType displayType, Int_t cathode,
+			   Int_t chamber=11, TString displayHistoTitle="",
+			   EDisplayOption displayOpt=kDefaultDisplay);
   
   Bool_t FillDisplayHistogram(TH1* inputHisto, TH2* displayHisto,
 			      EDisplayType displayType, Int_t cathode,
 			      Int_t chamber=11,EDisplayOption displayOpt=kDefaultDisplay);
   
+  Bool_t FillDisplayHistogram(TGraph* inputGraph, TH2* displayHisto,
+			      EDisplayType displayType, Int_t cathode,
+			      Int_t chamber=11,EDisplayOption displayOpt=kDefaultDisplay);
+  
 private:
   Bool_t AddSortedPoint(Float_t currVal, TArrayD& position, const Float_t kResetValue);
   /// Return index
-  Int_t GetIndex(Int_t chamber, Int_t cathode) { return 2*chamber + cathode;}
+  Int_t GetIndex(Int_t chamber, Int_t cathode) const { return 2*chamber + cathode;}
 
-  Bool_t InitOrDisplayTriggerInfo(TH1* inoutHisto, TH2* displayHisto,
+  Bool_t InitOrDisplayTriggerInfo(TObject* inputHisto, TH2* displayHisto,
 				  EDisplayType displayType,
 				  Int_t cathode, Int_t chamber,
 				  TString displayHistoName, TString displayHistoTitle,
 				  EDisplayOption displayOpt=kDefaultDisplay);
 
-  void FillBins(TH1* inputHisto, TH2* displayHisto,
+  void FillBins(TObject* inputHisto, TH2* displayHisto,
 		Int_t iElement1, Int_t iElement2,
 		Float_t x1, Float_t x2, Float_t y1, Float_t y2,
 		const Float_t kShiftX, const Float_t kShiftY,