Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGLF / FORWARD / analysis2 / AliFMDMCDensityCalculator.cxx

diff --git a/PWGLF/FORWARD/analysis2/AliFMDMCDensityCalculator.cxx b/PWGLF/FORWARD/analysis2/AliFMDMCDensityCalculator.cxx
index f670404b46de39011d9ac6d6eb43392d9503ffd0..5a661660c86cd993c16b600a5ca7438db55f394b 100644 (file)
--- a/PWGLF/FORWARD/analysis2/AliFMDMCDensityCalculator.cxx
+++ b/PWGLF/FORWARD/analysis2/AliFMDMCDensityCalculator.cxx
@@ -56,7 +56,7 @@ AliFMDMCDensityCalculator::operator=(const AliFMDMCDensityCalculator& o)
 
 //____________________________________________________________________
 void
-AliFMDMCDensityCalculator::Init(const TAxis& eAxis)
+AliFMDMCDensityCalculator::SetupForData(const TAxis& eAxis)
 {
   // 
   // Initialize this object 
@@ -64,7 +64,7 @@ AliFMDMCDensityCalculator::Init(const TAxis& eAxis)
   // Parameters:
   //    etaAxis Eta axis to use 
   //
-  AliFMDDensityCalculator::Init(eAxis);
+  AliFMDDensityCalculator::SetupForData(eAxis);
   fFMD1i  = Make(1,'I',eAxis);
   fFMD2i  = Make(2,'I',eAxis);
   fFMD2o  = Make(2,'O',eAxis);
@@ -133,7 +133,7 @@ AliFMDMCDensityCalculator::CalculateMC(const AliESDFMD&        fmd,
          Float_t phi = fmd.Phi(d,r,s,t) / 180 * TMath::Pi();
          Float_t eta = fmd.Eta(d,r,s,t);
 
-         Float_t corr = Correction(d, r, s, t, 0, eta, false);
+         Float_t corr = Correction(d, r, t, eta, false);
          Float_t sig  = (corr <= 0 ? 0 : mult / corr);
          h->Fill(eta,phi,sig);
        }
@@ -211,7 +211,7 @@ AliFMDMCDensityCalculator::Make(UShort_t d, Char_t r, Int_t max) const
   //
   TH1D* ret = new TH1D(Form("FMD%d%c_diff_mc_esd", d, r),
                       Form("ESD-MC difference for FMD%d%c", d, r),
-                      20*max,-max, max);
+                      5*max,-max, max);
   ret->GetXaxis()->SetTitle("MC - ESD");
   ret->SetFillColor(AliForwardUtil::RingColor(d,r));
   ret->SetLineColor(AliForwardUtil::RingColor(d,r));
@@ -298,7 +298,7 @@ AliFMDMCDensityCalculator::CompareResults(AliForwardUtil::Histos& esd,
 
 //____________________________________________________________________
 void
-AliFMDMCDensityCalculator::DefineOutput(TList* dir)
+AliFMDMCDensityCalculator::CreateOutputObjects(TList* dir)
 {
   // 
   // Output diagnostic histograms to directory 
@@ -306,7 +306,7 @@ AliFMDMCDensityCalculator::DefineOutput(TList* dir)
   // Parameters:
   //    dir List to write in
   //  
-  AliFMDDensityCalculator::DefineOutput(dir);
+  AliFMDDensityCalculator::CreateOutputObjects(dir);
   TList* d = static_cast<TList*>(dir->FindObject(GetName()));
 
   fComps = new TList;