]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG0/dNdEta/AlidNdEtaSystematicsSelector.cxx
RICH becomes HMPID
[u/mrichter/AliRoot.git] / PWG0 / dNdEta / AlidNdEtaSystematicsSelector.cxx
index 719a986b413e87094d210d96d73a16c048011446..70231d443a205bf90dfbce986d9c3475945a4ac1 100644 (file)
@@ -8,33 +8,47 @@
 #include <TVector3.h>
 #include <TChain.h>
 #include <TFile.h>
-#include <TH3F.h>
+#include <TH2F.h>
 #include <TH1F.h>
 #include <TParticle.h>
+#include <TParticlePDG.h>
 
 #include <AliLog.h>
 #include <AliESD.h>
-#include <AliGenEventHeader.h>
 #include <AliStack.h>
 #include <AliHeader.h>
+#include <AliGenEventHeader.h>
+#include <../PYTHIA6/AliGenPythiaEventHeader.h>
+#include <../EVGEN/AliGenCocktailEventHeader.h>
 
 #include "esdTrackCuts/AliESDtrackCuts.h"
 #include "AliPWG0Helper.h"
-#include "AlidNdEtaCorrection.h"
+#include "AliPWG0depHelper.h"
+#include "dNdEta/AlidNdEtaCorrection.h"
 
 ClassImp(AlidNdEtaSystematicsSelector)
 
 AlidNdEtaSystematicsSelector::AlidNdEtaSystematicsSelector() :
   AliSelectorRL(),
   fSecondaries(0),
-  fEsdTrackCuts(0)
+  fSigmaVertex(0),
+  fEsdTrackCuts(0),
+  fPIDParticles(0),
+  fPIDTracks(0),
+  fSignMode(0),
+  fMultiplicityMode(0)
 {
   //
   // Constructor. Initialization of pointers
   //
 
   for (Int_t i=0; i<4; ++i)
-    fdNdEtaCorrection[i] = 0;
+    fdNdEtaCorrectionSpecies[i] = 0;
+
+  for (Int_t i=0; i<3; ++i) {
+    fdNdEtaCorrectionVertexReco[i] = 0;
+    fdNdEtaCorrectionTriggerBias[i] = 0;
+  }
 }
 
 AlidNdEtaSystematicsSelector::~AlidNdEtaSystematicsSelector()
@@ -83,7 +97,15 @@ void AlidNdEtaSystematicsSelector::SlaveBegin(TTree* tree)
 
   if (option.Contains("secondaries"))
   {
-    fSecondaries = new TH3F("fSecondaries", "fSecondaries;NacceptedTracks;CratioSecondaries;p_{T}", 201, -0.5, 205.5, 16, 0.45, 2.05, 10, 0, 10);
+    fSecondaries = new TH2F("fSecondaries", "fSecondaries;Case;N", 8, 0.5, 8.5, 2001, -0.5, 2000.5);
+    fSecondaries->GetXaxis()->SetBinLabel(1, "All Primaries");
+    fSecondaries->GetXaxis()->SetBinLabel(2, "All Secondaries");
+    fSecondaries->GetXaxis()->SetBinLabel(3, "Primaries pT > 0.3 GeV/c");
+    fSecondaries->GetXaxis()->SetBinLabel(4, "Secondaries pT > 0.3 GeV/c");
+    fSecondaries->GetXaxis()->SetBinLabel(5, "Tracks from Primaries");
+    fSecondaries->GetXaxis()->SetBinLabel(6, "Tracks from Secondaries");
+    fSecondaries->GetXaxis()->SetBinLabel(7, "Accepted Tracks from Primaries");
+    fSecondaries->GetXaxis()->SetBinLabel(8, "Accepted Tracks from Secondaries");
   }
 
   if (option.Contains("particle-composition"))
@@ -92,9 +114,52 @@ void AlidNdEtaSystematicsSelector::SlaveBegin(TTree* tree)
     {
       TString name;
       name.Form("correction_%d", i);
-      fdNdEtaCorrection[i] = new AlidNdEtaCorrection(name, name);
+      fdNdEtaCorrectionSpecies[i] = new AlidNdEtaCorrection(name, name);
     }
   }
+
+  if (option.Contains("sigma-vertex"))
+  {
+    fSigmaVertex = new TH1F("fSigmaVertex", "fSigmaVertex;Nsigma2vertex;NacceptedTracks", 50, 0.05, 5.05);
+    printf("WARNING: sigma-vertex analysis enabled. This will produce weird results in the AliESDtrackCuts histograms\n");
+  }
+
+  if (option.Contains("vertexreco")) {
+    fdNdEtaCorrectionVertexReco[0] = new AlidNdEtaCorrection("vertexRecoND", "vertexRecoND");
+    fdNdEtaCorrectionVertexReco[1] = new AlidNdEtaCorrection("vertexRecoSD", "vertexRecoSD");
+    fdNdEtaCorrectionVertexReco[2] = new AlidNdEtaCorrection("vertexRecoDD", "vertexRecoDD");
+  }
+
+  if (option.Contains("triggerbias")) {
+    fdNdEtaCorrectionTriggerBias[0] = new AlidNdEtaCorrection("triggerBiasND", "triggerBiasND");
+    fdNdEtaCorrectionTriggerBias[1] = new AlidNdEtaCorrection("triggerBiasSD", "triggerBiasSD");
+    fdNdEtaCorrectionTriggerBias[2] = new AlidNdEtaCorrection("triggerBiasDD", "triggerBiasDD");
+  }
+
+  fPIDParticles = new TH1F("pid_particles", "PID of generated primary particles", 10001, -5000.5, 5000.5);
+  fPIDTracks = new TH1F("pid_tracks", "MC PID of reconstructed tracks", 10001, -5000.5, 5000.5);
+
+  if (option.Contains("only-positive"))
+  {
+    AliInfo("Processing only positive particles.");
+    fSignMode = 1;
+  }
+  else if (option.Contains("only-negative"))
+  {
+    AliInfo("Processing only negative particles.");
+    fSignMode = -1;
+  }
+
+  if (option.Contains("low-multiplicity"))
+  {
+    AliInfo("Processing only events with low multiplicity.");
+    fMultiplicityMode = 1;
+  }
+  else if (option.Contains("high-multiplicity"))
+  {
+    AliInfo("Processing only events with high multiplicity.");
+    fMultiplicityMode = 2;
+  }
 }
 
 Bool_t AlidNdEtaSystematicsSelector::Process(Long64_t entry)
@@ -142,11 +207,97 @@ Bool_t AlidNdEtaSystematicsSelector::Process(Long64_t entry)
 
   TObjArray* list = fEsdTrackCuts->GetAcceptedTracks(fESD);
 
-  if (fdNdEtaCorrection[0])
+  if (fMultiplicityMode == 1 && list->GetEntries() > 20 ||
+      fMultiplicityMode == 2 && list->GetEntries() < 40)
+  {
+    delete list;
+    list = 0;
+    return kTRUE;
+  }
+
+  if (fdNdEtaCorrectionSpecies[0])
     FillCorrectionMaps(list);
 
   if (fSecondaries)
-    FillSecondaries(list);
+    FillSecondaries();
+
+  if (fSigmaVertex)
+    FillSigmaVertex();
+
+  // stuff for vertex reconstruction correction systematics
+  Bool_t vertexRecoStudy  = kFALSE;
+  Bool_t triggerBiasStudy = kFALSE;
+  if (fdNdEtaCorrectionVertexReco[0]) vertexRecoStudy = kTRUE;
+  if (fdNdEtaCorrectionTriggerBias[0]) triggerBiasStudy = kTRUE;
+
+  if (vertexRecoStudy || triggerBiasStudy) {
+    AliHeader* header = GetHeader();
+    if (!header) {
+      AliDebug(AliLog::kError, "Header not available");
+      return kFALSE;
+    }
+
+    // getting process information
+    Int_t processtype = AliPWG0depHelper::GetPythiaEventProcessType(header);
+
+    AliDebug(AliLog::kInfo, Form("Pythia process type %d.",processtype));
+
+    // can only read pythia headers, either directly or from cocktalil header
+    AliGenEventHeader* genHeader = (AliGenEventHeader*)(header->GenEventHeader());
+    
+    if (!genHeader) {
+      AliDebug(AliLog::kError, "Gen header not available");
+      return kFALSE;
+    }
+
+    // get the MC vertex
+    TArrayF vtxMC(3);
+    genHeader->PrimaryVertex(vtxMC);
+
+    Int_t nGoodTracks = list->GetEntries();
+
+    Bool_t eventTriggered = AliPWG0Helper::IsEventTriggered(fESD);
+    Bool_t vertexReconstructed = AliPWG0Helper::IsVertexReconstructed(fESD);
+
+    // non diffractive
+    if (processtype!=92 && processtype!=93 && processtype!=94) { 
+      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[0]->FillEventAll(vtxMC[2], nGoodTracks);
+
+      if (eventTriggered) {
+        if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[0]->FillEventWithTrigger(vtxMC[2], nGoodTracks);
+        if (vertexRecoStudy) fdNdEtaCorrectionVertexReco[0]->FillEventWithTrigger(vtxMC[2], nGoodTracks);
+
+        if (vertexReconstructed)
+          if (vertexRecoStudy) fdNdEtaCorrectionVertexReco[0]->FillEventWithTriggerWithReconstructedVertex(vtxMC[2], nGoodTracks);
+      }
+    }
+
+    // single diffractive
+    if (processtype==92 || processtype==93) { 
+      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[1]->FillEventAll(vtxMC[2], nGoodTracks);
+
+      if (eventTriggered) {
+        if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[1]->FillEventWithTrigger(vtxMC[2], nGoodTracks);
+        if (vertexRecoStudy) fdNdEtaCorrectionVertexReco[1]->FillEventWithTrigger(vtxMC[2], nGoodTracks);
+
+        if (vertexReconstructed)
+          if (vertexRecoStudy) fdNdEtaCorrectionVertexReco[1]->FillEventWithTriggerWithReconstructedVertex(vtxMC[2], nGoodTracks);
+      }
+    }
+
+    // double diffractive
+    if (processtype==94) { 
+      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[2]->FillEventAll(vtxMC[2], nGoodTracks);
+
+      if (eventTriggered) {
+        if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[2]->FillEventWithTrigger(vtxMC[2], nGoodTracks);
+        if (vertexRecoStudy) fdNdEtaCorrectionVertexReco[2]->FillEventWithTrigger(vtxMC[2], nGoodTracks);
+
+        if (vertexReconstructed)
+          if (vertexRecoStudy) fdNdEtaCorrectionVertexReco[2]->FillEventWithTriggerWithReconstructedVertex(vtxMC[2], nGoodTracks);
+      }
+    }
+  }
 
   delete list;
   list = 0;
@@ -158,19 +309,14 @@ void AlidNdEtaSystematicsSelector::FillCorrectionMaps(TObjArray* listOfTracks)
 {
   // fills the correction maps for different particle species
 
+  // TODO fix the use of the FillParticle* functions
+
   AliStack* stack = GetStack();
   AliHeader* header = GetHeader();
 
   Bool_t vertexReconstructed = AliPWG0Helper::IsVertexReconstructed(fESD);
   Bool_t eventTriggered = AliPWG0Helper::IsEventTriggered(fESD);
 
-  for (Int_t i=0; i<4; ++i)
-  {
-    fdNdEtaCorrection[i]->IncreaseEventCount();
-    if (eventTriggered)
-      fdNdEtaCorrection[i]->IncreaseTriggeredEventCount();
-  }
-
   // get the MC vertex
   AliGenEventHeader* genHeader = header->GenEventHeader();
 
@@ -193,6 +339,9 @@ void AlidNdEtaSystematicsSelector::FillCorrectionMaps(TObjArray* listOfTracks)
     if (AliPWG0Helper::IsPrimaryCharged(particle, nPrim) == kFALSE)
       continue;
 
+    if (SignOK(particle->GetPDG()) == kFALSE)
+      continue;
+
     Float_t eta = particle->Eta();
     Float_t pt = particle->Pt();
 
@@ -202,15 +351,31 @@ void AlidNdEtaSystematicsSelector::FillCorrectionMaps(TObjArray* listOfTracks)
       case 211: id = 0; break;
       case 321: id = 1; break;
       case 2212: id = 2; break;
+      case 11:
+        {
+          /*if (pt < 0.1 && particle->GetMother(0) > -1)
+          {
+            TParticle* mother = stack->Particle(particle->GetMother(0));
+            printf("Mother pdg code is %d\n", mother->GetPdgCode());
+          } */
+          //particle->Dump();
+          //if (particle->GetUniqueID() == 1)
+
+          //printf("Found illegal particle mc id = %d file = %s event = %d\n", iMc,  fTree->GetCurrentFile()->GetName(), fTree->GetTree()->GetReadEntry());
+        }
       default: id = 3; break;
     }
 
-    if (vertexReconstructed)
-      fdNdEtaCorrection[id]->FillParticle(vtxMC[2], eta, pt);
+    if (vertexReconstructed && eventTriggered)
+    {
+      fdNdEtaCorrectionSpecies[id]->FillParticleVertex(vtxMC[2], eta, pt);
+      //if (pt < 0.1)
+        fPIDParticles->Fill(particle->GetPdgCode());
+    }
 
-    fdNdEtaCorrection[id]->FillParticleAllEvents(eta, pt);
-    if (eventTriggered)
-      fdNdEtaCorrection[id]->FillParticleWhenEventTriggered(eta, pt);
+    //fdNdEtaCorrectionSpecies[id]->FillParticleAllEvents(eta, pt);
+    //if (eventTriggered)
+    // fdNdEtaCorrectionSpecies[id]->FillParticleWhenEventTriggered(eta, pt);
   }// end of mc particle
 
   // loop over esd tracks
@@ -224,12 +389,6 @@ void AlidNdEtaSystematicsSelector::FillCorrectionMaps(TObjArray* listOfTracks)
 
     // using the properties of the mc particle
     Int_t label = TMath::Abs(esdTrack->GetLabel());
-    if (label == 0)
-    {
-      AliDebug(AliLog::kWarning, Form("WARNING: cannot find corresponding mc part for track %d.", label));
-      continue;
-    }
-
     TParticle* particle = stack->Particle(label);
     if (!particle)
     {
@@ -237,47 +396,137 @@ void AlidNdEtaSystematicsSelector::FillCorrectionMaps(TObjArray* listOfTracks)
       continue;
     }
 
+    TParticle* mother = particle;
+    // find primary particle that created this particle
+    while (label >= nPrim)
+    {
+      //printf("Particle %d (pdg %d) is not a primary. Let's check its mother %d\n", label, mother->GetPdgCode(), mother->GetMother(0));
+
+      if (mother->GetMother(0) == -1)
+      {
+        AliDebug(AliLog::kError, Form("UNEXPECTED: Could not find mother of secondary particle %d.", label));
+        mother = 0;
+        break;
+      }
+
+      label = mother->GetMother(0);
+
+      mother = stack->Particle(label);
+      if (!mother)
+      {
+        AliDebug(AliLog::kError, Form("UNEXPECTED: particle with label %d not found in stack (find mother loop).", label));
+        break;
+      }
+    }
+
+    if (!mother)
+      continue;
+
+    if (SignOK(mother->GetPDG()) == kFALSE)
+      continue;
+
+    //printf("We continue with particle %d (pdg %d)\n", label, mother->GetPdgCode());
+
     Int_t id = -1;
-    switch (TMath::Abs(particle->GetPdgCode()))
+    switch (TMath::Abs(mother->GetPdgCode()))
     {
-      case 211: id = 0; break;
-      case 321: id = 1; break;
+      case 211:  id = 0; break;
+      case 321:  id = 1; break;
       case 2212: id = 2; break;
-      default: id = 3; break;
+      default:   id = 3; break;
     }
 
-    if (vertexReconstructed)
-      fdNdEtaCorrection[id]->FillParticleWhenMeasuredTrack(vtxMC[2], particle->Eta(), particle->Pt());
+    if (vertexReconstructed && eventTriggered)
+    {
+      fdNdEtaCorrectionSpecies[id]->FillParticleTracked(vtxMC[2], particle->Eta(), particle->Pt());
+      //if (particle->Pt() < 0.1)
+        fPIDTracks->Fill(particle->GetPdgCode());
+    }
   } // end of track loop
 
+  Int_t nGoodTracks = listOfTracks->GetEntries();
+
+  for (Int_t i=0; i<4; ++i)
+  {
+    fdNdEtaCorrectionSpecies[i]->FillEventAll(vtxMC[2], nGoodTracks);
+    if (eventTriggered)
+    {
+      fdNdEtaCorrectionSpecies[i]->FillEventWithTrigger(vtxMC[2], nGoodTracks);
+      if (vertexReconstructed)
+        fdNdEtaCorrectionSpecies[i]->FillEventWithTriggerWithReconstructedVertex(vtxMC[2], nGoodTracks);
+    }
+  }
+
   delete iter;
   iter = 0;
 }
 
-void AlidNdEtaSystematicsSelector::FillSecondaries(TObjArray* listOfTracks)
+void AlidNdEtaSystematicsSelector::FillSecondaries()
 {
   // fills the secondary histograms
 
   AliStack* stack = GetStack();
 
-  TH1* nPrimaries = new TH1F("secondaries_primaries", "secondaries_primaries", fSecondaries->GetZaxis()->GetNbins(), fSecondaries->GetZaxis()->GetXmin(), fSecondaries->GetZaxis()->GetXmax());
-  TH1* nSecondaries = new TH1F("secondaries_secondaries", "secondaries_secondaries", fSecondaries->GetZaxis()->GetNbins(), fSecondaries->GetZaxis()->GetXmin(), fSecondaries->GetZaxis()->GetXmax());
+  Int_t particlesPrimaries = 0;
+  Int_t particlesSecondaries = 0;
+  Int_t particlesPrimariesPtCut = 0;
+  Int_t particlesSecondariesPtCut = 0;
 
-  TIterator* iter = listOfTracks->MakeIterator();
-  TObject* obj = 0;
-  while ((obj = iter->Next()) != 0)
+  for (Int_t iParticle = 0; iParticle < stack->GetNtrack(); iParticle++)
   {
-    AliESDtrack* esdTrack = dynamic_cast<AliESDtrack*> (obj);
-    if (!esdTrack)
+    TParticle* particle = stack->Particle(iParticle);
+    if (!particle)
+    {
+      AliDebug(AliLog::kError, Form("UNEXPECTED: particle with label %d not found in stack (particle loop).", iParticle));
       continue;
+    }
 
-    Int_t label = TMath::Abs(esdTrack->GetLabel());
-    if (label == 0)
+    if (TMath::Abs(particle->Eta()) > 0.9)
+      continue;
+
+    Bool_t isPrimary = kFALSE;
+    if (iParticle < stack->GetNprimary())
     {
-      AliDebug(AliLog::kWarning, Form("WARNING: cannot find corresponding mc part for track %d.", label));
+      if (AliPWG0Helper::IsPrimaryCharged(particle, stack->GetNprimary()) == kFALSE)
+        continue;
+
+      isPrimary = kTRUE;
+    }
+
+    if (isPrimary)
+      particlesPrimaries++;
+    else
+      particlesSecondaries++;
+
+    if (particle->Pt() < 0.3)
+      continue;
+
+    if (isPrimary)
+      particlesPrimariesPtCut++;
+    else
+      particlesSecondariesPtCut++;
+  }
+
+  fSecondaries->Fill(1, particlesPrimaries);
+  fSecondaries->Fill(2, particlesSecondaries);
+  fSecondaries->Fill(3, particlesPrimariesPtCut);
+  fSecondaries->Fill(4, particlesSecondariesPtCut);
+
+  Int_t allTracksPrimaries = 0;
+  Int_t allTracksSecondaries = 0;
+  Int_t acceptedTracksPrimaries = 0;
+  Int_t acceptedTracksSecondaries = 0;
+
+  for (Int_t iTrack = 0; iTrack < fESD->GetNumberOfTracks(); iTrack++)
+  {
+    AliESDtrack* esdTrack = fESD->GetTrack(iTrack);
+    if (!esdTrack)
+    {
+      AliDebug(AliLog::kError, Form("UNEXPECTED: Could not get track %d.", iTrack));
       continue;
     }
 
+    Int_t label = TMath::Abs(esdTrack->GetLabel());
     TParticle* particle = stack->Particle(label);
     if (!particle)
     {
@@ -285,35 +534,65 @@ void AlidNdEtaSystematicsSelector::FillSecondaries(TObjArray* listOfTracks)
       continue;
     }
 
-    Int_t nPrim  = stack->GetNprimary();
-    if (label < nPrim)
-      nPrimaries->Fill(particle->Pt());
+   if (label < stack->GetNprimary())
+      allTracksPrimaries++;
+    else
+      allTracksSecondaries++;
+
+    if (!fEsdTrackCuts->AcceptTrack(esdTrack))
+      continue;
+
+    if (label < stack->GetNprimary())
+      acceptedTracksPrimaries++;
     else
-      nSecondaries->Fill(particle->Pt());
+      acceptedTracksSecondaries++;
   }
 
-  for (Int_t i=1; i<=nPrimaries->GetNbinsX(); ++i)
+  fSecondaries->Fill(5, allTracksPrimaries);
+  fSecondaries->Fill(6, allTracksSecondaries);
+  fSecondaries->Fill(7, acceptedTracksPrimaries);
+  fSecondaries->Fill(8, acceptedTracksSecondaries);
+
+  //printf("P = %d, S = %d, P_pt = %d, S_pt = %d, T_P = %d, T_S = %d, T_P_acc = %d, T_S_acc = %d\n", particlesPrimaries, particlesSecondaries, particlesPrimariesPtCut, particlesSecondariesPtCut, allTracksPrimaries, allTracksSecondaries, acceptedTracksPrimaries, acceptedTracksSecondaries);
+}
+
+void AlidNdEtaSystematicsSelector::FillSigmaVertex()
+{
+  // fills the fSigmaVertex histogram
+
+  // save the old value
+  Float_t oldSigmaVertex = fEsdTrackCuts->GetMinNsigmaToVertex();
+
+  // set to maximum
+  fEsdTrackCuts->SetMinNsigmaToVertex(5);
+
+  TObjArray* list = fEsdTrackCuts->GetAcceptedTracks(fESD);
+
+  TIterator* iter = list->MakeIterator();
+  TObject* obj = 0;
+  while ((obj = iter->Next()) != 0)
   {
-    Int_t primaries = (Int_t) nPrimaries->GetBinContent(i);
-    Int_t secondaries = (Int_t) nSecondaries->GetBinContent(i);
+    AliESDtrack* esdTrack = dynamic_cast<AliESDtrack*> (obj);
+    if (!esdTrack)
+      continue;
 
-    if (primaries + secondaries > 0)
-    {
-      AliDebug(AliLog::kDebug, Form("The ratio between primaries and secondaries is %d:%d = %f", primaries, secondaries, ((secondaries > 0) ? (Double_t) primaries / secondaries : -1)));
+    Float_t sigma2Vertex = fEsdTrackCuts->GetSigmaToVertex(esdTrack);
 
-      for (Double_t factor = 0.5; factor < 2.01; factor += 0.1)
-        fSecondaries->Fill((Double_t) primaries + (Double_t) secondaries * factor, factor, nPrimaries->GetBinCenter(i));
+    for (Double_t nSigma = 0.1; nSigma < 5.05; nSigma += 0.1)
+    {
+      if (sigma2Vertex < nSigma)
+        fSigmaVertex->Fill(nSigma);
     }
   }
 
-  delete nPrimaries;
-  nPrimaries = 0;
-
-  delete nSecondaries;
-  nSecondaries = 0;
-
   delete iter;
   iter = 0;
+
+  delete list;
+  list = 0;
+
+  // set back the old value
+  fEsdTrackCuts->SetMinNsigmaToVertex(oldSigmaVertex);
 }
 
 void AlidNdEtaSystematicsSelector::SlaveTerminate()
@@ -335,8 +614,20 @@ void AlidNdEtaSystematicsSelector::SlaveTerminate()
     fOutput->Add(fSecondaries);
 
   for (Int_t i=0; i<4; ++i)
-    if (fdNdEtaCorrection[i])
-      fOutput->Add(fdNdEtaCorrection[i]);
+    if (fdNdEtaCorrectionSpecies[i])
+      fOutput->Add(fdNdEtaCorrectionSpecies[i]);
+
+  if (fSigmaVertex)
+    fOutput->Add(fSigmaVertex);
+
+  for (Int_t i=0; i<3; ++i) {
+    if (fdNdEtaCorrectionVertexReco[i])
+      fOutput->Add(fdNdEtaCorrectionVertexReco[i]);
+    
+    if (fdNdEtaCorrectionTriggerBias[i])
+      fOutput->Add(fdNdEtaCorrectionTriggerBias[i]);
+  }
+  
 }
 
 void AlidNdEtaSystematicsSelector::Terminate()
@@ -347,9 +638,43 @@ void AlidNdEtaSystematicsSelector::Terminate()
 
   AliSelector::Terminate();
 
-  fSecondaries = dynamic_cast<TH3F*> (fOutput->FindObject("fSecondaries"));
+  fSecondaries = dynamic_cast<TH2F*> (fOutput->FindObject("fSecondaries"));
   for (Int_t i=0; i<4; ++i)
-    fdNdEtaCorrection[i] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject(Form("correction_%d", i)));
+    fdNdEtaCorrectionSpecies[i] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject(Form("correction_%d", i)));
+  fSigmaVertex = dynamic_cast<TH1F*> (fOutput->FindObject("fSigmaVertex"));
+
+  fdNdEtaCorrectionVertexReco[0] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject("vertexRecoND"));
+  fdNdEtaCorrectionVertexReco[1] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject("vertexRecoSD"));
+  fdNdEtaCorrectionVertexReco[2] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject("vertexRecoDD"));
+
+  fdNdEtaCorrectionTriggerBias[0] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject("triggerBiasND"));
+  fdNdEtaCorrectionTriggerBias[1] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject("triggerBiasSD"));
+  fdNdEtaCorrectionTriggerBias[2] = dynamic_cast<AlidNdEtaCorrection*> (fOutput->FindObject("triggerBiasDD"));
+
+  if (fPIDParticles)
+  {
+    TDatabasePDG* pdgDB = new TDatabasePDG;
+
+    for (Int_t i=0; i <= fPIDParticles->GetNbinsX()+1; ++i)
+      if (fPIDParticles->GetBinContent(i) > 0)
+        printf("PDG = %d (%s): generated: %d, reconstructed: %d, ratio: %f\n", 
+              (Int_t) fPIDParticles->GetBinCenter(i), 
+              pdgDB->GetParticle((Int_t) fPIDParticles->GetBinCenter(i))->GetName(), 
+              (Int_t) fPIDParticles->GetBinContent(i), 
+              (Int_t) fPIDTracks->GetBinContent(i), 
+              ((fPIDTracks->GetBinContent(i) > 0) ? fPIDParticles->GetBinContent(i) / fPIDTracks->GetBinContent(i) : -1));
+
+    delete pdgDB;
+    pdgDB = 0;
+  }
+
+  for (Int_t i=0; i<3; ++i) {
+    if (fdNdEtaCorrectionVertexReco[i])
+      fdNdEtaCorrectionVertexReco[i]->Finish();
+    
+    if (fdNdEtaCorrectionTriggerBias[i])
+      fdNdEtaCorrectionTriggerBias[i]->Finish();
+  }
 
   TFile* fout = TFile::Open("systematics.root", "RECREATE");
 
@@ -359,9 +684,20 @@ void AlidNdEtaSystematicsSelector::Terminate()
   if (fSecondaries)
     fSecondaries->Write();
 
+  if (fSigmaVertex)
+    fSigmaVertex->Write();
+  
   for (Int_t i=0; i<4; ++i)
-    if (fdNdEtaCorrection[i])
-      fdNdEtaCorrection[i]->SaveHistograms();
+    if (fdNdEtaCorrectionSpecies[i])
+      fdNdEtaCorrectionSpecies[i]->SaveHistograms();
+
+  for (Int_t i=0; i<3; ++i) {
+    if (fdNdEtaCorrectionVertexReco[i])
+      fdNdEtaCorrectionVertexReco[i]->SaveHistograms();
+
+    if (fdNdEtaCorrectionTriggerBias[i])
+      fdNdEtaCorrectionTriggerBias[i]->SaveHistograms();
+  }
 
   fout->Write();
   fout->Close();
@@ -369,6 +705,41 @@ void AlidNdEtaSystematicsSelector::Terminate()
   if (fSecondaries)
   {
     new TCanvas;
-    fSecondaries->Draw();
+    fSecondaries->Draw("COLZ");
+  }
+
+  if (fSigmaVertex)
+  {
+    new TCanvas;
+    fSigmaVertex->Draw();
+  }
+}
+
+Bool_t AlidNdEtaSystematicsSelector::SignOK(TParticlePDG* particle)
+{
+  // returns if a particle with this sign should be counted
+  // this is determined by the value of fSignMode, which should have the same sign
+  // as the charge
+  // if fSignMode is 0 all particles are counted
+
+  if (fSignMode == 0)
+    return kTRUE;
+
+  if (!particle)
+  {
+    printf("WARNING: not counting a particle that does not have a pdg particle\n");
+    return kFALSE;
   }
+
+  Double_t charge = particle->Charge();
+
+  if (fSignMode > 0)
+    if (charge < 0)
+      return kFALSE;
+
+  if (fSignMode < 0)
+    if (charge > 0)
+      return kFALSE;
+
+  return kTRUE;
 }