Fix in the last caall to CleanOwnPrimaryVertex
[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisTaskSEHFQA.cxx
index 63a84da..b71bfbb 100644 (file)
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 /////////////////////////////////////////////////////////////
 //
 // AliAnalysisTaskSE for HF quality assurance
 #include "AliRDHFCutsDStartoKpipi.h"
 #include "AliRDHFCutsD0toKpi.h"
 #include "AliRDHFCutsLctopKpi.h"
+#include "AliInputEventHandler.h"
 
 #include "AliAnalysisTaskSEHFQA.h"
 
-
 ClassImp(AliAnalysisTaskSEHFQA)
 
 //____________________________________________________________________________
@@ -67,13 +69,19 @@ AliAnalysisTaskSEHFQA::AliAnalysisTaskSEHFQA():AliAnalysisTaskSE(),
   fOutputTrack(0x0),
   fOutputCounters(0x0),
   fOutputCheckCentrality(0x0),
+  fOutputEvSelection(0x0),
   fDecayChannel(AliAnalysisTaskSEHFQA::kD0toKpi),
   fCuts(0x0),
   fEstimator(AliRDHFCuts::kCentTRK),
   fReadMC(kFALSE),
-  fSimpleMode(kFALSE)
+  fSimpleMode(kFALSE),
+  fOnOff()
 {
   //default constructor
+  fOnOff[0]=kTRUE;
+  fOnOff[1]=kTRUE;
+  fOnOff[2]=kTRUE;
+  fOnOff[3]=kTRUE;
 }
 
 //____________________________________________________________________________
@@ -84,23 +92,30 @@ AliAnalysisTaskSEHFQA::AliAnalysisTaskSEHFQA(const char *name, AliAnalysisTaskSE
   fOutputTrack(0x0),
   fOutputCounters(0x0),
   fOutputCheckCentrality(0x0),
+  fOutputEvSelection(0x0),
   fDecayChannel(ch),
   fCuts(0x0),
   fEstimator(AliRDHFCuts::kCentTRK),
   fReadMC(kFALSE),
-  fSimpleMode(kFALSE)
+  fSimpleMode(kFALSE),
+  fOnOff()
 {
   //constructor
 
   //SetCutObject(cuts);
   fCuts=cuts;
 
+  fOnOff[0]=kTRUE;
+  fOnOff[1]=kTRUE;
+  fOnOff[2]=kTRUE;
+  fOnOff[3]=kTRUE;
+
   // Output slot #1 writes into a TH1F container (number of events)
   DefineOutput(1,TH1F::Class());  //My private output
   // Output slot #2 writes into a TList container (PID)
-  DefineOutput(2,TList::Class());  //My private output
+  if (fOnOff[1]) DefineOutput(2,TList::Class());  //My private output
   // Output slot #3 writes into a TList container (Tracks)
-  DefineOutput(3,TList::Class());  //My private output
+  if (fOnOff[0]) DefineOutput(3,TList::Class());  //My private output
   // Output slot #4 writes into a AliRDHFCuts container (cuts)
   switch(fDecayChannel){
   case 0:
@@ -122,10 +137,15 @@ AliAnalysisTaskSEHFQA::AliAnalysisTaskSEHFQA(const char *name, AliAnalysisTaskSE
     DefineOutput(4,AliRDHFCutsLctopKpi::Class());  //My private output
     break;
   }
-  // Output slot #5 writes into a TList container (AliCounterCollection)
-  DefineOutput(5,TList::Class());  //My private output
-  // Output slot #6 writes into a TList container (TH1F)
-  DefineOutput(6,TList::Class());  //My private output
+  if (fOnOff[2]) {
+    // Output slot #5 writes into a TList container (AliCounterCollection)
+    DefineOutput(5,TList::Class());  //My private output
+    // Output slot #6 writes into a TList container (TH1F)
+    DefineOutput(6,TList::Class());  //My private output
+  }
+
+  if(fOnOff[3]) DefineOutput(7,TList::Class());  //My private output
+
 }
 
 //___________________________________________________________________________
@@ -142,6 +162,8 @@ AliAnalysisTaskSEHFQA::~AliAnalysisTaskSEHFQA()
 
   delete fOutputCheckCentrality;
 
+  delete fOutputEvSelection;
+
 }
 
 //___________________________________________________________________________
@@ -211,17 +233,19 @@ void AliAnalysisTaskSEHFQA::UserCreateOutputObjects()
 
   //count events
 
-  fNEntries=new TH1F(GetOutputSlot(1)->GetContainer()->GetName(), "Counts the number of events", 9,-0.5,8.5);
+  fNEntries=new TH1F(GetOutputSlot(1)->GetContainer()->GetName(), "Counts the number of events", 10,-0.5,9.5);
   fNEntries->GetXaxis()->SetBinLabel(1,"nEventsAnal");
   fNEntries->GetXaxis()->SetBinLabel(2,"Pile-up Rej");
   fNEntries->GetXaxis()->SetBinLabel(3,"No VertexingHF");
   fNEntries->GetXaxis()->SetBinLabel(4,"nCandidates(AnCuts)");
   fNEntries->GetXaxis()->SetBinLabel(5,"EventsWithGoodVtx");
-  fNEntries->GetXaxis()->SetBinLabel(6,"N. of 0SMH");
+  //fNEntries->GetXaxis()->SetBinLabel(6,"N. of 0SMH");
+  fNEntries->GetXaxis()->SetBinLabel(6,"N. of CSH1");
   if(fReadMC){
     fNEntries->GetXaxis()->SetBinLabel(7,"MC Cand from c");
     fNEntries->GetXaxis()->SetBinLabel(8,"MC Cand from b");
-    fNEntries->GetXaxis()->SetBinLabel(9,"N fakes Trks");
+    fNEntries->GetXaxis()->SetBinLabel(9,"N fake Trks");
+    fNEntries->GetXaxis()->SetBinLabel(10,"N true Trks");
   } else{
     fNEntries->GetXaxis()->SetBinLabel(7,"N candidates");
   }
@@ -229,125 +253,145 @@ void AliAnalysisTaskSEHFQA::UserCreateOutputObjects()
   fNEntries->GetXaxis()->SetNdivisions(1,kFALSE);
 
   //PID
+  if(fOnOff[1]){
+    fOutputPID=new TList();
+    fOutputPID->SetOwner();
+    fOutputPID->SetName(GetOutputSlot(2)->GetContainer()->GetName());
 
-  fOutputPID=new TList();
-  fOutputPID->SetOwner();
-  fOutputPID->SetName(GetOutputSlot(2)->GetContainer()->GetName());
-
-  //TOF pid
-  TString hname="hTOFsig";
-  TH1F* hTOFsig=new TH1F(hname.Data(),"Distribution of TOF signal;TOF time [ps];Entries", 100, -2.e3,40.e3);
-
-  hname="hTOFtime";
-  TH1F* hTOFtime=new TH1F(hname.Data(),"Distribution of TOF time Kaon;TOF time(Kaon) [ps];Entries", 1000, 0.,50000.);
+    //TOF pid
+    TString hname="hTOFsig";
+    TH1F* hTOFsig=new TH1F(hname.Data(),"Distribution of TOF signal;TOF time [ps];Entries", 100, -2.e3,40.e3);
 
-  hname="hTOFtimeKaonHyptime";
-  TH2F* hTOFtimeKaonHyptime=new TH2F(hname.Data(),"TOFtime - timeHypothesisForKaon;p[GeV/c];TOFtime - timeHypothesisForKaon [ps]",200,0.,4.,1000,-20000.,20000.);
+    hname="hTOFtime";
+    TH1F* hTOFtime=new TH1F(hname.Data(),"Distribution of TOF time Kaon;TOF time(Kaon) [ps];Entries", 1000, 0.,50000.);
 
-  hname="hTOFtimeKaonHyptimeAC";
-  TH2F* hTOFtimeKaonHyptimeAC=new TH2F(hname.Data(),"TOFtime - timeHypothesisForKaon;p[GeV/c];TOFtime - timeHypothesisForKaon [ps]",200,0.,4.,1000,-20000.,20000.);
+    hname="hTOFtimeKaonHyptime";
+    TH2F* hTOFtimeKaonHyptime=new TH2F(hname.Data(),"TOFtime - timeHypothesisForKaon;p[GeV/c];TOFtime - timeHypothesisForKaon [ps]",200,0.,4.,1000,-20000.,20000.);
 
-  hname="hTOFsigmaK160";
-  TH2F* hTOFsigmaK160=new TH2F(hname.Data(),"(TOFsignal-timeK)/160 ps;p[GeV/c];(TOFsignal-timeK)/160 ps",200,0.,4.,100,-5,5);
+    hname="hTOFtimeKaonHyptimeAC";
+    TH2F* hTOFtimeKaonHyptimeAC=new TH2F(hname.Data(),"TOFtime - timeHypothesisForKaon;p[GeV/c];TOFtime - timeHypothesisForKaon [ps]",200,0.,4.,1000,-20000.,20000.);
 
-  hname="hTOFsigmaPion160";
-  TH2F* hTOFsigmaPion160=new TH2F(hname.Data(),"(TOFsignal-time#pi)/160 ps;p[GeV/c];(TOFsignal-time#pi)/160 ps",200,0.,4.,100,-5,5);
+    hname="hTOFsigmaKSigPid";
+    TH2F* hTOFsigmaKSigPid=new TH2F(hname.Data(),"(TOFsignal-timeK)/tofSigPid;p[GeV/c];(TOFsignal-timeK)/tofSigPid",200,0.,4.,100,-5,5);
 
-  hname="hTOFsigmaProton160";
-  TH2F* hTOFsigmaProton160=new TH2F(hname.Data(),"(TOFsignal-timep)/160 ps;p[GeV/c];(TOFsignal-time p)/160 ps",200,0.,4.,100,-5,5);
+    hname="hTOFsigmaPionSigPid";
+    TH2F* hTOFsigmaPionSigPid=new TH2F(hname.Data(),"(TOFsignal-time#pi)/tofSigPid;p[GeV/c];(TOFsignal-time#pi)/tofSigPid",200,0.,4.,100,-5,5);
 
-  hname="hTOFsigmaKSigPid";
-  TH2F* hTOFsigmaKSigPid=new TH2F(hname.Data(),"(TOFsignal-timeK)/tofSigPid;p[GeV/c];(TOFsignal-timeK)/tofSigPid",200,0.,4.,100,-5,5);
+    hname="hTOFsigmaProtonSigPid";
+    TH2F* hTOFsigmaProtonSigPid=new TH2F(hname.Data(),"(TOFsignal-timep)/tofSigPid;p[GeV/c];(TOFsignal-time p)/tofSigPid",200,0.,4.,100,-5,5);
 
-  hname="hTOFsigmaPionSigPid";
-  TH2F* hTOFsigmaPionSigPid=new TH2F(hname.Data(),"(TOFsignal-time#pi)/tofSigPid;p[GeV/c];(TOFsignal-time#pi)/tofSigPid",200,0.,4.,100,-5,5);
+    hname="hTOFsigPid3sigPion";
+    TH1F* hTOFsigPid3sigPion=new TH1F(hname.Data(),"TOF PID resolution (#pi) [ps]",500,0.,1000.);
 
-  hname="hTOFsigmaProtonSigPid";
-  TH2F* hTOFsigmaProtonSigPid=new TH2F(hname.Data(),"(TOFsignal-timep)/tofSigPid;p[GeV/c];(TOFsignal-time p)/tofSigPid",200,0.,4.,100,-5,5);
+    hname="hTOFsigPid3sigKaon";
+    TH1F* hTOFsigPid3sigKaon=new TH1F(hname.Data(),"TOF PID resolution (K) [ps]",500,0.,1000.);
 
-  hname="hTOFsigPid3sigPion";
-  TH1F* hTOFsigPid3sigPion=new TH1F(hname.Data(),"TOF PID resolution (#pi) [ps]",500,0.,1000.);
+    hname="hTOFsigPid3sigProton";
+    TH1F* hTOFsigPid3sigProton=new TH1F(hname.Data(),"TOF PID resolution (p) [ps]",500,0.,1000.);
 
-  hname="hTOFsigPid3sigKaon";
-  TH1F* hTOFsigPid3sigKaon=new TH1F(hname.Data(),"TOF PID resolution (K) [ps]",500,0.,1000.);
 
-  hname="hTOFsigPid3sigProton";
-  TH1F* hTOFsigPid3sigProton=new TH1F(hname.Data(),"TOF PID resolution (p) [ps]",500,0.,1000.);
+    //TPC pid
+    hname="hTPCsig";
+    TH1F* hTPCsig=new TH1F(hname.Data(),"Distribution of TPC signal;TPC sig;Entries", 100, 35.,100.);
 
-
-  //TPC pid
-  hname="hTPCsig";
-  TH1F* hTPCsig=new TH1F(hname.Data(),"Distribution of TPC signal;TPC sig;Entries", 100, 35.,100.);
-
-  hname="hTPCsigvsp";
-  TH2F* hTPCsigvsp=new TH2F(hname.Data(),"TPCsig vs p;TPC p[GeV/c];TPCsig",200,0.,4.,1000,35.,100.);
+    hname="hTPCsigvsp";
+    TH2F* hTPCsigvsp=new TH2F(hname.Data(),"TPCsig vs p;TPC p[GeV/c];TPCsig",200,0.,4.,1000,35.,100.);
  
-  hname="hTPCsigvspAC";
-  TH2F* hTPCsigvspAC=new TH2F(hname.Data(),"TPCsig vs p;TPCp[GeV/c];TPCsig",200,0.,4.,1000,35.,100.);
-
-  hname="hTPCsigmaK";
-  TH2F* hTPCsigmaK=new TH2F(hname.Data(),"TPC Sigma for K as a function of momentum;p[GeV/c];Sigma Kaon",200,0.,4.,200,-5,5);
-
-  hname="hTPCsigmaPion";
-  TH2F* hTPCsigmaPion=new TH2F(hname.Data(),"TPC Sigma for #pi as a function of momentum;p[GeV/c];Sigma #pi",200,0.,4.,200,-5,5);
-
-  hname="hTPCsigmaProton";
-  TH2F* hTPCsigmaProton=new TH2F(hname.Data(),"TPC Sigma for proton as a function of momentum;p[GeV/c];Sigma Proton",200,0.,4.,200,-5,5);
-
-  fOutputPID->Add(hTOFsig);
-  fOutputPID->Add(hTPCsig);
-  fOutputPID->Add(hTOFtime);
-  fOutputPID->Add(hTOFtimeKaonHyptime);
-  fOutputPID->Add(hTOFtimeKaonHyptimeAC);
-  fOutputPID->Add(hTOFsigmaK160);
-  fOutputPID->Add(hTOFsigmaPion160);
-  fOutputPID->Add(hTOFsigmaProton160);
-  fOutputPID->Add(hTOFsigmaKSigPid);
-  fOutputPID->Add(hTOFsigmaPionSigPid);
-  fOutputPID->Add(hTOFsigmaProtonSigPid);
-  fOutputPID->Add(hTOFsigPid3sigPion);
-  fOutputPID->Add(hTOFsigPid3sigKaon);
-  fOutputPID->Add(hTOFsigPid3sigProton);
-  fOutputPID->Add(hTPCsigvsp);
-  fOutputPID->Add(hTPCsigvspAC);
-  fOutputPID->Add(hTPCsigmaK);
-  fOutputPID->Add(hTPCsigmaPion);
-  fOutputPID->Add(hTPCsigmaProton);
+    hname="hTPCsigvspAC";
+    TH2F* hTPCsigvspAC=new TH2F(hname.Data(),"TPCsig vs p;TPCp[GeV/c];TPCsig",200,0.,4.,1000,35.,100.);
+
+    hname="hTPCsigmaK";
+    TH2F* hTPCsigmaK=new TH2F(hname.Data(),"TPC Sigma for K as a function of momentum;p[GeV/c];Sigma Kaon",200,0.,4.,200,-5,5);
+
+    hname="hTPCsigmaPion";
+    TH2F* hTPCsigmaPion=new TH2F(hname.Data(),"TPC Sigma for #pi as a function of momentum;p[GeV/c];Sigma #pi",200,0.,4.,200,-5,5);
+
+    hname="hTPCsigmaProton";
+    TH2F* hTPCsigmaProton=new TH2F(hname.Data(),"TPC Sigma for proton as a function of momentum;p[GeV/c];Sigma Proton",200,0.,4.,200,-5,5);
+
+    fOutputPID->Add(hTOFsig);
+    fOutputPID->Add(hTPCsig);
+    fOutputPID->Add(hTOFtime);
+    fOutputPID->Add(hTOFtimeKaonHyptime);
+    fOutputPID->Add(hTOFtimeKaonHyptimeAC);
+    fOutputPID->Add(hTOFsigmaKSigPid);
+    fOutputPID->Add(hTOFsigmaPionSigPid);
+    fOutputPID->Add(hTOFsigmaProtonSigPid);
+    fOutputPID->Add(hTOFsigPid3sigPion);
+    fOutputPID->Add(hTOFsigPid3sigKaon);
+    fOutputPID->Add(hTOFsigPid3sigProton);
+    fOutputPID->Add(hTPCsigvsp);
+    fOutputPID->Add(hTPCsigvspAC);
+    fOutputPID->Add(hTPCsigmaK);
+    fOutputPID->Add(hTPCsigmaPion);
+    fOutputPID->Add(hTPCsigmaProton);
+  }
 
   //quality of the tracks
+  if(fOnOff[0]){
+    fOutputTrack=new TList();
+    fOutputTrack->SetOwner();
+    fOutputTrack->SetName(GetOutputSlot(3)->GetContainer()->GetName());
 
-  fOutputTrack=new TList();
-  fOutputTrack->SetOwner();
-  fOutputTrack->SetName(GetOutputSlot(3)->GetContainer()->GetName());
+    TString hname="hnClsITS";
+    TH1F* hnClsITS=new TH1F(hname.Data(),"Distribution of number of ITS clusters;nITScls;Entries",7,-0.5,6.5);
 
-  hname="hnClsITS";
-  TH1F* hnClsITS=new TH1F(hname.Data(),"Distribution of number of ITS clusters;nITScls;Entries",7,-0.5,6.5);
+    hname="hnClsITS-SA";
+    TH1F* hnClsITSSA=new TH1F(hname.Data(),"Distribution of number of ITS clusters(ITS-SA);nITScls;Entries",7,-0.5,6.5);
 
-  hname="hnClsITS-SA";
-  TH1F* hnClsITSSA=new TH1F(hname.Data(),"Distribution of number of ITS clusters(ITS-SA);nITScls;Entries",7,-0.5,6.5);
 
-  hname="hnClsSPD";
-  TH1F* hnClsSPD=new TH1F(hname.Data(),"Distribution of number of SPD clusters;nSPDcls;Entries",3,-0.5,2.5);
+    hname="hnLayerITS";
+    TH1F* hnLayerITS=new TH1F(hname.Data(),"Number of tracks with point in layer;ITS layer;",7,-1.5,5.5);
+    hnLayerITS->GetXaxis()->SetBinLabel(1,"n tracks");
 
-  hname="hptGoodTr";
-  TH1F* hptGoodTr=new TH1F(hname.Data(),"Pt distribution of 'good' tracks;p_{t}[GeV];Entries/0.05 GeV/c",400,0.,20.);
-  hptGoodTr->SetTitleOffset(1.3,"Y");
-
-  hname="hdistrGoodTr";
-  TH1F* hdistrGoodTr=new TH1F(hname.Data(),"Distribution of number of 'good' tracks per event;no.good-tracks/ev;Entries",4000,-0.5,3999.5);
-  hdistrGoodTr->SetTitleOffset(1.3,"Y");
-
-  hname="hd0";
-  TH1F* hd0=new TH1F(hname.Data(),"Impact parameter distribution of 'good' tracks;d_{0}[cm];Entries/10^{3} cm",200,-0.1,0.1);
+    hname="hnLayerITSsa";
+    TH1F* hnLayerITSsa=new TH1F(hname.Data(),"Number of tracks with point in layer;ITS layer;",7,-1.5,5.5);
+    hnLayerITSsa->GetXaxis()->SetBinLabel(1,"n tracks");
+   
+    hname="hnClsSPD";
+    TH1F* hnClsSPD=new TH1F(hname.Data(),"Distribution of number of SPD clusters;nSPDcls;Entries",3,-0.5,2.5);
+
+    hname="hptGoodTr";
+    TH1F* hptGoodTr=new TH1F(hname.Data(),"Pt distribution of 'good' tracks;p_{t}[GeV];Entries/0.05 GeV/c",400,0.,20.);
+    hptGoodTr->SetTitleOffset(1.3,"Y");
+
+    hname="hdistrGoodTr";
+    TH1F* hdistrGoodTr=new TH1F(hname.Data(),"Distribution of number of 'good' tracks per event;no.good-tracks/ev;Entries",4000,-0.5,3999.5);
+    hdistrGoodTr->SetTitleOffset(1.3,"Y");
+
+    hname="hd0";
+    TH1F* hd0=new TH1F(hname.Data(),"Impact parameter distribution of 'good' tracks;d_{0}[cm];Entries/10^{3} cm",200,-0.1,0.1);
+
+    fOutputTrack->Add(hnClsITS);
+    fOutputTrack->Add(hnClsITSSA);
+    fOutputTrack->Add(hnLayerITS);
+    fOutputTrack->Add(hnLayerITSsa);
+    fOutputTrack->Add(hnClsSPD);
+    fOutputTrack->Add(hptGoodTr);
+    fOutputTrack->Add(hdistrGoodTr);
+    fOutputTrack->Add(hd0);
+
+    if(fReadMC){
+      hname="hdistrFakeTr";
+      TH1F* hdistrFakeTr=new TH1F(hname.Data(),"Distribution of number of fake tracks per event;no.fake-tracks/ev;Entries",4000,-0.5,3999.5);
+      hdistrGoodTr->SetTitleOffset(1.3,"Y");
+
+      hname="hd0f";
+      TH1F* hd0f=new TH1F(hname.Data(),"Impact parameter distribution of fake tracks;d_{0}[cm];Entries/10^{3} cm",200,-0.1,0.1);
+
+      hname="hptFakeTr";
+      TH1F* hptFakeTr=new TH1F(hname.Data(),"Pt distribution of fake tracks;p_{t}[GeV];Entries/0.05 GeV/c",400,0.,20.);
+      hptFakeTr->SetTitleOffset(1.3,"Y");
+
+      fOutputTrack->Add(hptFakeTr);
+      fOutputTrack->Add(hdistrFakeTr);
+      fOutputTrack->Add(hd0f);
+   
+    }
+  }
 
-  fOutputTrack->Add(hnClsITS);
-  fOutputTrack->Add(hnClsITSSA);
-  fOutputTrack->Add(hnClsSPD);
-  fOutputTrack->Add(hptGoodTr);
-  fOutputTrack->Add(hdistrGoodTr);
-  fOutputTrack->Add(hd0);
   
-  if(fCuts->GetUseCentrality()){
+  if(fOnOff[2] && fCuts->GetUseCentrality()){
 
     //Centrality (Counters)
     fOutputCounters=new TList();
@@ -356,11 +400,11 @@ void AliAnalysisTaskSEHFQA::UserCreateOutputObjects()
 
     AliCounterCollection *stdEstimator=new AliCounterCollection("stdEstimator");
     stdEstimator->AddRubric("run",500000);
-    stdEstimator->AddRubric("centralityclass","0_10/10_20/20_30/30_40/40_50/50_60/60_70/70_80/80_90/90_100");
+    stdEstimator->AddRubric("centralityclass","-10_0/0_10/10_20/20_30/30_40/40_50/50_60/60_70/70_80/80_90/90_100/-990_-980");
     stdEstimator->Init();
     AliCounterCollection *secondEstimator=new AliCounterCollection("secondEstimator");
     secondEstimator->AddRubric("run",500000);
-    secondEstimator->AddRubric("centralityclass","0_10/10_20/20_30/30_40/40_50/50_60/60_70/70_80/80_90/90_100/-990_-980");
+    secondEstimator->AddRubric("centralityclass","-10_0/0_10/10_20/20_30/30_40/40_50/50_60/60_70/70_80/80_90/90_100/-990_-980");
     secondEstimator->Init();
 
     fOutputCounters->Add(stdEstimator);
@@ -371,7 +415,7 @@ void AliAnalysisTaskSEHFQA::UserCreateOutputObjects()
     fOutputCheckCentrality->SetOwner();
     fOutputCheckCentrality->SetName(GetOutputSlot(6)->GetContainer()->GetName());
 
-    hname="hNtrackletsIn";
+    TString hname="hNtrackletsIn";
     TH1F* hNtrackletsIn=new TH1F(hname.Data(),"Number of tracklets in Centrality range;ntracklets;Entries",5000,-0.5,4999.5);
 
     hname="hMultIn";
@@ -383,29 +427,57 @@ void AliAnalysisTaskSEHFQA::UserCreateOutputObjects()
     hname="hMultOut";
     TH1F* hMultOut=new TH1F(hname.Data(),"Multiplicity out of Centrality range;multiplicity;Entries",10000,-0.5,9999.5);
 
+    hname="hMultvsPercentile";
+    TH2F* hMultvsPercentile=new TH2F(hname.Data(),"Multiplicity vs Percentile;multiplicity;percentile",10000,-0.5,9999.5,12,-10.,110);
+
     fOutputCheckCentrality->Add(hNtrackletsIn);
     fOutputCheckCentrality->Add(hNtrackletsOut);
     fOutputCheckCentrality->Add(hMultIn);
     fOutputCheckCentrality->Add(hMultOut);
+    fOutputCheckCentrality->Add(hMultvsPercentile);
 
     PostData(6,fOutputCheckCentrality);
   
   } else{
-    hname="hNtracklets";
-    TH1F* hNtracklets=new TH1F(hname.Data(),"Number of tracklets;ntracklets;Entries",5000,-0.5,4999.5);
-
-    hname="hMult";
-    TH1F* hMult=new TH1F(hname.Data(),"Multiplicity;multiplicity;Entries",10000,-0.5,9999.5);
-    fOutputTrack->Add(hNtracklets);
-    fOutputTrack->Add(hMult);
+    if(fOnOff[0]){
+      TString hname="hNtracklets";
+      TH1F* hNtracklets=new TH1F(hname.Data(),"Number of tracklets;ntracklets;Entries",5000,-0.5,4999.5);
+
+      hname="hMult";
+      TH1F* hMult=new TH1F(hname.Data(),"Multiplicity;multiplicity;Entries",10000,-0.5,9999.5);
+      fOutputTrack->Add(hNtracklets);
+      fOutputTrack->Add(hMult);
+    }
   }
 
+  //event selection (z vertex for the moment)
+  if(fOnOff[3]){
+    fOutputEvSelection=new TList();
+    fOutputEvSelection->SetOwner();
+    fOutputEvSelection->SetName(GetOutputSlot(7)->GetContainer()->GetName());
+    AliCounterCollection *evselection=new AliCounterCollection("evselection");
+    evselection->AddRubric("run",500000);
+    evselection->AddRubric("evnonsel","zvtx");
+    evselection->Init();
+
+    TH1F* hzvtx=new TH1F("hzvtx", "Distribution of z_{VTX};z_{VTX} [cm];Entries",100,-20,20);
+
+    fOutputEvSelection->Add(evselection);
+    fOutputEvSelection->Add(hzvtx);
+  }
+//  AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+//  AliInputEventHandler *inputHandler=(AliInputEventHandler*)mgr->GetInputEventHandler();
+//  AliPIDResponse *pidResp=inputHandler->GetPIDResponse();
+//  fCuts->GetPidHF()->SetPidResponse(pidResp);
   // Post the data
   PostData(1,fNEntries);
-  PostData(2,fOutputPID);
-  PostData(3,fOutputTrack);
+  if(fOnOff[1]) PostData(2,fOutputPID);
+  if(fOnOff[0]) PostData(3,fOutputTrack);
   PostData(4,fCuts);
-  PostData(5,fOutputCounters);
+  if(fOnOff[2]) PostData(5,fOutputCounters);
+  if(fOnOff[3]) PostData(7,fOutputEvSelection);
+
+  if(!fOnOff[0] && !fOnOff[1] && !fOnOff[2]) AliError("Nothing will be filled!");
 }
 
 //___________________________________________________________________________
@@ -417,11 +489,13 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
   if(fDebug>2) printf("Analysing decay %d\n",fDecayChannel);
   // Post the data already here
   PostData(1,fNEntries);
-  PostData(2,fOutputPID);
-  PostData(3,fOutputTrack);
+  if(fOnOff[1]) PostData(2,fOutputPID);
+  if(fOnOff[0]) PostData(3,fOutputTrack);
   PostData(4,fCuts);
-  PostData(5,fOutputCounters);
-  if(fCuts->GetUseCentrality()) PostData(6,fOutputCheckCentrality);
+  if(fOnOff[2]) {
+    PostData(5,fOutputCounters);
+    if(fCuts->GetUseCentrality()) PostData(6,fOutputCheckCentrality);
+  }
 
   TClonesArray *arrayProng =0;
   Int_t pdg=0;
@@ -569,10 +643,6 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
       break; 
     }
   }
-
-  if(!aod) {delete [] pdgdaughters;return;}
-
-
   Bool_t isSimpleMode=fSimpleMode;
   if(!arrayProng) {
     AliInfo("Branch not found! The output will contain only trak related histograms\n");
@@ -583,6 +653,11 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
   TClonesArray *mcArray = 0;
   AliAODMCHeader *mcHeader = 0;
 
+  if(!aod) {
+    delete [] pdgdaughters;
+    return;
+  }
+
   //check if MC
   if(fReadMC) {
     // load MC particles
@@ -603,7 +678,10 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
   }
   // fix for temporary bug in ESDfilter 
   // the AODs with null vertex pointer didn't pass the PhysSel
-  if(!aod->GetPrimaryVertex() || TMath::Abs(aod->GetMagneticField())<0.001) {delete [] pdgdaughters; return;}
+  if(!aod->GetPrimaryVertex() || TMath::Abs(aod->GetMagneticField())<0.001) {
+    delete [] pdgdaughters;
+    return;
+  }
 
   // count event
   fNEntries->Fill(0); 
@@ -615,24 +693,41 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
   if(primTitle.Contains("VertexerTracks") && vtx1->GetNContributors()>0) fNEntries->Fill(4);
 
   // trigger class for PbPb C0SMH-B-NOPF-ALLNOTRD, C0SMH-B-NOPF-ALL
-  TString trigclass=aod->GetFiredTriggerClasses();
-  if(trigclass.Contains("C0SMH-B-NOPF-ALLNOTRD") || trigclass.Contains("C0SMH-B-NOPF-ALL")) fNEntries->Fill(5);
+  //TString trigclass=aod->GetFiredTriggerClasses();
+  //if(trigclass.Contains("C0SMH-B-NOPF-ALLNOTRD") || trigclass.Contains("C0SMH-B-NOPF-ALL")) fNEntries->Fill(5); //tmp
 
-  Bool_t evSelbyCentrality=kTRUE,evSelected=kTRUE;
+  Int_t runNumber = aod->GetRunNumber();
+
+  Bool_t evSelbyCentrality=kTRUE,evSelected=kTRUE,evSelByVertex=kTRUE,evselByPileup=kFALSE;
   //select event
   if(!fCuts->IsEventSelected(aod)) {
     evSelected=kFALSE;
-    if(fCuts->GetWhyRejection()==1) fNEntries->Fill(1); // rejected for pileup
-    if(fCuts->GetWhyRejection()==2) evSelbyCentrality=kFALSE; //rejected by centrality
+    if(fCuts->GetWhyRejection()==1) {fNEntries->Fill(1); evselByPileup=kTRUE;}// rejected for pileup
+    if(fCuts->GetWhyRejection()==2 || fCuts->GetWhyRejection()==3) evSelbyCentrality=kFALSE; //rejected by centrality
+    if(fCuts->GetWhyRejection()==4) evSelByVertex=kFALSE; //rejected by vertex
+    if(fCuts->GetWhyRejection()==5) fNEntries->Fill(5);//tmp
+    if(fCuts->GetWhyRejection()==6 && fOnOff[3]) ((AliCounterCollection*)fOutputEvSelection->FindObject("evselection"))->Count("evnonsel:zvtx/Run:%d",runNumber);
   }
-  if(evSelected || (!evSelected && !evSelbyCentrality)){ //events selected or not selected because of vtx
-    if(fCuts->GetUseCentrality()){
-      Int_t runNumber = aod->GetRunNumber();
-      Int_t stdCent = (Int_t)(fCuts->GetCentrality(aod)+0.5);
-      Int_t secondCent = (Int_t)(fCuts->GetCentrality(aod,fEstimator)+0.5);
+
+  if(evSelected || (!evSelected && !evSelbyCentrality && evSelByVertex && !evselByPileup)){ //events selected or not selected because of vtx or pileup
+    if(fOnOff[2] && fCuts->GetUseCentrality()){
+
+      Float_t stdCentf=fCuts->GetCentrality(aod);
+      Int_t stdCent = (Int_t)(stdCentf+0.5);
+      Float_t secondCentf =fCuts->GetCentrality(aod,fEstimator);
+      Int_t secondCent = (Int_t)(secondCentf+0.5);
       Int_t mincent=stdCent-stdCent%10;
+      if(stdCentf==-1) {
+       mincent=-10; 
+       stdCent=-1;
+      }
       ((AliCounterCollection*)fOutputCounters->FindObject("stdEstimator"))->Count(Form("centralityclass:%d_%d/Run:%d",mincent,mincent+10,runNumber));
+
       mincent=secondCent-secondCent%10;
+      if(secondCentf==-1) {
+       mincent=-10;
+       secondCent=-1;
+      }
       ((AliCounterCollection*)fOutputCounters->FindObject("secondEstimator"))->Count(Form("centralityclass:%d_%d/Run:%d",mincent,mincent+10,runNumber));
 
       if(stdCent<fCuts->GetMinCentrality() || stdCent>fCuts->GetMaxCentrality()){
@@ -642,210 +737,257 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
        ((TH1F*)fOutputCheckCentrality->FindObject("hNtrackletsIn"))->Fill(aod->GetTracklets()->GetNumberOfTracklets());
        ((TH1F*)fOutputCheckCentrality->FindObject("hMultIn"))->Fill(aod->GetHeader()->GetRefMultiplicity());
       }
+      ((TH2F*)fOutputCheckCentrality->FindObject("hMultvsPercentile"))->Fill(aod->GetHeader()->GetRefMultiplicity(),stdCentf);
 
       PostData(6,fOutputCheckCentrality);
 
     } else{
-      ((TH1F*)fOutputTrack->FindObject("hNtracklets"))->Fill(aod->GetTracklets()->GetNumberOfTracklets());
-      ((TH1F*)fOutputTrack->FindObject("hMult"))->Fill(aod->GetHeader()->GetRefMultiplicity());
+      if(fOnOff[0]){
+       ((TH1F*)fOutputTrack->FindObject("hNtracklets"))->Fill(aod->GetTracklets()->GetNumberOfTracklets());
+       ((TH1F*)fOutputTrack->FindObject("hMult"))->Fill(aod->GetHeader()->GetRefMultiplicity());
+      }
     }
   }
 
+  if(fOnOff[3]){
+    const AliVVertex *vertex = aod->GetPrimaryVertex();
+    Double_t zvtx=vertex->GetZ();
+    if(evSelected || (!evSelected && TMath::Abs(zvtx) > 10.))
+    ((TH1F*)fOutputEvSelection->FindObject("hzvtx"))->Fill(zvtx);
+  }
+
   if(!evSelected) {
     delete [] pdgdaughters;
     return; //discard all events not selected (vtx and/or centrality)
   }
 
+
+  AliAODPidHF* pidHF=fCuts->GetPidHF();
+  if(!pidHF) {
+    delete [] pdgdaughters;
+    return;
+  }
+  AliPIDResponse* respF=pidHF->GetPidResponse();
+  AliTPCPIDResponse* tpcres=new AliTPCPIDResponse();
+  if(pidHF->GetOldPid()) pidHF->SetBetheBloch(*tpcres);
+  Bool_t oldPID=pidHF->GetOldPid();
+
+
   Int_t ntracks=0;
-  Int_t isGoodTrack=0;
+  Int_t isGoodTrack=0, isFakeTrack=0;
 
   if(aod) ntracks=aod->GetNTracks();
 
-  //loop on tracks in the event
-  for (Int_t k=0;k<ntracks;k++){
-    AliAODTrack* track=aod->GetTrack(k);
-    AliAODPidHF* pidHF=fCuts->GetPidHF();
-    AliAODPid *pid = track->GetDetPid();
-    if(!pid)  {if (fDebug>1)cout<<"No AliAODPid found"<<endl; continue;}
+  if(fOnOff[0] || fOnOff[1]){
+    //loop on tracks in the event
+    for (Int_t k=0;k<ntracks;k++){
+      AliAODTrack* track=aod->GetTrack(k);
+      AliAODPid *pid = track->GetDetPid();
+
 
-    Double_t times[AliPID::kSPECIES];
-    pid->GetIntegratedTimes(times);
+      if(fOnOff[1]){
+       if(!pid)  {if (fDebug>1)cout<<"No AliAODPid found"<<endl; continue;}
+       Double_t times[AliPID::kSPECIES];
+       pid->GetIntegratedTimes(times);
     
-    Double_t tofRes[AliPID::kSPECIES];
-    pid->GetTOFpidResolution(tofRes);
-
-    //check TOF
-    if(pidHF && pidHF->CheckStatus(track,"TOF")){
-      ((TH1F*)fOutputPID->FindObject("hTOFtime"))->Fill(times[AliPID::kProton]);
-      ((TH2F*)fOutputPID->FindObject("hTOFtimeKaonHyptime"))->Fill(track->P(),pid->GetTOFsignal()-times[3]); //3 is kaon
-      ((TH1F*)fOutputPID->FindObject("hTOFsig"))->Fill(pid->GetTOFsignal());
-      if (pid->GetTOFsignal()< 0) ((TH1F*)fOutputPID->FindObject("hTOFsig"))->Fill(-1);
-
-      // test a "simple" 160 ps TOF sigma PID
-      ((TH2F*)fOutputPID->FindObject("hTOFsigmaK160"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kKaon])/160);
-      ((TH2F*)fOutputPID->FindObject("hTOFsigmaPion160"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kPion])/160);
-      ((TH2F*)fOutputPID->FindObject("hTOFsigmaProton160"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kProton])/160);
-      
-      // test TOF sigma PID
-      if (tofRes[2] != 0.) {   // protection against 'old' AODs...
-       ((TH2F*)fOutputPID->FindObject("hTOFsigmaKSigPid"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kKaon])/tofRes[3]);
-       ((TH2F*)fOutputPID->FindObject("hTOFsigmaPionSigPid"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kPion])/tofRes[2]);
-       ((TH2F*)fOutputPID->FindObject("hTOFsigmaProtonSigPid"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kProton])/tofRes[4]);
-       for (Int_t iS=2; iS<5; iS++){ //we plot TOF Pid resolution for 3-sigma identified particles
-         if ( (TMath::Abs(times[iS]-pid->GetTOFsignal())/tofRes[iS])<3.){
-           switch (iS) {
-           case AliPID::kPion:
-             ((TH1F*)fOutputPID->FindObject("hTOFsigPid3sigPion"))->Fill(tofRes[iS]);
-             break;
-           case AliPID::kKaon:
-             ((TH1F*)fOutputPID->FindObject("hTOFsigPid3sigKaon"))->Fill(tofRes[iS]);
-             break;
-           case AliPID::kProton:
-             ((TH1F*)fOutputPID->FindObject("hTOFsigPid3sigProton"))->Fill(tofRes[iS]);
-             break;
-           default:
-             break;
+       Double_t tofRes[AliPID::kSPECIES];
+       pid->GetTOFpidResolution(tofRes);
+
+       //check TOF
+       if(pidHF && pidHF->CheckStatus(track,"TOF")){
+         ((TH1F*)fOutputPID->FindObject("hTOFtime"))->Fill(times[AliPID::kProton]);
+         ((TH2F*)fOutputPID->FindObject("hTOFtimeKaonHyptime"))->Fill(track->P(),pid->GetTOFsignal()-times[3]); //3 is kaon
+         ((TH1F*)fOutputPID->FindObject("hTOFsig"))->Fill(pid->GetTOFsignal());
+         if (pid->GetTOFsignal()< 0) ((TH1F*)fOutputPID->FindObject("hTOFsig"))->Fill(-1);
+
+         
+         // test TOF sigma PID
+         if (tofRes[2] != 0.) {   // protection against 'old' AODs...
+           ((TH2F*)fOutputPID->FindObject("hTOFsigmaKSigPid"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kKaon])/tofRes[3]);
+           ((TH2F*)fOutputPID->FindObject("hTOFsigmaPionSigPid"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kPion])/tofRes[2]);
+           ((TH2F*)fOutputPID->FindObject("hTOFsigmaProtonSigPid"))->Fill(track->P(),(pid->GetTOFsignal()-times[AliPID::kProton])/tofRes[4]);
+           for (Int_t iS=2; iS<5; iS++){ //we plot TOF Pid resolution for 3-sigma identified particles
+             if ( (TMath::Abs(times[iS]-pid->GetTOFsignal())/tofRes[iS])<3.){
+               switch (iS) {
+               case AliPID::kPion:
+                 ((TH1F*)fOutputPID->FindObject("hTOFsigPid3sigPion"))->Fill(tofRes[iS]);
+                 break;
+               case AliPID::kKaon:
+                 ((TH1F*)fOutputPID->FindObject("hTOFsigPid3sigKaon"))->Fill(tofRes[iS]);
+                 break;
+               case AliPID::kProton:
+                 ((TH1F*)fOutputPID->FindObject("hTOFsigPid3sigProton"))->Fill(tofRes[iS]);
+                 break;
+               default:
+                 break;
+               }
+             }
            }
          }
+       }//if TOF status
+
+       if(pidHF && pidHF->CheckStatus(track,"TPC")){ 
+
+         Double_t TPCp=pid->GetTPCmomentum();
+         Double_t TPCsignal=pid->GetTPCsignal();
+         ((TH1F*)fOutputPID->FindObject("hTPCsig"))->Fill(TPCsignal);
+         ((TH1F*)fOutputPID->FindObject("hTPCsigvsp"))->Fill(TPCp,TPCsignal);
+         //if (pidHF->IsKaonRaw(track, "TOF"))
+         if(!oldPID) ((TH2F*)fOutputPID->FindObject("hTPCsigmaK"))->Fill(TPCp,respF->NumberOfSigmasTPC(track,AliPID::kKaon));
+         if (oldPID) ((TH2F*)fOutputPID->FindObject("hTPCsigmaK"))->Fill(TPCp,tpcres->GetNumberOfSigmas(TPCp,TPCsignal,track->GetTPCNcls(),AliPID::kKaon));
+         //if (pidHF->IsPionRaw(track, "TOF"))
+         if(oldPID) ((TH2F*)fOutputPID->FindObject("hTPCsigmaPion"))->Fill(TPCp,tpcres->GetNumberOfSigmas(TPCp,TPCsignal,track->GetTPCNcls(),AliPID::kPion));
+         if(!oldPID) ((TH2F*)fOutputPID->FindObject("hTPCsigmaPion"))->Fill(TPCp,respF->NumberOfSigmasTPC(track,AliPID::kPion));
+         //if (pidHF->IsProtonRaw(track,"TOF"))
+         if(oldPID) ((TH2F*)fOutputPID->FindObject("hTPCsigmaProton"))->Fill(TPCp,tpcres->GetNumberOfSigmas(TPCp,TPCsignal,track->GetTPCNcls(),AliPID::kProton));
+         if(!oldPID) ((TH2F*)fOutputPID->FindObject("hTPCsigmaProton"))->Fill(TPCp,respF->NumberOfSigmasTPC(track,AliPID::kProton));
+       }//if TPC status
+      } //end PID histograms
+
+      Int_t nclsTot=0,nclsSPD=0;
+
+      //check clusters of the tracks
+      if(fOnOff[0]){
+
+       ((TH1F*)fOutputTrack->FindObject("hnLayerITS"))->Fill(-1);
+       for(Int_t l=0;l<6;l++) {
+         if(TESTBIT(track->GetITSClusterMap(),l)) {
+           ((TH1F*)fOutputTrack->FindObject("hnLayerITS"))->Fill(l);
+           nclsTot++; if(l<2) nclsSPD++;
+         }
        }
-      }
-    }//if TOF status
-
-    if(pidHF && pidHF->CheckStatus(track,"TPC")){ 
-      Double_t alephParameters[5];
-      //this is recommended for LHC10d
-      alephParameters[0] = 1.34490e+00/50.;
-      alephParameters[1] =  2.69455e+01;
-      alephParameters[2] =  TMath::Exp(-2.97552e+01);
-      alephParameters[3] = 2.35339e+00;
-      alephParameters[4] = 5.98079e+00;
-      /*
-      //this is recommended for LHC10bc
-      alephParameters[0] = 0.0283086/0.97;
-      alephParameters[1] = 2.63394e+01;
-      alephParameters[2] = 5.04114e-11;
-      alephParameters[3] = 2.12543e+00;
-      alephParameters[4] = 4.88663e+00;
-      */
-      AliTPCPIDResponse* tpcres=new AliTPCPIDResponse();
-      tpcres->SetBetheBlochParameters(alephParameters[0],alephParameters[1],alephParameters[2],alephParameters[3],alephParameters[4]);
-      Double_t TPCp=pid->GetTPCmomentum();
-      Double_t TPCsignal=pid->GetTPCsignal();
-      ((TH1F*)fOutputPID->FindObject("hTPCsig"))->Fill(TPCsignal);
-      ((TH1F*)fOutputPID->FindObject("hTPCsigvsp"))->Fill(TPCp,TPCsignal);
-      //if (pidHF->IsKaonRaw(track, "TOF"))
-      ((TH2F*)fOutputPID->FindObject("hTPCsigmaK"))->Fill(TPCp,tpcres->GetNumberOfSigmas(TPCp,TPCsignal,track->GetTPCNcls(),AliPID::kKaon));
-      //if (pidHF->IsPionRaw(track, "TOF"))
-      ((TH2F*)fOutputPID->FindObject("hTPCsigmaPion"))->Fill(TPCp,tpcres->GetNumberOfSigmas(TPCp,TPCsignal,track->GetTPCNcls(),AliPID::kPion));
-      //if (pidHF->IsProtonRaw(track,"TOF"))
-      ((TH2F*)fOutputPID->FindObject("hTPCsigmaProton"))->Fill(TPCp,tpcres->GetNumberOfSigmas(TPCp,TPCsignal,track->GetTPCNcls(),AliPID::kProton));
-      delete tpcres;
-    }//if TPC status
-
-    //check clusters of the tracks
-    Int_t nclsTot=0,nclsSPD=0;
-    
-    for(Int_t l=0;l<6;l++) {
-      if(TESTBIT(track->GetITSClusterMap(),l)) {
-       nclsTot++; if(l<2) nclsSPD++;
-      }
-    }
-    ((TH1F*)fOutputTrack->FindObject("hnClsITS"))->Fill(nclsTot);
-    ((TH1F*)fOutputTrack->FindObject("hnClsSPD"))->Fill(nclsSPD);
-
-    if(!(track->GetStatus()&AliESDtrack::kTPCin) && track->GetStatus()&AliESDtrack::kITSrefit && !(track->GetStatus()&AliESDtrack::kITSpureSA)){//tracks retrieved in the ITS and not reconstructed in the TPC
-      ((TH1F*)fOutputTrack->FindObject("hnClsITS-SA"))->Fill(nclsTot);
-    }
-
-    if(isSimpleMode){
-
-      if (track->Pt()>0.3 &&
-         track->GetStatus()&AliESDtrack::kTPCrefit &&
-         track->GetStatus()&AliESDtrack::kITSrefit &&
-         /*nclsTot>3 &&*/
-         nclsSPD>0) {//fill hist good tracks
-
-       ((TH1F*)fOutputTrack->FindObject("hptGoodTr"))->Fill(track->Pt());
-       
-       isGoodTrack++;
-      
-       ((TH1F*)fOutputTrack->FindObject("hdistrGoodTr"))->Fill(isGoodTrack);
-      }
-    }//simple mode: no IsSelected on tracks: use "manual" cuts
-      
-  } //end loop on tracks
-
-  if(!isSimpleMode){
-    // loop over candidates
-    Int_t nCand = arrayProng->GetEntriesFast();
-    Int_t ndaugh=3;
-    if(fDecayChannel==AliAnalysisTaskSEHFQA::kD0toKpi) ndaugh=2;
-    if(fDecayChannel==AliAnalysisTaskSEHFQA::kD0toKpipipi) ndaugh=4;
-
-    for (Int_t iCand = 0; iCand < nCand; iCand++) {
-      AliAODRecoDecayHF *d = (AliAODRecoDecayHF*)arrayProng->UncheckedAt(iCand);
-
-      if(fReadMC){ 
-       Int_t labD = d->MatchToMC(pdg,mcArray,ndaugh,pdgdaughters);
-       if(labD>=0){
-         AliAODMCParticle *partD = (AliAODMCParticle*)mcArray->At(labD);
-         Int_t label=partD->GetMother();
-         AliAODMCParticle *mot = (AliAODMCParticle*)mcArray->At(label);
-         while(label>=0){//get first mother
-           mot = (AliAODMCParticle*)mcArray->At(label);
-           label=mot->GetMother();
+       ((TH1F*)fOutputTrack->FindObject("hnClsITS"))->Fill(nclsTot);
+       ((TH1F*)fOutputTrack->FindObject("hnClsSPD"))->Fill(nclsSPD);
+
+       if(!(track->GetStatus()&AliESDtrack::kTPCin) && track->GetStatus()&AliESDtrack::kITSrefit && !(track->GetStatus()&AliESDtrack::kITSpureSA)){//tracks retrieved in the ITS and not reconstructed in the TPC
+         ((TH1F*)fOutputTrack->FindObject("hnClsITS-SA"))->Fill(nclsTot);
+         ((TH1F*)fOutputTrack->FindObject("hnLayerITS"))->Fill(-1);
+         for(Int_t l=0;l<6;l++) {
+           if(TESTBIT(track->GetITSClusterMap(),l)) {
+             ((TH1F*)fOutputTrack->FindObject("hnLayerITSsa"))->Fill(l);
+           }
          }
-         Int_t pdgMotCode = mot->GetPdgCode();
-       
-         if(TMath::Abs(pdgMotCode)==4) fNEntries->Fill(6); //from primary charm
-         if(TMath::Abs(pdgMotCode)==5) fNEntries->Fill(7); //from beauty
-
        }
-      }//end MC
-      else fNEntries->Fill(6); //count the candidates (data)
-
-      for(Int_t id=0;id<ndaugh;id++){
-
-       //other histograms to be filled when the cut object is given
-       AliAODTrack* track=(AliAODTrack*)d->GetDaughter(id);
+       Int_t label=0;
        if(fReadMC){
-         Int_t label=track->GetLabel();
+         label=track->GetLabel();
          if (label<0)fNEntries->Fill(8);
+         else fNEntries->Fill(9); 
+       }
+
+       if(isSimpleMode){
+
+         if (track->Pt()>0.3 &&
+             track->GetStatus()&AliESDtrack::kTPCrefit &&
+             track->GetStatus()&AliESDtrack::kITSrefit &&
+             /*nclsTot>3 &&*/
+             nclsSPD>0) {//count good tracks
+
+           
+           if(fReadMC && label<0) {
+             ((TH1F*)fOutputTrack->FindObject("hptFakeTr"))->Fill(track->Pt());
+             isFakeTrack++;    
+           } else {
+             ((TH1F*)fOutputTrack->FindObject("hptGoodTr"))->Fill(track->Pt());
+             isGoodTrack++;
+           }
+         }
+       } //simple mode: no IsSelected on tracks: use "manual" cuts   
+      } //fill track histos
+    } //end loop on tracks
+
+      //fill once per event
+    if(fOnOff[0]){
+      if (fReadMC) ((TH1F*)fOutputTrack->FindObject("hdistrFakeTr"))->Fill(isFakeTrack);
+      ((TH1F*)fOutputTrack->FindObject("hdistrGoodTr"))->Fill(isGoodTrack);
+    }
+
+    if(!isSimpleMode){
+      // loop over candidates
+      Int_t nCand = arrayProng->GetEntriesFast();
+      Int_t ndaugh=3;
+      if(fDecayChannel==AliAnalysisTaskSEHFQA::kD0toKpi) ndaugh=2;
+      if(fDecayChannel==AliAnalysisTaskSEHFQA::kD0toKpipipi) ndaugh=4;
+
+      for (Int_t iCand = 0; iCand < nCand; iCand++) {
+       AliAODRecoDecayHF *d = (AliAODRecoDecayHF*)arrayProng->UncheckedAt(iCand);
+       if(d->GetSelectionMap()) {
+         if(fDecayChannel==AliAnalysisTaskSEHFQA::kD0toKpi && !d->HasSelectionBit(AliRDHFCuts::kD0toKpiCuts)) continue; //skip the D0 from Dstar
+         if(fDecayChannel==AliAnalysisTaskSEHFQA::kDplustoKpipi && !d->HasSelectionBit(AliRDHFCuts::kDplusCuts)) continue; //skip the 3 prong !D+
        }
-       //track quality
 
-       if (fCuts->IsInFiducialAcceptance(d->Pt(),d->Y(pdg)) && fCuts->IsSelected(d,AliRDHFCuts::kTracks,aod)) {
+       if(fReadMC){ 
+         Int_t labD = d->MatchToMC(pdg,mcArray,ndaugh,pdgdaughters);
+         if(labD>=0){
+           AliAODMCParticle *partD = (AliAODMCParticle*)mcArray->At(labD);
+           Int_t label=partD->GetMother();
+           AliAODMCParticle *mot = (AliAODMCParticle*)mcArray->At(label);
+           while(label>=0){//get first mother
+             mot = (AliAODMCParticle*)mcArray->At(label);
+             label=mot->GetMother();
+           }
+           Int_t pdgMotCode = mot->GetPdgCode();
        
-         ((TH1F*)fOutputTrack->FindObject("hptGoodTr"))->Fill(track->Pt());
-         isGoodTrack++;
-      
-         ((TH1F*)fOutputTrack->FindObject("hdistrGoodTr"))->Fill(isGoodTrack);
-      
-         ((TH1F*)fOutputTrack->FindObject("hd0"))->Fill(d->Getd0Prong(id));
-  
-         if (fCuts->IsSelected(d,AliRDHFCuts::kAll,aod)){
+           if(TMath::Abs(pdgMotCode)==4) fNEntries->Fill(6); //from primary charm
+           if(TMath::Abs(pdgMotCode)==5) fNEntries->Fill(7); //from beauty
+
+         }
+       }//end MC
+       else fNEntries->Fill(6); //count the candidates (data)
+
+       for(Int_t id=0;id<ndaugh;id++){
+
+         //other histograms to be filled when the cut object is given
+         AliAODTrack* track=(AliAODTrack*)d->GetDaughter(id);
+
+         //track quality
+
+         if (fCuts->IsInFiducialAcceptance(d->Pt(),d->Y(pdg)) && fCuts->IsSelected(d,AliRDHFCuts::kTracks,aod)) {
+           
+           Int_t label=0;
+           if(fReadMC)label=track->GetLabel();
+           if(fOnOff[0]){
+             
+             if(fReadMC && label<0) {
+               isFakeTrack++;
+               ((TH1F*)fOutputTrack->FindObject("hptFakeTr"))->Fill(track->Pt());
+          
+               ((TH1F*)fOutputTrack->FindObject("hd0f"))->Fill(d->Getd0Prong(id));
+             } else {
+               isGoodTrack++;
+               ((TH1F*)fOutputTrack->FindObject("hptGoodTr"))->Fill(track->Pt());
+           
+               ((TH1F*)fOutputTrack->FindObject("hd0"))->Fill(d->Getd0Prong(id));
+             }
+           }
+           if (fCuts->IsSelected(d,AliRDHFCuts::kAll,aod) && fOnOff[1]){
          
-           AliAODPid *pid = track->GetDetPid();
-           AliAODPidHF* pidHF=fCuts->GetPidHF();
-           Double_t times[5];
-           pid->GetIntegratedTimes(times);
-           if(pidHF && pidHF->CheckStatus(track,"TOF")) ((TH2F*)fOutputPID->FindObject("hTOFtimeKaonHyptimeAC"))->Fill(track->P(),pid->GetTOFsignal()-times[AliPID::kKaon]);
-           if(pidHF && pidHF->CheckStatus(track,"TPC")) ((TH2F*)fOutputPID->FindObject("hTPCsigvspAC"))->Fill(pid->GetTPCmomentum(),pid->GetTPCsignal());
-
-           fNEntries->Fill(3);
-         } //end analysis cuts
-       } //end acceptance and track cuts
-      } //end loop on tracks in the candidate
-    } //end loop on candidates  
-  }
+             AliAODPid *pid = track->GetDetPid();
+             Double_t times[5];
+             pid->GetIntegratedTimes(times);
+             if(pidHF && pidHF->CheckStatus(track,"TOF")) ((TH2F*)fOutputPID->FindObject("hTOFtimeKaonHyptimeAC"))->Fill(track->P(),pid->GetTOFsignal()-times[AliPID::kKaon]);
+             if(pidHF && pidHF->CheckStatus(track,"TPC")) ((TH2F*)fOutputPID->FindObject("hTPCsigvspAC"))->Fill(pid->GetTPCmomentum(),pid->GetTPCsignal());
+
+             fNEntries->Fill(3);
+           } //end analysis cuts
+         } //end acceptance and track cuts
+       } //end loop on tracks in the candidate
+      } //end loop on candidates
+      if(fOnOff[0]){
+       if(fReadMC) ((TH1F*)fOutputTrack->FindObject("hdistrFakeTr"))->Fill(isFakeTrack);
+       ((TH1F*)fOutputTrack->FindObject("hdistrGoodTr"))->Fill(isGoodTrack);
+      }
+    }
+  } //end if on pid or track histograms
 
+  delete tpcres;
   delete [] pdgdaughters;
   PostData(1,fNEntries);
-  PostData(2,fOutputPID);
-  PostData(3,fOutputTrack);
+  if(fOnOff[1]) PostData(2,fOutputPID);
+  if(fOnOff[0]) PostData(3,fOutputTrack);
   PostData(4,fCuts);
-  PostData(5,fOutputCounters);
-  //Post data 6 done in case of centrality on
+  if(fOnOff[2]) PostData(5,fOutputCounters);
+  //Post data 6 done in case of centrality on   
 
 }
 
@@ -860,13 +1002,13 @@ void AliAnalysisTaskSEHFQA::Terminate(Option_t */*option*/){
   }
 
   fOutputPID = dynamic_cast<TList*> (GetOutputData(2));
-  if (!fOutputPID) {     
+  if (!fOutputPID && fOnOff[1]) {     
     printf("ERROR: %s not available\n",GetOutputSlot(2)->GetContainer()->GetName());
     return;
   }
 
   fOutputTrack = dynamic_cast<TList*> (GetOutputData(3));
-  if (!fOutputTrack) {     
+  if (!fOutputTrack && fOnOff[0]) {     
     printf("ERROR: %s not available\n",GetOutputSlot(3)->GetContainer()->GetName());
     return;
   }