- check for AliRoot features/libs/files and corresponding conditional

[u/mrichter/AliRoot.git] / HLT / hough / AliL3Histogram.h

diff --git a/HLT/hough/AliL3Histogram.h b/HLT/hough/AliL3Histogram.h
index 44d24b8fcc91ea66267ae19a104a05d653ba3aab..4381b8a1809cc71e2195a42d26fe450c16410845 100644 (file)
--- a/HLT/hough/AliL3Histogram.h
+++ b/HLT/hough/AliL3Histogram.h
@@ -1,7 +1,7 @@
 // @(#) $Id$
 
-#ifndef ALIL3_HISTOGRAM
-#define ALIL3_HISTOGRAM
+#ifndef ALIL3HISTOGRAM_H
+#define ALIL3HISTOGRAM_H
 
 #include "AliL3StandardIncludes.h"
 #include "AliL3RootTypes.h"
@@ -12,33 +12,6 @@
 #endif
 
 class AliL3Histogram {
-  
- private:
-  Double_t fBinwidthX;
-  Double_t fBinwidthY;
-  
- protected:
-  Int_t *fContent; //!
-  Char_t fName[100];
-  Int_t fNxbins;
-  Int_t fNybins;
-  Int_t fNcells;
-  Int_t fEntries;
-  Int_t fFirstXbin;
-  Int_t fFirstYbin;
-  Int_t fLastXbin;
-  Int_t fLastYbin;
-  Int_t fThreshold;
-
-  Double_t fXmin;
-  Double_t fYmin;
-  Double_t fXmax;
-  Double_t fYmax;
-
-#ifdef use_root
-  TH2F *fRootHisto;
-#endif  
-  
  public:
 
   AliL3Histogram();
@@ -51,9 +24,11 @@ class AliL3Histogram {
   virtual void Fill(Int_t xbin,Double_t y,Int_t weight=1);
   virtual void Fill(Int_t xbin,Int_t ybin,Int_t weight=1);
   virtual Int_t FindBin(Double_t x,Double_t y) const;
+  virtual Int_t FindLabelBin(Double_t x,Double_t y) const;
   virtual Int_t FindXbin(Double_t x) const;
   virtual Int_t FindYbin(Double_t y) const;
   Int_t GetBin(Int_t xbin,Int_t ybin) const;
+  Int_t GetLabelBin(Int_t xbin,Int_t ybin) const;
   Int_t GetBinContent(Int_t bin) const;
   void SetBinContent(Int_t xbin,Int_t ybin,Int_t value);
   void SetBinContent(Int_t bin,Int_t value);
@@ -63,7 +38,7 @@ class AliL3Histogram {
   void SetThreshold(Int_t i) {fThreshold = i;}
   void CreateRootHisto();
   virtual void Draw(Char_t *option="hist");
-  virtual void Print() {};
+  virtual void Print() const {};
 
   friend ofstream& operator<< (ofstream &o, const AliL3Histogram &h);
 
@@ -90,6 +65,34 @@ class AliL3Histogram {
   Int_t GetNbinsX() const {return fNxbins;}
   Int_t GetNbinsY() const {return fNybins;}
   Int_t GetNEntries() const {return fEntries;}
+
+  Int_t *fContent; //!
+  Int_t *GetContentArray() const {return fContent;}
+    
+ protected:
+  Char_t fName[100]; // Name of the histogram
+  Int_t fNxbins; // Number of bins in the histogram
+  Int_t fNybins; // Number of bins in the histogram
+  Int_t fNcells; // Overall number of bins in the histogram
+  Int_t fEntries; // Number of entries in the histogram
+  Int_t fFirstXbin; // First active bin
+  Int_t fFirstYbin; // First active bin
+  Int_t fLastXbin; // Last active bin
+  Int_t fLastYbin; // Last active bin
+  Int_t fThreshold; // Bin content threshold 
+
+  Double_t fXmin; // Lower limit in X
+  Double_t fYmin; // Lower limit in Y
+  Double_t fXmax; // Upper limit in X
+  Double_t fYmax; // Upper limit in Y
+
+#ifdef use_root
+  TH2F *fRootHisto; // Corresponding ROOT histogram
+#endif  
+
+ private:
+  Double_t fBinwidthX; // Bin width of the Hough space
+  Double_t fBinwidthY; // Bin width of the Hough space
   
   ClassDef(AliL3Histogram,1) //2D histogram class