coverity fixes

[u/mrichter/AliRoot.git] / PWG0 / AliCorrectionMatrix2D.cxx

diff --git a/PWG0/AliCorrectionMatrix2D.cxx b/PWG0/AliCorrectionMatrix2D.cxx
index 6cfee1835445a13b834a9e5086558b027def1e9f..be0bc76b93f5ecb9362cf7d69486e7e64b6cdeaa 100644 (file)
--- a/PWG0/AliCorrectionMatrix2D.cxx
+++ b/PWG0/AliCorrectionMatrix2D.cxx
@@ -8,6 +8,7 @@
 //
 
 #include <TH2F.h>
+#include <TMath.h>
 
 #include <AliLog.h>
 
@@ -52,9 +53,15 @@ AliCorrectionMatrix2D::AliCorrectionMatrix2D(const Char_t* name, const Char_t* t
   // constructor
   //
 
-  fhMeas  = new TH2F(Form("meas_%s",name), Form("meas_%s",title),  nBinX, Xmin, Xmax, nBinY, Ymin, Ymax);
-  fhGene  = new TH2F(Form("gene_%s",name), Form("gene_%s",title),  nBinX, Xmin, Xmax, nBinY, Ymin, Ymax);
-  fhCorr  = new TH2F(Form("corr_%s",name), Form("corr_%s",title),  nBinX, Xmin, Xmax, nBinY, Ymin, Ymax);
+  // do not add this hists to the directory
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
+  fhMeas  = new TH2F("measured",   Form("%s measured", GetTitle()),   nBinX, Xmin, Xmax, nBinY, Ymin, Ymax);
+  fhGene  = new TH2F("generated",  Form("%s generated", GetTitle()),  nBinX, Xmin, Xmax, nBinY, Ymin, Ymax);
+  fhCorr  = new TH2F("correction", Form("%s correction", GetTitle()), nBinX, Xmin, Xmax, nBinY, Ymin, Ymax);
+
+  TH1::AddDirectory(oldStatus);
 
   fhMeas->Sumw2();
   fhGene->Sumw2();
@@ -70,11 +77,17 @@ AliCorrectionMatrix2D::AliCorrectionMatrix2D(const Char_t* name, const Char_t* t
   // constructor
   //
 
-  fhMeas  = new TH2F(Form("meas_%s",name), Form("meas_%s",title),  nBinX, X, nBinY, Y);
-  fhGene  = new TH2F(Form("gene_%s",name), Form("gene_%s",title),  nBinX, X, nBinY, Y);
-  fhCorr  = new TH2F(Form("corr_%s",name), Form("corr_%s",title),  nBinX, X, nBinY, Y);
+  // do not add this hists to the directory
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
 
-  fhMeas->Sumw2();
+       fhMeas  = new TH2F("measured",   Form("%s measured",title),   nBinX, X, nBinY, Y);
+  fhGene  = new TH2F("generated",  Form("%s generated",title),  nBinX, X, nBinY, Y);
+  fhCorr  = new TH2F("correction", Form("%s correction",title), nBinX, X, nBinY, Y);
+
+  TH1::AddDirectory(oldStatus);
+
+       fhMeas->Sumw2();
   fhGene->Sumw2();
   fhCorr->Sumw2();
 }
@@ -89,20 +102,20 @@ AliCorrectionMatrix2D::~AliCorrectionMatrix2D()
   // histograms already deleted in base class
 }
 
-TH2F* AliCorrectionMatrix2D::GetGeneratedHistogram() const
+TH2* AliCorrectionMatrix2D::GetGeneratedHistogram() const
 {
   // return generated histogram casted to correct type
-  return dynamic_cast<TH2F*> (fhGene);
+  return dynamic_cast<TH2*> (fhGene);
 }
 
-TH2F* AliCorrectionMatrix2D::GetMeasuredHistogram() const
+TH2* AliCorrectionMatrix2D::GetMeasuredHistogram() const
 {
   // return measured histogram casted to correct type
-  return dynamic_cast<TH2F*> (fhMeas);
+  return dynamic_cast<TH2*> (fhMeas);
 }
 
 //____________________________________________________________________
-TH1F* AliCorrectionMatrix2D::Get1DCorrection(Char_t* opt)
+TH1* AliCorrectionMatrix2D::Get1DCorrectionHistogram(const Char_t* opt, Float_t min, Float_t max, Bool_t binomialErrors)
 {
   //
   // integrate the correction over one variable 
@@ -112,35 +125,76 @@ TH1F* AliCorrectionMatrix2D::Get1DCorrection(Char_t* opt)
   TH1D* gene1D = 0; 
 
   if (strcmp(opt,"x")==0) {
-    meas1D = GetMeasuredHistogram()->ProjectionX();
-    gene1D = GetGeneratedHistogram()->ProjectionX();
+    Int_t binMin = fhMeas->GetYaxis()->FindBin(min);
+    Int_t binMax = fhGene->GetYaxis()->FindBin(max);
+
+    if (min>=max) {
+      meas1D = ((TH2F*)fhMeas)->ProjectionX();
+      gene1D = ((TH2F*)fhGene)->ProjectionX();
+    }
+    else {
+      Printf("Getting 1D map. Including y-bins %d to %d", binMin, binMax);
+
+      meas1D = ((TH2F*)fhMeas)->ProjectionX(Form("%s_x_pm", GetName()),binMin,binMax);
+      gene1D = ((TH2F*)fhGene)->ProjectionX(Form("%s_x_pg", GetName()),binMin,binMax);
+    }
+  }
+  else if (strcmp(opt,"y")==0) {
+    Int_t binMin = fhMeas->GetXaxis()->FindBin(min);
+    Int_t binMax = fhMeas->GetXaxis()->FindBin(max);
+
+    if (min>=max) {
+      meas1D = ((TH2F*)fhMeas)->ProjectionY();
+      gene1D = ((TH2F*)fhGene)->ProjectionY();
+    }
+    else {
+      Printf("Getting 1D map. Including x-bins %d to %d \n", binMin, binMax);
+
+      meas1D = ((TH2F*)fhMeas)->ProjectionY(Form("%s_y_pm", GetName()), binMin, binMax);
+      gene1D = ((TH2F*)fhGene)->ProjectionY(Form("%s_y_pg", GetName()), binMin, binMax);
+    }
   }
-  if (strcmp(opt,"y")==0) {
-    meas1D = GetMeasuredHistogram()->ProjectionY();
-    gene1D = GetGeneratedHistogram()->ProjectionY();
+  else {
+    Printf("ERROR: Invalid option");
+    return 0;
   }
-  gene1D->Sumw2();
 
+  if (!binomialErrors)
+  {
+    // set the errors on gene manually, and clear the ones on meas.
+    gene1D->Sumw2();
+    for (Int_t bin=0; bin <= gene1D->GetNbinsX()+1; bin++)
+    {
+      gene1D->SetBinError(bin, TMath::Sqrt(gene1D->GetBinContent(bin)));
+      meas1D->SetBinError(bin, 0);
+    }
+  }
+  
   gene1D->SetName(Form("corr_1D_%s",fName.Data()));
   gene1D->SetTitle(Form("corr_1D_%s",fName.Data()));
+ 
+  TH1* divided = (TH1*) gene1D->Clone(Form("corr_1D_%s",fName.Data()));
+  divided->Reset();
+  
+  divided->Divide(gene1D, meas1D, 1, 1, (binomialErrors) ? "B" : "");
 
-  gene1D->Divide(gene1D, meas1D, 1, 1, "B");
+  Printf("%p %p", gene1D, meas1D);
   
-  return (TH1F*)gene1D;   
+  return (TH1F*)divided;   
 }
 
 //____________________________________________________________________
 void AliCorrectionMatrix2D::FillMeas(Float_t ax, Float_t ay)
 {
   // add value to measured histogram
-  GetMeasuredHistogram()->Fill(ax, ay);
+  ((TH2F*)fhMeas)->Fill(ax, ay);
 }
 
 //____________________________________________________________________
 void AliCorrectionMatrix2D::FillGene(Float_t ax, Float_t ay)
 {
   // add value to generated histogram
-  GetGeneratedHistogram()->Fill(ax, ay);
+  ((TH2F*)fhGene)->Fill(ax, ay);
 }
 
 //____________________________________________________________________
@@ -211,3 +265,13 @@ void AliCorrectionMatrix2D::RemoveEdges(Float_t cut, Int_t nBinsXedge, Int_t nBi
 
 }
 
+//____________________________________________________________________
+void AliCorrectionMatrix2D::Rebin(Int_t x, Int_t y)
+{
+       // rebins the histograms, recalculates the correction
+
+        GetGeneratedHistogram()->Rebin2D(x, y);
+        GetMeasuredHistogram()->Rebin2D(x, y);
+        GetCorrectionHistogram()->Rebin2D(x, y);
+        Divide();
+}