]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG0/dNdEta/AlidNdEtaCorrection.cxx
Updates to the trigger study class
[u/mrichter/AliRoot.git] / PWG0 / dNdEta / AlidNdEtaCorrection.cxx
index 1fdd40bf5667b20aaa8d7cb018a34e6109745f79..2f52464ab64b437e774b826eca0fefcecac25b08 100644 (file)
@@ -1,10 +1,31 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
 /* $Id$ */
 
 #include "AlidNdEtaCorrection.h"
 
+#include <AliLog.h>
 #include <TCanvas.h>
 #include <TH3F.h>
+#include <TH2F.h>
 #include <TH1D.h>
+#include <TDirectory.h>
+#include <AliCorrection.h>
+#include <AliCorrectionMatrix2D.h>
+#include <AliCorrectionMatrix3D.h>
 
 //____________________________________________________________________
 ClassImp(AlidNdEtaCorrection)
@@ -14,45 +35,35 @@ AlidNdEtaCorrection::AlidNdEtaCorrection()
   : TNamed(),
   fTrack2ParticleCorrection(0),
   fVertexRecoCorrection(0),
-  fTriggerCorrection(0),
-  fTriggerBiasCorrection(0),
-  fNEvents(0),
-  fNTriggeredEvents(0)
+  fTriggerBiasCorrectionMBToINEL(0),
+  fTriggerBiasCorrectionMBToNSD(0),
+  fTriggerBiasCorrectionMBToND(0),
+  fTriggerBiasCorrectionMBToOnePart(0)
 {
   // default constructor
 }
 
 //____________________________________________________________________
-AlidNdEtaCorrection::AlidNdEtaCorrection(const Char_t* name, const Char_t* title)
+AlidNdEtaCorrection::AlidNdEtaCorrection(const Char_t* name, const Char_t* title, AliPWG0Helper::AnalysisMode analysis)
   : TNamed(name, title),
   fTrack2ParticleCorrection(0),
   fVertexRecoCorrection(0),
-  fTriggerCorrection(0),
-  fTriggerBiasCorrection(0),
-  fNEvents(0),
-  fNTriggeredEvents(0)
+  fTriggerBiasCorrectionMBToINEL(0),
+  fTriggerBiasCorrectionMBToNSD(0),
+  fTriggerBiasCorrectionMBToND(0),
+  fTriggerBiasCorrectionMBToOnePart(0)
 {
+  //
   // constructor
   //
 
-  Float_t binLimitsPt[] = {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.5, 2.0, 10.0, 100.0};
-
-  fTrack2ParticleCorrection = new AliCorrectionMatrix3D("nTrackToNPart", "nTrackToNPart", 40, -20, 20, 60, -6, 6, 14, binLimitsPt);
-
-  Float_t binLimitsN[]   = {-0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
-                           10.5, 12.5, 14.5, 16.5, 18.5, 20.5, 25.5, 30.5, 40.5, 50.5, 100.5, 300.5};
-  Float_t binLimitsVtx[] = {-20,-15,-10,-6,-3,0,3,6,10,15,20};
+  fTrack2ParticleCorrection = new AliCorrection("Track2Particle", "Track2Particle", analysis);
+  fVertexRecoCorrection     = new AliCorrection("VertexReconstruction", "VertexReconstruction", analysis);
 
-  fVertexRecoCorrection        = new AliCorrectionMatrix2D("vtxReco",       "vtxReco",10,binLimitsVtx ,22,binLimitsN);
-  fTriggerCorrection           = new AliCorrectionMatrix2D("trigger",       "trigger",10,binLimitsVtx ,22,binLimitsN);
-
-  fTriggerBiasCorrection       = new AliCorrectionMatrix2D("triggerBias",   "triggerBias",120,-6,6,100, 0, 10);
-
-  fTrack2ParticleCorrection ->SetAxisTitles("vtx z [cm]", "#eta", "p_{T} [GeV/c]");
-  fVertexRecoCorrection        ->SetAxisTitles("vtx z [cm]", "Ntracks");
-  fTriggerCorrection        ->SetAxisTitles("vtx z [cm]", "Ntracks");
-
-  fTriggerBiasCorrection       ->SetAxisTitles("#eta", "p_{T} [GeV/c]");
+  fTriggerBiasCorrectionMBToINEL = new AliCorrection("TriggerBias_MBToINEL", "TriggerBias_MBToINEL", analysis);
+  fTriggerBiasCorrectionMBToNSD  = new AliCorrection("TriggerBias_MBToNSD", "TriggerBias_MBToNSD", analysis);
+  fTriggerBiasCorrectionMBToND   = new AliCorrection("TriggerBias_MBToND", "TriggerBias_MBToND", analysis);
+  fTriggerBiasCorrectionMBToOnePart   = new AliCorrection("TriggerBias_MBToOnePart", "TriggerBias_MBToOnePart", analysis);
 }
 
 //____________________________________________________________________
@@ -60,28 +71,34 @@ AlidNdEtaCorrection::~AlidNdEtaCorrection()
 {
   // destructor
 
-  if (fTrack2ParticleCorrection)
-  {
+  if (fTrack2ParticleCorrection) {
     delete fTrack2ParticleCorrection;
     fTrack2ParticleCorrection = 0;
   }
 
-  if (fVertexRecoCorrection)
-  {
+  if (fVertexRecoCorrection) {
     delete fVertexRecoCorrection;
     fVertexRecoCorrection = 0;
   }
 
-  if (fTriggerCorrection)
-  {
-    delete fTriggerCorrection;
-    fTriggerCorrection = 0;
+  if (fTriggerBiasCorrectionMBToINEL) {
+    delete fTriggerBiasCorrectionMBToINEL;
+    fTriggerBiasCorrectionMBToINEL = 0;
   }
 
-  if (fTriggerBiasCorrection)
-  {
-    delete fTriggerBiasCorrection;
-    fTriggerBiasCorrection = 0;
+  if (fTriggerBiasCorrectionMBToNSD) {
+    delete fTriggerBiasCorrectionMBToNSD;
+    fTriggerBiasCorrectionMBToNSD = 0;
+  }
+
+  if (fTriggerBiasCorrectionMBToND) {
+    delete fTriggerBiasCorrectionMBToND;
+    fTriggerBiasCorrectionMBToND = 0;
+  }
+
+  if (fTriggerBiasCorrectionMBToOnePart) {
+    delete fTriggerBiasCorrectionMBToOnePart;
+    fTriggerBiasCorrectionMBToOnePart = 0;
   }
 }
 
@@ -94,42 +111,23 @@ AlidNdEtaCorrection::Finish() {
   // divide the histograms in the AliCorrectionMatrix2D objects to get the corrections
 
   fTrack2ParticleCorrection->Divide();
-
-  TH3F* hist = fTrack2ParticleCorrection->GetCorrectionHistogram();
-  Int_t emptyBins = 0;
-  for (Int_t x=hist->GetXaxis()->FindBin(-10); x<=hist->GetXaxis()->FindBin(10); ++x)
-    for (Int_t y=hist->GetYaxis()->FindBin(-0.8); y<=hist->GetYaxis()->FindBin(0.8); ++y)
-      for (Int_t z=hist->GetZaxis()->FindBin(0.3); z<=hist->GetZaxis()->FindBin(9.9); ++z)
-        if (hist->GetBinContent(x, y, z) == 0)
-        {
-          printf("Empty bin in fTrack2ParticleCorrection at vtx = %f, eta = %f, pt = %f\n", hist->GetXaxis()->GetBinCenter(x), hist->GetYaxis()->GetBinCenter(y), hist->GetZaxis()->GetBinCenter(z));
-          ++emptyBins;
-        }
-
-  printf("INFO: In the central region fTrack2ParticleCorrection has %d empty bins\n", emptyBins);
-
   fVertexRecoCorrection->Divide();
-  fTriggerCorrection->Divide();
-
-  if (fNEvents == 0)
-  {
-    printf("ERROR: fNEvents is empty. Cannot scale histogram. Skipping processing of fTriggerBiasCorrection\n");
-    return;
-  }
-  fTriggerBiasCorrection->GetMeasuredHistogram()->Scale(Double_t(fNTriggeredEvents)/Double_t(fNEvents));
-  fTriggerBiasCorrection->Divide();
+  fTriggerBiasCorrectionMBToINEL->Divide();
+  fTriggerBiasCorrectionMBToNSD->Divide();
+  fTriggerBiasCorrectionMBToND->Divide();
+  fTriggerBiasCorrectionMBToOnePart->Divide();
 }
 
 //____________________________________________________________________
-Long64_t 
-AlidNdEtaCorrection::Merge(TCollection* list) {
+Long64_t AlidNdEtaCorrection::Merge(TCollection* list)
+{
   // Merge a list of dNdEtaCorrection objects with this (needed for
-  // PROOF). 
+  // PROOF).
   // Returns the number of merged objects (including this).
 
   if (!list)
     return 0;
-  
+
   if (list->IsEmpty())
     return 1;
 
@@ -137,58 +135,120 @@ AlidNdEtaCorrection::Merge(TCollection* list) {
   TObject* obj;
 
   // collections of measured and generated histograms
-  TList* collectionNtrackToNparticle = new TList;
-  TList* collectionVertexReco        = new TList;
-  TList* collectionTriggerBias       = new TList;
+  TList* collectionNtrackToNparticle    = new TList;
+  TList* collectionVertexReco           = new TList;
+  TList* collectionTriggerBiasMBToINEL  = new TList;
+  TList* collectionTriggerBiasMBToNSD   = new TList;
+  TList* collectionTriggerBiasMBToND    = new TList;
+  TList* collectionTriggerBiasMBToOnePart    = new TList;
 
   Int_t count = 0;
   while ((obj = iter->Next())) {
-    
+
     AlidNdEtaCorrection* entry = dynamic_cast<AlidNdEtaCorrection*> (obj);
-    if (entry == 0) 
+    if (entry == 0)
       continue;
 
-    collectionNtrackToNparticle ->Add(entry->GetTrack2ParticleCorrection());
-    collectionVertexReco        ->Add(entry->GetVertexRecoCorrection());
-    collectionTriggerBias        ->Add(entry->GetTriggerBiasCorrection());
+    collectionNtrackToNparticle  ->Add(entry->fTrack2ParticleCorrection);
+    collectionVertexReco         ->Add(entry->fVertexRecoCorrection);
+    collectionTriggerBiasMBToINEL->Add(entry->fTriggerBiasCorrectionMBToINEL);
+    collectionTriggerBiasMBToNSD ->Add(entry->fTriggerBiasCorrectionMBToNSD);
+    collectionTriggerBiasMBToND  ->Add(entry->fTriggerBiasCorrectionMBToND);
+    collectionTriggerBiasMBToOnePart  ->Add(entry->fTriggerBiasCorrectionMBToOnePart);
 
     count++;
-
-    fNEvents += entry->fNEvents;
-    fNTriggeredEvents += entry->fNTriggeredEvents;
   }
-  fTrack2ParticleCorrection ->Merge(collectionNtrackToNparticle);
-  fVertexRecoCorrection        ->Merge(collectionVertexReco);
-  fTriggerBiasCorrection        ->Merge(collectionTriggerBias);
+  fTrack2ParticleCorrection      ->Merge(collectionNtrackToNparticle);
+  fVertexRecoCorrection          ->Merge(collectionVertexReco);
+  fTriggerBiasCorrectionMBToINEL ->Merge(collectionTriggerBiasMBToINEL);
+  fTriggerBiasCorrectionMBToNSD  ->Merge(collectionTriggerBiasMBToNSD);
+  fTriggerBiasCorrectionMBToND   ->Merge(collectionTriggerBiasMBToND);
+  fTriggerBiasCorrectionMBToOnePart->Merge(collectionTriggerBiasMBToOnePart);
 
   delete collectionNtrackToNparticle;
   delete collectionVertexReco;
-  delete collectionTriggerBias;
-
+  delete collectionTriggerBiasMBToINEL;
+  delete collectionTriggerBiasMBToNSD;
+  delete collectionTriggerBiasMBToND;
+  delete collectionTriggerBiasMBToOnePart;
 
   return count+1;
 }
 
+//____________________________________________________________________
+void AlidNdEtaCorrection::Add(AlidNdEtaCorrection* aCorrectionsToAdd, Float_t c) {
+  //
+  // adds the measured and generated of aCorrectionsToAdd to measured and generated
+  // of all corrections in this
+
+  fTrack2ParticleCorrection      ->Add(aCorrectionsToAdd->GetTrack2ParticleCorrection() ,c);
+  fVertexRecoCorrection          ->Add(aCorrectionsToAdd->GetVertexRecoCorrection()     ,c);
+  fTriggerBiasCorrectionMBToINEL ->Add(aCorrectionsToAdd->GetTriggerBiasCorrectionINEL(),c);
+  fTriggerBiasCorrectionMBToNSD  ->Add(aCorrectionsToAdd->GetTriggerBiasCorrectionNSD() ,c);
+  fTriggerBiasCorrectionMBToND   ->Add(aCorrectionsToAdd->GetTriggerBiasCorrectionND()  ,c);
+  fTriggerBiasCorrectionMBToOnePart   ->Add(aCorrectionsToAdd->GetTriggerBiasCorrectionOnePart()  ,c);
+}
+
+//____________________________________________________________________
+void AlidNdEtaCorrection::Scale(Float_t c) 
+{
+  //
+  // scales all contained corrections
+  // 
+
+  fTrack2ParticleCorrection      ->Scale(c);
+  fVertexRecoCorrection          ->Scale(c);
+  fTriggerBiasCorrectionMBToINEL ->Scale(c);
+  fTriggerBiasCorrectionMBToNSD  ->Scale(c);
+  fTriggerBiasCorrectionMBToND   ->Scale(c);
+  fTriggerBiasCorrectionMBToOnePart   ->Scale(c);
+}
 
 //____________________________________________________________________
-Bool_t
-AlidNdEtaCorrection::LoadHistograms(const Char_t* fileName, const Char_t* dir) {
+void AlidNdEtaCorrection::Reset(void) {
+  //
+  // reset all corrections
+  // 
+
+  fTrack2ParticleCorrection      ->Reset();
+  fVertexRecoCorrection          ->Reset();
+  fTriggerBiasCorrectionMBToINEL ->Reset();
+  fTriggerBiasCorrectionMBToNSD  ->Reset();
+  fTriggerBiasCorrectionMBToND   ->Reset();
+  fTriggerBiasCorrectionMBToOnePart   ->Reset();
+}
+
+
+
+//____________________________________________________________________
+Bool_t AlidNdEtaCorrection::LoadHistograms(const Char_t* dir)
+{
   //
   // loads the histograms
+  // if dir is empty a directory with the name of this object is taken (like in SaveHistogram)
   //
 
-  fTrack2ParticleCorrection ->LoadHistograms(fileName, dir);
-  fVertexRecoCorrection        ->LoadHistograms(fileName, dir);
-  fTriggerCorrection        ->LoadHistograms(fileName, dir);
-  fTriggerBiasCorrection       ->LoadHistograms(fileName, dir);
+  if (!dir)
+    dir = GetName();
+
+  if (!gDirectory->cd(dir))
+    return kFALSE;
+
+  fTrack2ParticleCorrection      ->LoadHistograms();
+  fVertexRecoCorrection          ->LoadHistograms();
+  fTriggerBiasCorrectionMBToINEL ->LoadHistograms();
+  fTriggerBiasCorrectionMBToNSD  ->LoadHistograms();
+  fTriggerBiasCorrectionMBToND   ->LoadHistograms();
+  fTriggerBiasCorrectionMBToOnePart   ->LoadHistograms();
+
+  gDirectory->cd("..");
 
   return kTRUE;
 }
 
-
 //____________________________________________________________________
-void
-AlidNdEtaCorrection::SaveHistograms() {
+void AlidNdEtaCorrection::SaveHistograms()
+{
   //
   // save the histograms
   //
@@ -196,39 +256,135 @@ AlidNdEtaCorrection::SaveHistograms() {
   gDirectory->mkdir(fName.Data());
   gDirectory->cd(fName.Data());
 
-  fTrack2ParticleCorrection->SaveHistograms();
-  fVertexRecoCorrection->SaveHistograms();
-  fTriggerCorrection->SaveHistograms();
-  fTriggerBiasCorrection->SaveHistograms();
+  fTrack2ParticleCorrection     ->SaveHistograms();
+  fVertexRecoCorrection         ->SaveHistograms();
+  fTriggerBiasCorrectionMBToINEL->SaveHistograms();
+  fTriggerBiasCorrectionMBToNSD ->SaveHistograms();
+  fTriggerBiasCorrectionMBToND  ->SaveHistograms();
+  fTriggerBiasCorrectionMBToOnePart->SaveHistograms();
 
-  gDirectory->cd("../");
+  gDirectory->cd("..");
 }
 
 //____________________________________________________________________
 void AlidNdEtaCorrection::DrawHistograms()
 {
   //
-  // call the draw histogram method of the two AliCorrectionMatrix2D objects
+  // call the draw histogram method of the corrections
+  //
+
+  fTrack2ParticleCorrection     ->DrawHistograms();
+  fVertexRecoCorrection         ->DrawHistograms();
+  fTriggerBiasCorrectionMBToINEL->DrawHistograms();
+  fTriggerBiasCorrectionMBToNSD ->DrawHistograms();
+  fTriggerBiasCorrectionMBToND  ->DrawHistograms();
+  fTriggerBiasCorrectionMBToOnePart  ->DrawHistograms();
+}
+
+//____________________________________________________________________
+void AlidNdEtaCorrection::DrawOverview(const char* canvasName)
+{
+  //
+  // call the DrawOverview histogram method of the corrections
+  //
+
+  fTrack2ParticleCorrection     ->DrawOverview(canvasName);
+  fVertexRecoCorrection         ->DrawOverview(canvasName);
+  fTriggerBiasCorrectionMBToINEL->DrawOverview(canvasName);
+  fTriggerBiasCorrectionMBToNSD ->DrawOverview(canvasName);
+  fTriggerBiasCorrectionMBToND  ->DrawOverview(canvasName);
+  fTriggerBiasCorrectionMBToOnePart  ->DrawOverview(canvasName);
+}
+
+//____________________________________________________________________
+void AlidNdEtaCorrection::FillMCParticle(Float_t vtx, Float_t eta, Float_t pt, Bool_t trigger, Bool_t vertex, Int_t processType)
+{
+  // fills a particle in the corrections
+  // it is filled in generated or measured depending of the flags
+
+  fTriggerBiasCorrectionMBToINEL->GetTrackCorrection()->FillGene(vtx, eta, pt);
+
+  if ((processType & AliPWG0Helper::kSD) == 0)
+    fTriggerBiasCorrectionMBToNSD->GetTrackCorrection()->FillGene(vtx, eta, pt);
+
+  if (processType & AliPWG0Helper::kND )
+    fTriggerBiasCorrectionMBToND->GetTrackCorrection()->FillGene(vtx, eta, pt);
+
+  if (processType & AliPWG0Helper::kOnePart)
+    fTriggerBiasCorrectionMBToOnePart->GetTrackCorrection()->FillGene(vtx, eta, pt);
+
+  if (!trigger)
+    return;
+
+  fTriggerBiasCorrectionMBToINEL->GetTrackCorrection()->FillMeas(vtx, eta, pt);
+  fTriggerBiasCorrectionMBToNSD->GetTrackCorrection()->FillMeas(vtx, eta, pt);
+  fTriggerBiasCorrectionMBToND->GetTrackCorrection()->FillMeas(vtx, eta, pt);
+  fTriggerBiasCorrectionMBToOnePart->GetTrackCorrection()->FillMeas(vtx, eta, pt);
+  fVertexRecoCorrection->GetTrackCorrection()->FillGene(vtx, eta, pt);
+
+  if (!vertex)
+    return;
+
+  fVertexRecoCorrection->GetTrackCorrection()->FillMeas(vtx, eta, pt);
+  fTrack2ParticleCorrection->GetTrackCorrection()->FillGene(vtx, eta, pt);
+}
+
+//____________________________________________________________________
+void AlidNdEtaCorrection::FillTrackedParticle(Float_t vtx, Float_t eta, Float_t pt, Double_t weight)
+{
+  // fills a tracked particle in the corrections
+
+  fTrack2ParticleCorrection->GetTrackCorrection()->FillMeas(vtx, eta, pt, weight);
+}
+
+//____________________________________________________________________
+void AlidNdEtaCorrection::FillEvent(Float_t vtx, Float_t n, Bool_t trigger, Bool_t vertex, Int_t processType)
+{
+  // fills an event int he correction
+  // it is filled in generated or measured depending of the flags
+
+  fTriggerBiasCorrectionMBToINEL->GetEventCorrection()->FillGene(vtx, n);
+
+  if ((processType & AliPWG0Helper::kSD) == 0)
+    fTriggerBiasCorrectionMBToNSD->GetEventCorrection()->FillGene(vtx, n);
+
+  if (processType & AliPWG0Helper::kND )
+    fTriggerBiasCorrectionMBToND->GetEventCorrection()->FillGene(vtx, n);
+
+  if (processType & AliPWG0Helper::kOnePart)
+    fTriggerBiasCorrectionMBToOnePart->GetEventCorrection()->FillGene(vtx, n);
+
+  if (!trigger)
+    return;
 
-  fTrack2ParticleCorrection ->DrawHistograms();
-  fVertexRecoCorrection        ->DrawHistograms();
-  fTriggerCorrection        ->DrawHistograms();
-  fTriggerBiasCorrection       ->DrawHistograms();
+  fTriggerBiasCorrectionMBToINEL->GetEventCorrection()->FillMeas(vtx, n);
+  fTriggerBiasCorrectionMBToNSD->GetEventCorrection()->FillMeas(vtx, n);
+  fTriggerBiasCorrectionMBToND->GetEventCorrection()->FillMeas(vtx, n);
+  fTriggerBiasCorrectionMBToOnePart->GetEventCorrection()->FillMeas(vtx, n);
+  fVertexRecoCorrection->GetEventCorrection()->FillGene(vtx, n);
 
+  if (!vertex)
+    return;
+
+  fVertexRecoCorrection->GetEventCorrection()->FillMeas(vtx, n);
 }
 
 //____________________________________________________________________
-Float_t AlidNdEtaCorrection::GetMeasuredFraction(Float_t ptCutOff, Float_t eta, Bool_t debug)
+Float_t AlidNdEtaCorrection::GetMeasuredFraction(CorrectionType correctionType, Float_t ptCutOff, Float_t eta, Int_t vertexBegin, Int_t vertexEnd, Bool_t debug)
 {
   // calculates the fraction of particles measured (some are missed due to the pt cut off)
-  // uses the generated particle histogram from fTrack2ParticleCorrection
+  //
+  // uses the generated particle histogram from the correction passed, e.g. pass GetTrack2ParticleCorrection()
+
+  if (!GetCorrection(correctionType))
+    return -1;
 
-  const TH3F* generated = fTrack2ParticleCorrection->GetGeneratedHistogram();
+  const TH3* generated = GetCorrection(correctionType)->GetTrackCorrection()->GetGeneratedHistogram();
 
   // find eta borders, if eta is negative assume -0.8 ... 0.8
   Int_t etaBegin = 0;
   Int_t etaEnd = 0;
-  if (eta < 0)
+  if (eta < -99)
   {
     etaBegin = generated->GetYaxis()->FindBin(-0.8);
     etaEnd = generated->GetYaxis()->FindBin(0.8);
@@ -239,21 +395,28 @@ Float_t AlidNdEtaCorrection::GetMeasuredFraction(Float_t ptCutOff, Float_t eta,
     etaEnd = etaBegin;
   }
 
-  Int_t vertexBegin = generated->GetXaxis()->FindBin(-10);
-  Int_t vertexEnd = generated->GetXaxis()->FindBin(10);
+  if (vertexBegin == -1)
+    vertexBegin = generated->GetXaxis()->FindBin(-9.99);
+
+  if (vertexEnd == -1)
+    vertexEnd = generated->GetXaxis()->FindBin(9.99);
 
   TH1D* ptProj = dynamic_cast<TH1D*> (generated->ProjectionZ(Form("%s_pt", generated->GetName()), vertexBegin, vertexEnd, etaBegin, etaEnd));
+  //printf("GetMeasuredFraction: bin range %d %d %d %d\n", vertexBegin, vertexEnd, etaBegin, etaEnd);
   ptProj->GetXaxis()->SetTitle(generated->GetZaxis()->GetTitle());
 
   Int_t ptBin = ptProj->FindBin(ptCutOff);
-  Float_t abovePtCut = ptProj->Integral(ptBin, ptProj->GetNbinsX());
-  Float_t all = ptProj->Integral();
+  //printf("GetMeasuredFraction: bin range %d %d\n", ptBin, ptProj->GetNbinsX());
+  Float_t abovePtCut = ptProj->Integral(ptBin, ptProj->GetNbinsX()+1);
+  Float_t all = ptProj->Integral(1, ptProj->GetNbinsX()+1);
 
   if (all == 0)
     return -1;
 
   Float_t fraction = abovePtCut / all;
 
+  //printf("GetMeasuredFraction: all %f above %f fraction %f\n", all, abovePtCut, fraction);
+
   if (debug)
   {
     new TCanvas;
@@ -262,16 +425,61 @@ Float_t AlidNdEtaCorrection::GetMeasuredFraction(Float_t ptCutOff, Float_t eta,
   else
     delete ptProj;
 
+  if (debug)
+    printf("AlidNdEtaCorrection::GetMeasuredFraction: pt cut off = %f, eta = %f, => fraction = %f\n", ptCutOff, eta, fraction);
+
   return fraction;
 }
 
+//____________________________________________________________________
+TH1* AlidNdEtaCorrection::GetMeasuredEventFraction(CorrectionType correctionType, Int_t multCut)
+{
+  // calculates the fraction of events above multCut (but including it)
+  //
+  // uses the generated event histogram from the correction passed, e.g. pass GetTrack2ParticleCorrection()
+
+  if (!GetCorrection(correctionType))
+    return 0;
+
+  const TH2* generated = GetCorrection(correctionType)->GetEventCorrection()->GetGeneratedHistogram();
+
+  TH1* allEvents = generated->ProjectionX(Form("%s_all", generated->GetName()), 1, generated->GetNbinsY());
+  TH1* aboveEvents = generated->ProjectionX(Form("%s_above", generated->GetName()), generated->GetYaxis()->FindBin(multCut), generated->GetNbinsY());
+  
+  aboveEvents->Divide(aboveEvents, allEvents, 1, 1, "B");
+
+  return aboveEvents;  
+}
+
+//____________________________________________________________________
 void AlidNdEtaCorrection::ReduceInformation()
 {
   // this function deletes the measured and generated histograms from the corrections to reduce the amount of data
   // in memory
 
   // these are needed for GetMeasuredFraction(): fTrack2ParticleCorrection->ReduceInformation();
-  fVertexRecoCorrection->ReduceInformation();
-  fTriggerCorrection->ReduceInformation();
-  fTriggerBiasCorrection->ReduceInformation();
+  fVertexRecoCorrection          ->ReduceInformation();
+  fTriggerBiasCorrectionMBToINEL ->ReduceInformation();
+  fTriggerBiasCorrectionMBToNSD  ->ReduceInformation();
+  fTriggerBiasCorrectionMBToND   ->ReduceInformation();
+  fTriggerBiasCorrectionMBToOnePart   ->ReduceInformation();
+}
+
+//____________________________________________________________________
+AliCorrection* AlidNdEtaCorrection::GetCorrection(CorrectionType correctionType)
+{
+  // returns the given correction
+
+  switch (correctionType)
+  {
+    case kNone : return 0;
+    case kTrack2Particle : return fTrack2ParticleCorrection;
+    case kVertexReco :     return fVertexRecoCorrection;
+    case kINEL :           return fTriggerBiasCorrectionMBToINEL;
+    case kNSD :            return fTriggerBiasCorrectionMBToNSD;
+    case kND :             return fTriggerBiasCorrectionMBToND;
+    case kOnePart :             return fTriggerBiasCorrectionMBToOnePart;
+  }
+
+  return 0;
 }