Added files for the reference version based on an old version of Anders'

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

diff --git a/HLT/hough/AliL3Histogram.cxx b/HLT/hough/AliL3Histogram.cxx
index ccc9cee0fa6eb40533e19422e09b051a49462d1b..e006985ed04313e37ac2df63f264009cea9d023c 100644 (file)
--- a/HLT/hough/AliL3Histogram.cxx
+++ b/HLT/hough/AliL3Histogram.cxx
@@ -8,7 +8,7 @@
 #include "AliL3Logging.h"
 #include "AliL3Histogram.h"
 
-#if __GNUC__ == 3
+#if __GNUC__ >= 3
 using namespace std;
 #endif
 
@@ -29,6 +29,7 @@ ClassImp(AliL3Histogram)
 
 AliL3Histogram::AliL3Histogram()
 {
+  // Default constructor
   fNxbins = 0;
   fNybins = 0;
   fNcells = 0;
@@ -50,10 +51,11 @@ AliL3Histogram::AliL3Histogram()
 #endif
 }
 
-AliL3Histogram::AliL3Histogram(Char_t *name,Char_t *id,
+AliL3Histogram::AliL3Histogram(Char_t *name,Char_t */*id*/,
                               Int_t nxbin,Double_t xmin,Double_t xmax,
                               Int_t nybin,Double_t ymin,Double_t ymax) 
 {
+  // Normal constructor
   strcpy(fName,name);
 
   fNxbins = nxbin;
@@ -93,6 +95,7 @@ AliL3Histogram::~AliL3Histogram()
 
 void AliL3Histogram::Reset()
 {
+  // Reset histogram contents
   if(fContent)
     for(Int_t i=0; i<fNcells; i++) fContent[i] = 0;
 
@@ -101,6 +104,7 @@ void AliL3Histogram::Reset()
 
 void AliL3Histogram::Fill(Double_t x,Double_t y,Int_t weight)
 {
+  // Fill the weight into a bin which correspond to x and y
   Int_t bin = FindBin(x,y);
 #ifdef _IFON_
   if(bin < 0)
@@ -112,6 +116,7 @@ void AliL3Histogram::Fill(Double_t x,Double_t y,Int_t weight)
 
 void AliL3Histogram::Fill(Double_t x,Int_t ybin,Int_t weight)
 {
+  // Fill the weight into a bin which correspond to x and ybin
   Int_t xbin = FindXbin(x);
   Int_t bin = GetBin(xbin,ybin);
 #ifdef _IFON_
@@ -124,6 +129,7 @@ void AliL3Histogram::Fill(Double_t x,Int_t ybin,Int_t weight)
 
 void AliL3Histogram::Fill(Int_t xbin,Double_t y,Int_t weight)
 {
+  // Fill the weight into a bin which correspond to xbin and y
   Int_t ybin = FindYbin(y);
   Int_t bin = GetBin(xbin,ybin);
 #ifdef _IFON_
@@ -136,6 +142,7 @@ void AliL3Histogram::Fill(Int_t xbin,Double_t y,Int_t weight)
 
 void AliL3Histogram::Fill(Int_t xbin,Int_t ybin,Int_t weight)
 {
+  // Fill the weight into a bin which correspond to xbin and ybin
   Int_t bin = GetBin(xbin,ybin);
 #ifdef _IFON_
   if(bin < 0)
@@ -147,6 +154,7 @@ void AliL3Histogram::Fill(Int_t xbin,Int_t ybin,Int_t weight)
 
 Int_t AliL3Histogram::FindBin(Double_t x,Double_t y) const
 {
+  // Finds the bin which correspond to x and y
   Int_t xbin = FindXbin(x);
   Int_t ybin = FindYbin(y);
 #ifdef _IFON_
@@ -157,8 +165,22 @@ Int_t AliL3Histogram::FindBin(Double_t x,Double_t y) const
   return GetBin(xbin,ybin);
 }
 
+Int_t AliL3Histogram::FindLabelBin(Double_t x,Double_t y) const
+{
+  // Returns the corresponding bin with the mc labels
+  Int_t xbin = FindXbin(x);
+  Int_t ybin = FindYbin(y);
+#ifdef _IFON_
+  if(!xbin || !ybin)
+    return -1;
+#endif
+  
+  return GetLabelBin(xbin,ybin);
+}
+
 Int_t AliL3Histogram::FindXbin(Double_t x) const
 {
+  // Finds the bin which correspond to x
   if(x < fXmin || x > fXmax)
     return 0;
   
@@ -167,6 +189,7 @@ Int_t AliL3Histogram::FindXbin(Double_t x) const
 
 Int_t AliL3Histogram::FindYbin(Double_t y) const
 {
+  // Finds the bin which correspond to y
   if(y < fYmin || y > fYmax)
     return 0;
   
@@ -175,6 +198,7 @@ Int_t AliL3Histogram::FindYbin(Double_t y) const
 
 Int_t AliL3Histogram::GetBin(Int_t xbin,Int_t ybin) const
 {
+  // Returns the bin which correspond to xbin and ybin
   if(xbin < fFirstXbin || xbin > fLastXbin)
     return 0;
   if(ybin < fFirstYbin || ybin > fLastYbin)
@@ -183,8 +207,20 @@ Int_t AliL3Histogram::GetBin(Int_t xbin,Int_t ybin) const
   return xbin + ybin*(fNxbins+2);
 }
 
+Int_t AliL3Histogram::GetLabelBin(Int_t xbin,Int_t ybin) const
+{
+  // Returns the corresponding bin with the mc labels
+  if(xbin < fFirstXbin || xbin > fLastXbin)
+    return -1;
+  if(ybin < fFirstYbin || ybin > fLastYbin)
+    return -1;
+    
+  return (Int_t)(xbin/2) + ((Int_t)(ybin/2))*((Int_t)((fNxbins+3)/2));
+}
+
 Int_t AliL3Histogram::GetBinContent(Int_t bin) const
 {
+  // Return the bin content
   if(bin >= fNcells)
     {
       LOG(AliL3Log::kError,"AliL3Histogram::GetBinContent","array")<<AliL3Log::kDec<<
@@ -199,6 +235,7 @@ Int_t AliL3Histogram::GetBinContent(Int_t bin) const
 
 void AliL3Histogram::SetBinContent(Int_t xbin,Int_t ybin,Int_t value)
 {
+  // Set bin content
   Int_t bin = GetBin(xbin,ybin);
 #ifdef _IFON_
   if(bin == 0) 
@@ -210,6 +247,7 @@ void AliL3Histogram::SetBinContent(Int_t xbin,Int_t ybin,Int_t value)
 
 void AliL3Histogram::SetBinContent(Int_t bin,Int_t value)
 {
+  // Set bin content
 
   if(bin >= fNcells)
     {
@@ -225,6 +263,7 @@ void AliL3Histogram::SetBinContent(Int_t bin,Int_t value)
 
 void AliL3Histogram::AddBinContent(Int_t xbin,Int_t ybin,Int_t weight)
 {
+  // Adds weight to bin content
   Int_t bin = GetBin(xbin,ybin);
 #ifdef _IFON_
   if(bin == 0)
@@ -236,6 +275,7 @@ void AliL3Histogram::AddBinContent(Int_t xbin,Int_t ybin,Int_t weight)
 
 void AliL3Histogram::AddBinContent(Int_t bin,Int_t weight)
 {
+  // Adds weight to bin content
   if(bin < 0 || bin > fNcells)
     {
       LOG(AliL3Log::kError,"AliL3Histogram::AddBinContent","array")<<AliL3Log::kDec<<
@@ -248,7 +288,7 @@ void AliL3Histogram::AddBinContent(Int_t bin,Int_t weight)
   fContent[bin] += weight;
 }
 
-void AliL3Histogram::Add(AliL3Histogram *h1,Double_t weight)
+void AliL3Histogram::Add(AliL3Histogram *h1,Double_t /*weight*/)
 {
   //Adding two histograms. Should be identical.
   
@@ -282,6 +322,7 @@ void AliL3Histogram::Add(AliL3Histogram *h1,Double_t weight)
 
 Double_t AliL3Histogram::GetBinCenterX(Int_t xbin) const
 {
+  // Returns the position of the center of a bin
   if(xbin < fFirstXbin || xbin > fLastXbin)
     {
       LOG(AliL3Log::kError,"AliL3Histogram::GetBinCenterX","xbin")
@@ -294,6 +335,7 @@ Double_t AliL3Histogram::GetBinCenterX(Int_t xbin) const
 
 Double_t AliL3Histogram::GetBinCenterY(Int_t ybin) const
 {
+  // Returns the position of the center of a bin
   if(ybin < fFirstYbin || ybin > fLastYbin)
     {
       LOG(AliL3Log::kError,"AliL3Histogram::GetBinCenterY","ybin")
@@ -306,7 +348,8 @@ Double_t AliL3Histogram::GetBinCenterY(Int_t ybin) const
 
 Double_t AliL3Histogram::GetPreciseBinCenterX(Float_t xbin) const
 {
-  if(xbin < fFirstXbin || xbin > fLastXbin)
+  // Returns the position of the center of a bin using precise values inside the bin
+  if(xbin < (fFirstXbin-1.5) || xbin > (fLastXbin+1.5))
     {
       LOG(AliL3Log::kError,"AliL3Histogram::GetBinCenterX","xbin")
        <<"Bin-value out of range "<<xbin<<ENDLOG;
@@ -318,7 +361,8 @@ Double_t AliL3Histogram::GetPreciseBinCenterX(Float_t xbin) const
 
 Double_t AliL3Histogram::GetPreciseBinCenterY(Float_t ybin) const
 {
-  if(ybin < fFirstYbin || ybin > fLastYbin)
+  // Returns the position of the center of a bin using precise values inside the bin
+  if(ybin < (fFirstYbin-1.5) || ybin > (fLastYbin+1.5))
     {
       LOG(AliL3Log::kError,"AliL3Histogram::GetBinCenterY","ybin")
        <<"Bin-value out of range "<<ybin<<ENDLOG;
@@ -330,6 +374,7 @@ Double_t AliL3Histogram::GetPreciseBinCenterY(Float_t ybin) const
 
 void AliL3Histogram::Draw(Char_t *option)
 {
+  // Fill the contents of the corresponding ROOT histogram and draws it 
 #ifdef use_root
   if(!fRootHisto)
     CreateRootHisto();
@@ -346,18 +391,20 @@ void AliL3Histogram::Draw(Char_t *option)
   //fRootHisto->SetStats(kFALSE);
   fRootHisto->Draw(option);
   return;
-#endif
+#else
   cerr<<"AliL3Histogram::Draw : You need to compile with ROOT in order to draw histogram"<<endl;
-  
+#endif  
 }
 
 void AliL3Histogram::CreateRootHisto()
 {
+  // Create ROOT histogram out of AliL3Histogram
 #ifdef use_root
   fRootHisto = new TH2F(fName,"",fNxbins,fXmin,fXmax,fNybins,fYmin,fYmax);
   return;
-#endif
+#else
   cerr<<"AliL3Histogram::CreateRootHisto : You need to compile with ROOT in order to create ROOT histogram"<<endl;
+#endif
 }
 
 ofstream& operator<<(ofstream &o, const AliL3Histogram &h)