Last fix

Author: ddobrigk

Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

@@ -436,6 +436,14 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
       lNpNcEcc->GetYaxis()->SetRange(lNpNcEcc->GetYaxis()->FindBin(fNcoll[ibin]), lNpNcEcc->GetYaxis()->FindBin(fNcoll[ibin]));
       hEccentricity = reinterpret_cast<TH1D*>(lNpNcEcc->Project3D("z"));
       hEccentricity->SetName(Form("hEccentricity_%i", ibin));
+
+      // normalize into unitary fractions
+      Double_t eccIntegral = hEccentricity->Integral(1, hEccentricity->GetNbinsX()+1); 
+      if(eccIntegral>1e-6){ // no counts
+        hEccentricity->Scale(1./eccIntegral);
+      }else{
+        hEccentricity->Scale(0.0);
+      }
     }
 
     // impact parameter handling
@@ -446,6 +454,14 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
       lNpNcB->GetYaxis()->SetRange(lNpNcB->GetYaxis()->FindBin(fNcoll[ibin]), lNpNcB->GetYaxis()->FindBin(fNcoll[ibin]));
       hImpactParameter = reinterpret_cast<TH1D*>(lNpNcB->Project3D("z"));
       hImpactParameter->SetName(Form("hImpactParameter_%i", ibin));
+
+      // normalize into unitary fractions
+      Double_t bIntegral = hImpactParameter->Integral(1, hImpactParameter->GetNbinsX()+1); 
+      if(bIntegral>1e-6){ // no counts
+        hImpactParameter->Scale(1./bIntegral);
+      }else{
+        hImpactParameter->Scale(0.0);
+      }
     }
 
     for (Long_t lMultValue = 1; lMultValue < lHiRange; lMultValue++) {
@@ -471,7 +487,7 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
       lNCollProf->Fill(lMultValueToFill, fNcoll[ibin], lProbability);
       if (lNancestor2DPlot) {
         // fill cross-check histogram with lNancestorCount at lNancestors value
-        lNancestor2DPlot->Fill(lMultValueToFill, lNancestors, lProbability * lNancestorCount);
+        lNancestor2DPlot->Fill(lMultValueToFill, lNancestors, lProbability);
       }
       if (lNPart2DPlot)
         lNPart2DPlot->Fill(lMultValueToFill, fNpart[ibin], lProbability);
@@ -480,13 +496,13 @@ void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCol
       if (lNpNcEcc) {
         // collapse the entire eccentricity distribution for this combo
         for (int ib = 1; ib < hEccentricity->GetNbinsX() + 1; ib++) {
-          lEcc2DPlot->Fill(lMultValueToFill, hEccentricity->GetBinCenter(ib), lProbability * lNancestorCount * hEccentricity->GetBinContent(ib));
+          lEcc2DPlot->Fill(lMultValueToFill, hEccentricity->GetBinCenter(ib), lProbability * hEccentricity->GetBinContent(ib));
         }
       }
       if (lNpNcB) {
         // collapse the entire impact parameter distribution for this combo
         for (int ib = 1; ib < hImpactParameter->GetNbinsX() + 1; ib++) {
-          lB2DPlot->Fill(lMultValueToFill, hImpactParameter->GetBinCenter(ib), lProbability * lNancestorCount * hImpactParameter->GetBinContent(ib));
+          lB2DPlot->Fill(lMultValueToFill, hImpactParameter->GetBinCenter(ib), lProbability * hImpactParameter->GetBinContent(ib));
         }
       }
     }