]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx
added setter for the harmonic
[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisTaskSED0Mass.cxx
index 513e72076540f66ea8ed187d73ffaa913a289d48..ee25974dcebf4aecf3bb73b99064fe0ea7b11298 100644 (file)
@@ -48,7 +48,7 @@
 #include "AliAnalysisVertexingHF.h"
 #include "AliAnalysisTaskSE.h"
 #include "AliAnalysisTaskSED0Mass.h"
-
+#include "AliNormalizationCounter.h"
 
 ClassImp(AliAnalysisTaskSED0Mass)
 
@@ -59,15 +59,15 @@ AliAnalysisTaskSE(),
 fOutputMass(0),
 fDistr(0),
 fNentries(0), 
-fChecks(0),
 fCuts(0),
 fArray(0),
 fReadMC(0),
 fCutOnDistr(0),
+fUsePid4Distr(0),
+fCounter(0),
 fNPtBins(1),
-fTotPosPairs(0),
-fTotNegPairs(0),
-fLsNormalization(1.)
+fLsNormalization(1.),
+fFillOnlyD0D0bar(0)
 
 
 {
@@ -80,24 +80,23 @@ AliAnalysisTaskSE(name),
 fOutputMass(0), 
 fDistr(0),
 fNentries(0),
-fChecks(0),
 fCuts(0),
 fArray(0),
 fReadMC(0),
 fCutOnDistr(0),
+fUsePid4Distr(0),
+fCounter(0),
 fNPtBins(1),
-fTotPosPairs(0),
-fTotNegPairs(0),
-fLsNormalization(1.)
-
+fLsNormalization(1.),
+fFillOnlyD0D0bar(0)
 
 {
   // Default constructor
 
   fNPtBins=cuts->GetNPtBins();
-  fTotPosPairs=new Int_t[fNPtBins];
-  fTotNegPairs=new Int_t[fNPtBins];
-  for(Int_t i=0;i<fNPtBins;i++) {fTotPosPairs[i]=0; fTotNegPairs[i]=0;}
+  // fTotPosPairs=new Int_t[fNPtBins];
+  // fTotNegPairs=new Int_t[fNPtBins];
+  // for(Int_t i=0;i<fNPtBins;i++) {fTotPosPairs[i]=0; fTotNegPairs[i]=0;}
     
   fCuts=cuts;
 
@@ -107,11 +106,10 @@ fLsNormalization(1.)
   DefineOutput(2,TList::Class());  //My private output
   // Output slot #3 writes into a TH1F container (number of events)
   DefineOutput(3,TH1F::Class());  //My private output
-  // Output slot #4 writes into a TList container (quality check)
-  DefineOutput(4,TList::Class());  //My private output
-  // Output slot #5 writes into a TList container (cuts)
-  DefineOutput(5,AliRDHFCutsD0toKpi::Class());  //My private output
-
+  // Output slot #4 writes into a TList container (cuts)
+  DefineOutput(4,AliRDHFCutsD0toKpi::Class());  //My private output
+  // Output slot #5 writes Normalization Counter 
+  DefineOutput(5,AliNormalizationCounter::Class());
 }
 
 //________________________________________________________________________
@@ -125,10 +123,6 @@ AliAnalysisTaskSED0Mass::~AliAnalysisTaskSED0Mass()
     delete fDistr;
     fDistr = 0;
   }
-  if (fChecks) {
-    delete fChecks;
-    fChecks = 0;
-  }
   if (fCuts) {
     delete fCuts;
     fCuts = 0;
@@ -137,7 +131,10 @@ AliAnalysisTaskSED0Mass::~AliAnalysisTaskSED0Mass()
     delete fNentries;
     fNentries = 0;
   }
+  if(fCounter){
+    delete fCounter;
+    fCounter=0;
+  }
  
 }  
 
@@ -150,10 +147,10 @@ void AliAnalysisTaskSED0Mass::Init()
 
   
   AliRDHFCutsD0toKpi* copyfCuts=new AliRDHFCutsD0toKpi(*fCuts);
-  const char* nameoutput=GetOutputSlot(5)->GetContainer()->GetName();
+  const char* nameoutput=GetOutputSlot(4)->GetContainer()->GetName();
   copyfCuts->SetName(nameoutput);
   // Post the data
-  PostData(5,copyfCuts);
+  PostData(4,copyfCuts);
 
 
   return;
@@ -176,10 +173,6 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
   fDistr->SetOwner();
   fDistr->SetName("distributionslist");
 
-  fChecks = new TList();
-  fChecks->SetOwner();
-  fChecks->SetName("checkHistograms");
-
   TString nameMass=" ",nameSgn27=" ",nameSgn=" ", nameBkg=" ", nameRfl=" ",nameMassNocutsS =" ",nameMassNocutsB =" ", namedistr=" ";
 
   for(Int_t i=0;i<fCuts->GetNPtBins();i++){
@@ -215,23 +208,28 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     TH1F *hptB = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
 
     //  pT no mass cut
-    namedistr="hptpiSnoMcut_";
-    namedistr+=i;
-    TH1F *hptpiSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
-
-    namedistr="hptKSnoMcut_";
-    namedistr+=i;
-    TH1F *hptKSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
+    // namedistr="hptpiSnoMcut_";
+    // namedistr+=i;
+    // TH1F *hptpiSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
 
-    namedistr="hptB1prongnoMcut_";
-    namedistr+=i;
-    TH1F *hptB1pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
+    // namedistr="hptKSnoMcut_";
+    // namedistr+=i;
+    // TH1F *hptKSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
 
-    namedistr="hptB2prongsnoMcut_";
-    namedistr+=i;
-    TH1F *hptB2pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
+    // namedistr="hptB1prongnoMcut_";
+    // namedistr+=i;
+    // TH1F *hptB1pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
 
+    // namedistr="hptB2prongsnoMcut_";
+    // namedistr+=i;
+    // TH1F *hptB2pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
     
+    // fDistr->Add(hptpiSnoMcut);
+    // fDistr->Add(hptKSnoMcut);
+    // fDistr->Add(hptB1pnoMcut);
+    // fDistr->Add(hptB2pnoMcut);
+
+
     //  dca
     namedistr="hdcaS_";
     namedistr+=i;
@@ -269,24 +267,13 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     namedistr+=i;
     TH1F *hd0p1B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong -);d0 [cm]",200,-0.1,0.1);
 
-    namedistr="hd0vpiS_";
-    namedistr+=i;
-    TH1F *hd0vpiS = new TH1F(namedistr.Data(), "Impact parameter distribution (pions)(vtx w/o these tracks);d0(#pi) [cm]",200,-0.1,0.1);
-
-    namedistr="hd0vKS_";
-    namedistr+=i;
-    TH1F *hd0vKS = new TH1F(namedistr.Data(), "Impact parameter distribution (kaons) (vtx w/o these tracks);d0(K) [cm]",200,-0.1,0.1);
-    namedistr="hd0vB_";
-    namedistr+=i;
-    TH1F *hd0vB = new TH1F(namedistr.Data(), "Impact parameter distribution (vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
-
-    namedistr="hd0vp0B_";
+    namedistr="hd0moresB_";
     namedistr+=i;
-    TH1F *hd0vp0B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong + ** vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
+    TH1F *hd0moresB = new TH1F(namedistr.Data(), "Impact parameter distribution (both);d0 [cm]",200,-0.1,0.1);
 
-    namedistr="hd0vp1B_";
+    namedistr="hd0d0moresB_";
     namedistr+=i;
-    TH1F *hd0vp1B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong - ** vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
+    TH1F *hd0d0moresB = new TH1F(namedistr.Data(), "Impact parameter distribution (prong +);d0 [cm]",200,-0.001,0.001);
 
     namedistr="hd0d0S_";
     namedistr+=i;
@@ -295,29 +282,22 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     namedistr+=i;
     TH1F *hd0d0B = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution;d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
 
-     namedistr="hd0d0vS_";
-    namedistr+=i;
-    TH1F *hd0d0vS = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution (vtx w/o these tracks);d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
-    namedistr="hd0d0vB_";
-    namedistr+=i;
-    TH1F *hd0d0vB = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution (vtx w/o these tracks);d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
-
     //decay lenght
     namedistr="hdeclS_";
     namedistr+=i;
-    TH1F *hdeclengthS = new TH1F(namedistr.Data(), "Decay Length distribution;Decay Length [cm]",200,0,0.6);
+    TH1F *hdeclengthS = new TH1F(namedistr.Data(), "Decay Length distribution;Decay Length [cm]",200,0,0.15);
 
     namedistr="hdeclB_";
     namedistr+=i;
-    TH1F *hdeclengthB = new TH1F(namedistr.Data(), "Decay Length distribution;Decay Length [cm]",200,0,0.6);
+    TH1F *hdeclengthB = new TH1F(namedistr.Data(), "Decay Length distribution;Decay Length [cm]",200,0,0.15);
 
     namedistr="hnormdeclS_";
     namedistr+=i;
-    TH1F *hnormdeclengthS = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;Decay Length/Err ",200,0,10.);
+    TH1F *hnormdeclengthS = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;Decay Length/Err ",200,0,6.);
 
     namedistr="hnormdeclB_";
     namedistr+=i;
-    TH1F *hnormdeclengthB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;Decay Length/Err ",200,0,10.);
+    TH1F *hnormdeclengthB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;Decay Length/Err ",200,0,6.);
 
    //  costhetapoint
     namedistr="hcosthetapointS_";
@@ -327,6 +307,10 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     namedistr+=i;
     TH1F *hcosthetapointB = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
 
+    namedistr="hcosthetapointmoresB_";
+    namedistr+=i;
+    TH1F *hcosthetapointmoresB = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
+
    //  costhetapoint vs d0 or d0d0
     namedistr="hcosthpointd0S_";
     namedistr+=i;
@@ -347,11 +331,6 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     fDistr->Add(hptKS);
     fDistr->Add(hptB);
 
-    fDistr->Add(hptpiSnoMcut);
-    fDistr->Add(hptKSnoMcut);
-    fDistr->Add(hptB1pnoMcut);
-    fDistr->Add(hptB2pnoMcut);
-
     fDistr->Add(hdcaS);
     fDistr->Add(hdcaB);
 
@@ -360,24 +339,18 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     fDistr->Add(hd0B);
     fDistr->Add(hd0p0B);
     fDistr->Add(hd0p1B);
-
-    fDistr->Add(hd0vpiS);
-    fDistr->Add(hd0vKS);
-    fDistr->Add(hd0vB);
-    fDistr->Add(hd0vp0B);
-    fDistr->Add(hd0vp1B);
+    fDistr->Add(hd0moresB);
 
     fDistr->Add(hd0d0S);
     fDistr->Add(hd0d0B);
-
-    fDistr->Add(hd0d0vS);
-    fDistr->Add(hd0d0vB);
+    fDistr->Add(hd0d0moresB);
 
     fDistr->Add(hcosthetastarS);
     fDistr->Add(hcosthetastarB);
 
     fDistr->Add(hcosthetapointS);
     fDistr->Add(hcosthetapointB);
+    fDistr->Add(hcosthetapointmoresB);
 
     fDistr->Add(hdeclengthS);
     fDistr->Add(hdeclengthB);
@@ -391,41 +364,116 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     fDistr->Add(hcosthpointd0d0S);
     fDistr->Add(hcosthpointd0d0B);
 
+    //histograms filled only when the secondary vertex is recalculated w/o the daughter tracks (as requested in the cut object)
+
+    if(fCuts->GetIsPrimaryWithoutDaughters()){
+      namedistr="hd0vmoresB_";
+      namedistr+=i;
+      TH1F *hd0vmoresB = new TH1F(namedistr.Data(), "Impact parameter distribution (both);d0 [cm]",200,-0.1,0.1);
+
+      namedistr="hd0d0vmoresB_";
+      namedistr+=i;
+      TH1F *hd0d0vmoresB = new TH1F(namedistr.Data(), "Impact parameter distribution (prong +);d0 [cm]",200,-0.001,0.001);
+
+
+      namedistr="hd0vpiS_";
+      namedistr+=i;
+      TH1F *hd0vpiS = new TH1F(namedistr.Data(), "Impact parameter distribution (pions)(vtx w/o these tracks);d0(#pi) [cm]",200,-0.1,0.1);
+
+      namedistr="hd0vKS_";
+      namedistr+=i;
+      TH1F *hd0vKS = new TH1F(namedistr.Data(), "Impact parameter distribution (kaons) (vtx w/o these tracks);d0(K) [cm]",200,-0.1,0.1);
+      namedistr="hd0vB_";
+      namedistr+=i;
+      TH1F *hd0vB = new TH1F(namedistr.Data(), "Impact parameter distribution (vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
+
+      namedistr="hd0vp0B_";
+      namedistr+=i;
+      TH1F *hd0vp0B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong + ** vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
+
+      namedistr="hd0vp1B_";
+      namedistr+=i;
+      TH1F *hd0vp1B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong - ** vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
+
+
+      namedistr="hd0d0vS_";
+      namedistr+=i;
+      TH1F *hd0d0vS = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution (vtx w/o these tracks);d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
+      namedistr="hd0d0vB_";
+      namedistr+=i;
+      TH1F *hd0d0vB = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution (vtx w/o these tracks);d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
+
+      namedistr="hdeclvS_";
+      namedistr+=i;
+      TH1F *hdeclengthvS = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
+
+      namedistr="hdeclvB_";
+      namedistr+=i;
+      TH1F *hdeclengthvB = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
+
+      namedistr="hnormdeclvS_";
+      namedistr+=i;
+      TH1F *hnormdeclengthvS = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
+
+      namedistr="hnormdeclvB_";
+      namedistr+=i;
+      TH1F *hnormdeclengthvB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
+
+
+      fDistr->Add(hd0vpiS);
+      fDistr->Add(hd0vKS);
+      fDistr->Add(hd0vB);
+      fDistr->Add(hd0vp0B);
+      fDistr->Add(hd0vp1B);
+      fDistr->Add(hd0vmoresB);
+
+      fDistr->Add(hd0d0vS);
+      fDistr->Add(hd0d0vB);
+      fDistr->Add(hd0d0vmoresB);
+
+      fDistr->Add(hdeclengthvS);
+      fDistr->Add(hdeclengthvB);
+
+      fDistr->Add(hnormdeclengthvS);
+      fDistr->Add(hnormdeclengthvB);
+    }
 
     //histograms of invariant mass distributions
 
-    TH1F* tmpMt = new TH1F(nameMass.Data(),"D^{0} invariant mass; M [GeV]; Entries",200,1.765,1.965);
+    TH1F* tmpMt = new TH1F(nameMass.Data(),"D^{0} invariant mass; M [GeV]; Entries",200,1.5648,2.1648);
     TH1F *tmpMl=(TH1F*)tmpMt->Clone();
     tmpMt->Sumw2();
     tmpMl->Sumw2();
 
     //to compare with AliAnalysisTaskCharmFraction
-    TH1F* tmpS27t = new TH1F(nameSgn27.Data(),"D^{0} invariant mass in M(D^{0}) +/- 27 MeV - MC; M [GeV]; Entries",200,1.765,1.965);
-    TH1F *tmpS27l=(TH1F*)tmpS27t->Clone();
-    tmpS27t->Sumw2();
-    tmpS27l->Sumw2();
+    // TH1F* tmpS27t = new TH1F(nameSgn27.Data(),"D^{0} invariant mass in M(D^{0}) +/- 27 MeV - MC; M [GeV]; Entries",200,1.5648,2.1648);
+    // TH1F *tmpS27l=(TH1F*)tmpS27t->Clone();
+    // tmpS27t->Sumw2();
+    // tmpS27l->Sumw2();
  
     //distribution w/o cuts
     //   TH1F* tmpMS = new TH1F(nameMassNocutsS.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,0.7,3.);
-    TH1F* tmpMS = new TH1F(nameMassNocutsS.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,1.56484,2.16484); //range (MD0-300MeV, mD0 + 300MeV)
+    TH1F* tmpMS = new TH1F(nameMassNocutsS.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,1.5648,2.1648); //range (MD0-300MeV, mD0 + 300MeV)
     TH1F *tmpMB=(TH1F*)tmpMS->Clone();
     tmpMB->SetName(nameMassNocutsB.Data());
     tmpMS->Sumw2();
     tmpMB->Sumw2();
 
     //MC signal and background
-    TH1F* tmpSt = new TH1F(nameSgn.Data(), "D^{0} invariant mass - MC; M [GeV]; Entries",200,1.765,1.965);
+    TH1F* tmpSt = new TH1F(nameSgn.Data(), "D^{0} invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
     TH1F *tmpSl=(TH1F*)tmpSt->Clone();
     tmpSt->Sumw2();
     tmpSl->Sumw2();
 
-    TH1F* tmpBt = new TH1F(nameBkg.Data(), "Background invariant mass - MC; M [GeV]; Entries",200,1.765,1.965);
+    TH1F* tmpBt = new TH1F(nameBkg.Data(), "Background invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
     TH1F *tmpBl=(TH1F*)tmpBt->Clone();
     tmpBt->Sumw2();
     tmpBl->Sumw2();
 
     //Reflection: histo filled with D0Mass which pass the cut (also) as D0bar and with D0bar which pass (also) the cut as D0
-    TH1F* tmpRt = new TH1F(nameRfl.Data(), "Reflected signal invariant mass - MC; M [GeV]; Entries",200,1.765,1.965);
+    TH1F* tmpRt = new TH1F(nameRfl.Data(), "Reflected signal invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
     TH1F *tmpRl=(TH1F*)tmpRt->Clone();
     tmpRt->Sumw2();
     tmpRl->Sumw2();
@@ -433,7 +481,7 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
 
     fOutputMass->Add(tmpMt);
     fOutputMass->Add(tmpSt);
-    fOutputMass->Add(tmpS27t);
+    //    fOutputMass->Add(tmpS27t);
     fOutputMass->Add(tmpBt);
     fOutputMass->Add(tmpRt);
 
@@ -443,54 +491,42 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
 
   }
 
-  //histograms for vertex checking and TOF checking
-  TString checkname="hptGoodTr";
-
-  TH1F* hptGoodTr=new TH1F(checkname.Data(),"Pt distribution of 'good' tracks;p_{t}[GeV];Number",200,0.,8.);
-  hptGoodTr->SetTitleOffset(1.3,"Y");
-  checkname="hdistrGoodTr";
-
-  TH1F* hdistrGoodTr=new TH1F(checkname.Data(),"Distribution of number of good tracks per event;no.good-tracks/ev;Entries",31,0,31);
-  hdistrGoodTr->SetTitleOffset(1.3,"Y");
-
-  checkname="hTOFsig";
-  TH1F* hTOFsig=new TH1F(checkname.Data(),"Distribution of TOF signal;TOF time [ps];Entries", 100, -2.e3,40.e3);
-
-  checkname="hTOFtimeKaonHyptime";
-  TH2F* hTOFtimeKaonHyptime=new TH2F(checkname.Data(),"TOFtime - timeHypothesisForKaon;p_{t}[GeV/c];TOFtime - timeHypothesisForKaon [ps]",200,0.,4.,1000,-20000.,20000.);
- checkname="hTOFtime";
-  TH1F* hTOFtime=new TH1F(checkname.Data(),"Distribution of TOF time Kaon;TOF time(Kaon) [ps];Entries", 1000, 0.,50000.);
-  
-
-  fChecks->Add(hptGoodTr);
-  fChecks->Add(hdistrGoodTr);
-  fChecks->Add(hTOFsig);
-  fChecks->Add(hTOFtimeKaonHyptime);
-  fChecks->Add(hTOFtime);
+  if(fArray==1){
+    namedistr="hpospair";
+    TH1F* hpospair=new TH1F(namedistr.Data(),"Number of positive pairs",2*fCuts->GetNPtBins(),-0.5,fCuts->GetNPtBins()-0.5);
+    namedistr="hnegpair";
+    TH1F* hnegpair=new TH1F(namedistr.Data(),"Number of negative pairs",fCuts->GetNPtBins(),-0.5,2*fCuts->GetNPtBins()-0.5);
+    fDistr->Add(hpospair);
+    fDistr->Add(hnegpair);
+  }
 
   const char* nameoutput=GetOutputSlot(3)->GetContainer()->GetName();
 
-  fNentries=new TH1F(nameoutput, "Integral(1,2) = number of AODs *** Integral(2,3) = number of candidates selected with cuts *** Integral(3,4) = number of D0 selected with cuts *** Integral(4,5) = events with good vertex ***  Integral(5,6) = pt out of bounds", 8,0.,8.);
+  fNentries=new TH1F(nameoutput, "Integral(1,2) = number of AODs *** Integral(2,3) = number of candidates selected with cuts *** Integral(3,4) = number of D0 selected with cuts *** Integral(4,5) = events with good vertex ***  Integral(5,6) = pt out of bounds", 14,-0.5,13.5);
 
   fNentries->GetXaxis()->SetBinLabel(1,"nEventsAnal");
   fNentries->GetXaxis()->SetBinLabel(2,"nCandSel(Cuts)");
   fNentries->GetXaxis()->SetBinLabel(3,"nD0Selected");
-  fNentries->GetXaxis()->SetBinLabel(4,"nEventsGoodVtx");
-  fNentries->GetXaxis()->SetBinLabel(5,"nEventsGoodVtx+>2tracks");
-  fNentries->GetXaxis()->SetBinLabel(6,"ptbin = -1");
-  fNentries->GetXaxis()->SetBinLabel(7,"no daughter");
-  fNentries->GetXaxis()->SetBinLabel(8,"nCandSel(Tr)");
-
+  fNentries->GetXaxis()->SetBinLabel(4,"nEventsGoodVtxS");
+  fNentries->GetXaxis()->SetBinLabel(5,"ptbin = -1");
+  fNentries->GetXaxis()->SetBinLabel(6,"no daughter");
+  fNentries->GetXaxis()->SetBinLabel(7,"nCandSel(Tr)");
+  fNentries->GetXaxis()->SetBinLabel(8,"PID=0");
+  fNentries->GetXaxis()->SetBinLabel(9,"PID=1");
+  fNentries->GetXaxis()->SetBinLabel(10,"PID=2");
+  fNentries->GetXaxis()->SetBinLabel(11,"PID=3");
+  fNentries->GetXaxis()->SetBinLabel(12,"K");
+  fNentries->GetXaxis()->SetBinLabel(13,"Lambda");
+  fNentries->GetXaxis()->SetBinLabel(14,"Pile-up Rej");
   fNentries->GetXaxis()->SetNdivisions(1,kFALSE);
 
+  fCounter = new AliNormalizationCounter(Form("%s",GetOutputSlot(5)->GetContainer()->GetName()));
+
   // Post the data
   PostData(1,fOutputMass);
   PostData(2,fDistr);
   PostData(3,fNentries);
-  PostData(4,fChecks);
-  
+  PostData(5,fCounter);  
   return;
 }
 
@@ -553,7 +589,11 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
     return;
   }
   
-  
+  // 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) return;
+
+
   TClonesArray *mcArray = 0;
   AliAODMCHeader *mcHeader = 0;
 
@@ -577,8 +617,12 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   
   //histogram filled with 1 for every AOD
   fNentries->Fill(0);
-    
-
+  fCounter->StoreEvent(aod,fReadMC);   
+  if(!fCuts->IsEventSelected(aod)) {
+    if(fCuts->GetWhyRejection()==1) // rejected for pileup
+      fNentries->Fill(13);
+    return;
+  }
   
   // AOD primary vertex
   AliAODVertex *vtx1 = (AliAODVertex*)aod->GetPrimaryVertex();
@@ -592,67 +636,13 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
     fNentries->Fill(3);
   }
 
-  //cout<<"Start checks"<<endl;
-  Int_t ntracks=0,isGoodTrack=0;
-
-  if(aod) ntracks=aod->GetNTracks();
-
-  //cout<<"ntracks = "<<ntracks<<endl;
-  //loop on tracks in the event
-  for (Int_t k=0;k<ntracks;k++){
-    AliAODTrack* track=aod->GetTrack(k);
-
-    //check TOF
-
-    if(!(track->GetStatus()&AliESDtrack::kTPCrefit &&
-        track->GetStatus()&AliESDtrack::kITSrefit && 
-        track->GetTPCNcls() >=70 &&
-        track->GetStatus()&AliESDtrack::kTOFpid && 
-        track->GetStatus()&AliESDtrack::kTOFout &&
-        track->GetStatus()&AliESDtrack::kTIME)) continue;
-    AliAODPid *pid = track->GetDetPid();
-    if(!pid)  {cout<<"No AliAODPid found"<<endl; continue;}
-
-    Double_t times[5];
-    pid->GetIntegratedTimes(times);
-
-    ((TH1F*)fChecks->FindObject("hTOFtime"))->Fill(times[3]);
-    ((TH1F*)fChecks->FindObject("hTOFtimeKaonHyptime"))->Fill(track->P(),pid->GetTOFsignal()-times[3]); //3 is kaon
-
-    ((TH1F*)fChecks->FindObject("hTOFsig"))->Fill(pid->GetTOFsignal());
-    if (pid->GetTOFsignal()< 0) ((TH1F*)fChecks->FindObject("hTOFsig"))->Fill(-1);
-
-
-    //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++;
-      }
-    }
-    
-    if (track->Pt()>0.3 &&
-       track->GetStatus()&AliESDtrack::kTPCrefit &&
-       track->GetStatus()&AliESDtrack::kITSrefit &&
-       nclsTot>3 &&
-       nclsSPD>0) {//fill hist good tracks
-      //cout<<"in if"<<endl;
-      ((TH1F*)fChecks->FindObject("hptGoodTr"))->Fill(track->Pt());
-      isGoodTrack++;
-    }
-    //cout<<"isGoodTrack = "<<isGoodTrack<<endl;
-    ((TH1F*)fChecks->FindObject("hdistrGoodTr"))->Fill(isGoodTrack);
-  }
-  //number of events with good vertex and at least 2 good tracks
-  if (isGoodTrack>=2 && isGoodVtx) fNentries->Fill(4);
-
-
   // loop over candidates
   Int_t nInD0toKpi = inputArray->GetEntriesFast();
   if(fDebug>2) printf("Number of D0->Kpi: %d\n",nInD0toKpi);
 
+  // FILE *f=fopen("4display.txt","a");
+  // fprintf(f,"Number of D0->Kpi: %d\n",nInD0toKpi);
+  Int_t nSelectedloose=0,nSelectedtight=0;  
   for (Int_t iD0toKpi = 0; iD0toKpi < nInD0toKpi; iD0toKpi++) {
     //Int_t nPosPairs=0, nNegPairs=0;
     //cout<<"inside the loop"<<endl;
@@ -661,15 +651,15 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
     //check daughters
     if(!(d->GetDaughter(0) || d->GetDaughter(1))) {
       AliDebug(1,"at least one daughter not found!");
-      fNentries->Fill(6);
-      return;
+      fNentries->Fill(5);
+      continue;
     }
 
-    Bool_t unsetvtx=kFALSE;
-    if(!d->GetOwnPrimaryVtx()) {
-      d->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
-      unsetvtx=kTRUE;
-    }
+    // Bool_t unsetvtx=kFALSE;
+    // if(!d->GetOwnPrimaryVtx()) {
+    //   d->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
+    //   unsetvtx=kTRUE;
+    // }
   
     
     //check reco daughter in acceptance
@@ -680,26 +670,29 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
     if ( fCuts->IsInFiducialAcceptance(d->Pt(),d->Y(421)) ) {
       //if( TMath::Abs(eta0)<0.9 && TMath::Abs(eta1)<0.9 ){
        //apply cuts on tracks
+      nSelectedloose++;
       Int_t isSelected = fCuts->IsSelected(d,AliRDHFCuts::kTracks);
-      if(((AliAODTrack*)d->GetDaughter(0))->GetTPCNcls() < 70 || ((AliAODTrack*)d->GetDaughter(0))->GetTPCNcls() < 70) isSelected=kFALSE;
-      if (!isSelected) return;
-      fNentries->Fill(7);       
+      if(((AliAODTrack*)d->GetDaughter(0))->GetTPCNcls() < 70 || ((AliAODTrack*)d->GetDaughter(1))->GetTPCNcls() < 70) isSelected=kFALSE;
+      if (!isSelected) continue;
+      nSelectedtight++;
+      fNentries->Fill(6);       
       if(fDebug>2) cout<<"tracks selected"<<endl;
 
+      Int_t ptbin=fCuts->PtBin(d->Pt());
+      if(ptbin==-1) {fNentries->Fill(4); continue;} //out of bounds
       FillVarHists(aod,d,mcArray,fCuts,fDistr);
-      FillMassHists(d,mcArray,fCuts,fOutputMass);
+      FillMassHists(aod,d,mcArray,fCuts,fOutputMass);
     }
   
-    if(unsetvtx) d->UnsetOwnPrimaryVtx();
+    //if(unsetvtx) d->UnsetOwnPrimaryVtx();
   } //end for prongs
-
-
+  fCounter->StoreCandidates(aod,nSelectedloose,kTRUE);  
+  fCounter->StoreCandidates(aod,nSelectedtight,kFALSE);  
   // Post the data
   PostData(1,fOutputMass);
   PostData(2,fDistr);
   PostData(3,fNentries);
-  PostData(4,fChecks);
-
+  PostData(5,fCounter);
   return;
 }
 
@@ -725,11 +718,19 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
   Int_t lab=-9999;
   if(fReadMC) lab=part->MatchToMC(421,arrMC,2,pdgDgD0toKpi); //return MC particle label if the array corresponds to a D0, -1 if not (cf. AliAODRecoDecay.cxx)
   //Double_t pt = d->Pt(); //mother pt
-  Bool_t isSelected=kFALSE;
+  Int_t isSelected=3;
+  Int_t isSelectedPID=99;
 
+  //isSelectedPID = cuts->IsSelected(part,AliRDHFCuts::kPID); //0 rejected,1 D0,2 Dobar, 3 both
+  isSelectedPID = cuts->IsSelectedPID(part); //0 rejected,1 D0,2 Dobar, 3 both
+  if (isSelectedPID==0)fNentries->Fill(7);
+  if (isSelectedPID==1)fNentries->Fill(8);
+  if (isSelectedPID==2)fNentries->Fill(9);
+  if (isSelectedPID==3)fNentries->Fill(10);
+    //fNentries->Fill(8+isSelectedPID);
 
   if(fCutOnDistr){
-    isSelected = cuts->IsSelected(part,AliRDHFCuts::kCandidate);
+    isSelected = cuts->IsSelected(part,AliRDHFCuts::kCandidate,aod); //cuts with variables recalculated with new vertex (w/o daughters)
     if (!isSelected){
       //cout<<"Not Selected"<<endl;
       return;
@@ -741,31 +742,48 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
   TString fillthispi="",fillthisK="",fillthis="";
 
   Int_t ptbin=cuts->PtBin(part->Pt());
-  if(ptbin==-1) {fNentries->Fill(5); return;} //out of bounds
 
-  //recalculate vertex
-  AliAODVertex *vtxProp=0x0;
-  vtxProp=GetPrimaryVtxSkipped(aod,part);
   Double_t dz1[2],dz2[2],covar1[3],covar2[3];//,d0xd0proper,errd0xd0proper;
   dz1[0]=-99; dz2[0]=-99;
-  if(vtxProp) {
-    part->SetOwnPrimaryVtx(vtxProp);
-    //Bool_t unsetvtx=kTRUE;
-    //Calculate d0 for daughter tracks with Vtx Skipped
-    AliESDtrack *esdtrack1=new AliESDtrack((AliVTrack*)part->GetDaughter(0));
-    AliESDtrack *esdtrack2=new AliESDtrack((AliVTrack*)part->GetDaughter(1));
-    esdtrack1->PropagateToDCA(vtxProp,aod->GetMagneticField(),1.,dz1,covar1);
-    esdtrack2->PropagateToDCA(vtxProp,aod->GetMagneticField(),1.,dz2,covar2);
-    delete esdtrack1;
-    delete esdtrack2;
+  Double_t d0[2];
+  Double_t decl[2]={-99,-99};
+  Bool_t recalcvtx=kFALSE;
+
+  if(fCuts->GetIsPrimaryWithoutDaughters()){
+    recalcvtx=kTRUE;
+    //recalculate vertex
+    AliAODVertex *vtxProp=0x0;
+    vtxProp=GetPrimaryVtxSkipped(aod,part);
+    if(vtxProp) {
+      part->SetOwnPrimaryVtx(vtxProp);
+      //Bool_t unsetvtx=kTRUE;
+      //Calculate d0 for daughter tracks with Vtx Skipped
+      AliESDtrack *esdtrack1=new AliESDtrack((AliVTrack*)part->GetDaughter(0));
+      AliESDtrack *esdtrack2=new AliESDtrack((AliVTrack*)part->GetDaughter(1));
+      esdtrack1->PropagateToDCA(vtxProp,aod->GetMagneticField(),1.,dz1,covar1);
+      esdtrack2->PropagateToDCA(vtxProp,aod->GetMagneticField(),1.,dz2,covar2);
+      delete vtxProp; vtxProp=NULL;
+      delete esdtrack1;
+      delete esdtrack2;
+    }
+
+    d0[0]=dz1[0];
+    d0[1]=dz2[0];
+
+    decl[0]=part->DecayLength();
+    decl[1]=part->NormalizedDecayLength();
+    part->UnsetOwnPrimaryVtx();
+  
   }
 
-  Double_t d0[2]={dz1[0],dz2[0]};
 
   if(!fCutOnDistr || (fCutOnDistr && isSelected)){ //if no cuts or cuts passed 
     //printf("\nif no cuts or cuts passed\n");
-    if(lab>=0 && fReadMC){ //signal
 
+    //disable the PID
+    if(!fUsePid4Distr) isSelectedPID=0;
+    if((lab>=0 && fReadMC) || (!fReadMC && isSelectedPID)){ //signal (from MC or PID)
+   
       //check pdg of the prongs
       AliAODTrack *prong0=(AliAODTrack*)part->GetDaughter(0);
       AliAODTrack *prong1=(AliAODTrack*)part->GetDaughter(1);
@@ -773,42 +791,51 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
        return;
       }
       Int_t labprong[2];
-      labprong[0]=prong0->GetLabel();
-      labprong[1]=prong1->GetLabel();
+      if(fReadMC){
+       labprong[0]=prong0->GetLabel();
+       labprong[1]=prong1->GetLabel();
+      }
       AliAODMCParticle *mcprong=0;
       Int_t pdgProng[2]={0,0};
-      
+
       for (Int_t iprong=0;iprong<2;iprong++){
-       if(labprong[iprong]>=0)  mcprong= (AliAODMCParticle*)arrMC->At(labprong[iprong]);
-       pdgProng[iprong]=mcprong->GetPdgCode();
+       if(fReadMC && labprong[iprong]>=0) {
+         mcprong= (AliAODMCParticle*)arrMC->At(labprong[iprong]);
+         pdgProng[iprong]=mcprong->GetPdgCode();
+       }
       }
+    
 
       //no mass cut ditributions: ptbis
        
-      fillthispi="hptpiSnoMcut_";
-      fillthispi+=ptbin;
-
-      fillthisK="hptKSnoMcut_";
-      fillthisK+=ptbin;
-
-      if (TMath::Abs(pdgProng[0]) == 211 && TMath::Abs(pdgProng[1]) == 321){
-       ((TH1F*)listout->FindObject(fillthispi))->Fill(part->PtProng(0));
-       ((TH1F*)listout->FindObject(fillthisK))->Fill(part->PtProng(1));
-      }else {
-       if (TMath::Abs(pdgProng[0]) == 321 && TMath::Abs(pdgProng[1]) == 211){
-         ((TH1F*)listout->FindObject(fillthisK))->Fill(part->PtProng(0));
-         ((TH1F*)listout->FindObject(fillthispi))->Fill(part->PtProng(1));
-       }
-      }
+      // fillthispi="hptpiSnoMcut_";
+      // fillthispi+=ptbin;
+
+      // fillthisK="hptKSnoMcut_";
+      // fillthisK+=ptbin;
+
+      // if ((TMath::Abs(pdgProng[0]) == 211 && TMath::Abs(pdgProng[1]) == 321)
+      //     || (isSelectedPID==1 || isSelectedPID==3)){
+      //       ((TH1F*)listout->FindObject(fillthispi))->Fill(part->PtProng(0));
+      //       ((TH1F*)listout->FindObject(fillthisK))->Fill(part->PtProng(1));
+      // }
+
+      // if ((TMath::Abs(pdgProng[0]) == 321 && TMath::Abs(pdgProng[1]) == 211)
+      //     || (isSelectedPID==2 || isSelectedPID==3)){
+      //       ((TH1F*)listout->FindObject(fillthisK))->Fill(part->PtProng(0));
+      //       ((TH1F*)listout->FindObject(fillthispi))->Fill(part->PtProng(1));
+      // }
       
       //no mass cut ditributions: mass
       fillthis="hMassS_";
       fillthis+=ptbin;
       
-      if (((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421){//D0
+      if ((fReadMC && ((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421)
+         || (!fReadMC && (isSelectedPID==1 || isSelectedPID==3))){//D0
        ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0);
       }
       else { //D0bar
+       if(fReadMC || (!fReadMC && isSelectedPID > 1))
        ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0bar);
       }
 
@@ -818,13 +845,18 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
        if(fArray==1) cout<<"LS signal: ERROR"<<endl;
        for (Int_t iprong=0; iprong<2; iprong++){
          AliAODTrack *prong=(AliAODTrack*)part->GetDaughter(iprong);
-         labprong[iprong]=prong->GetLabel();
+         if (fReadMC) labprong[iprong]=prong->GetLabel();
          
          //cout<<"prong name = "<<prong->GetName()<<" label = "<<prong->GetLabel()<<endl;
-         if(labprong[iprong]>=0)  mcprong= (AliAODMCParticle*)arrMC->At(labprong[iprong]);
-         Int_t pdgprong=mcprong->GetPdgCode();
-         
-         if(TMath::Abs(pdgprong)==211) {
+         Int_t pdgprong=0;
+         if(fReadMC && labprong[iprong]>=0) {
+           mcprong= (AliAODMCParticle*)arrMC->At(labprong[iprong]);
+           pdgprong=mcprong->GetPdgCode();
+         }
+
+         Bool_t isPionHere[2]={(isSelectedPID==1 || isSelectedPID==3) ? kTRUE : kFALSE,(isSelectedPID==2 || isSelectedPID==3) ? kTRUE : kFALSE};
+
+         if(TMath::Abs(pdgprong)==211 || isPionHere[iprong]) {
            //cout<<"pi"<<endl;
            
            fillthispi="hptpiS_";
@@ -833,7 +865,7 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
            fillthispi="hd0piS_";
            fillthispi+=ptbin;
            ((TH1F*)listout->FindObject(fillthispi))->Fill(part->Getd0Prong(iprong));
-           if(d0[iprong] != -99) {
+           if(recalcvtx) {
 
              fillthispi="hd0vpiS_";
              fillthispi+=ptbin;
@@ -842,7 +874,7 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
 
          }
          
-         if(TMath::Abs(pdgprong)==321) {
+         if(TMath::Abs(pdgprong)==321 || !isPionHere[iprong]) {
            //cout<<"kappa"<<endl;
            
            fillthisK="hptKS_";
@@ -851,7 +883,7 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
            fillthisK="hd0KS_";
            fillthisK+=ptbin;
            ((TH1F*)listout->FindObject(fillthisK))->Fill(part->Getd0Prong(iprong));
-           if (d0[iprong] != -99){
+           if (recalcvtx){
              fillthisK="hd0vKS_";
              fillthisK+=ptbin;
              ((TH1F*)listout->FindObject(fillthisK))->Fill(d0[iprong]);
@@ -878,14 +910,16 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
          
        fillthis="hcosthetastarS_";
        fillthis+=ptbin;
-       if (((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421)((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0());
-       else ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0bar());
-
+       if ((fReadMC && ((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421)) ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0());
+       else {
+         if (fReadMC || isSelectedPID>1)((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0bar());
+         if(isSelectedPID==1 || isSelectedPID==3)((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0());
+       }
        fillthis="hd0d0S_";
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
 
-       if(d0[0] != -99 && d0[1] != -99 ){
+       if(recalcvtx){
          fillthis="hd0d0vS_";
          fillthis+=ptbin;
          ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
@@ -898,10 +932,20 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
        fillthis="hnormdeclS_";
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->NormalizedDecayLength());
+
+       if(recalcvtx) {
+         fillthis="hdeclvS_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
+
+         fillthis="hnormdeclvS_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+       }
       } //end mass cut
     
     } else{ //Background or LS
+      //if(!fReadMC){
       //cout<<"is background"<<endl;
      
       //no mass cut distributions: mass, ptbis
@@ -911,27 +955,35 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
       if (!fCutOnDistr || (fCutOnDistr && (isSelected==1 || isSelected==3))) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0);
       if (!fCutOnDistr || (fCutOnDistr && isSelected>1)) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0bar);
 
-      fillthis="hptB1prongnoMcut_";
-      fillthis+=ptbin;
+      // fillthis="hptB1prongnoMcut_";
+      // fillthis+=ptbin;
       
-      ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(0));
+      // ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(0));
       
-      fillthis="hptB2prongsnoMcut_";
-      fillthis+=ptbin;
-      ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(0));
-      ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(1));
+      // fillthis="hptB2prongsnoMcut_";
+      // fillthis+=ptbin;
+      // ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(0));
+      // ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(1));
 
       //apply cut on invariant mass on the pair
       if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
 
 
-       AliAODTrack *prong=(AliAODTrack*)part->GetDaughter(0);
-       if(!prong) {
+       AliAODTrack *prongg=(AliAODTrack*)part->GetDaughter(0);
+       if(!prongg) {
          if(fDebug>2) cout<<"No daughter found";
          return;
        }
        else{
-         if(prong->Charge()==1) {fTotPosPairs[ptbin]++;} else {fTotNegPairs[ptbin]++;}
+         if(fArray==1){
+           if(prongg->Charge()==1) {
+             //fTotPosPairs[ptbin]++;
+             ((TH1F*)fDistr->FindObject("hpospair"))->Fill(ptbin);
+           } else {
+             //fTotNegPairs[ptbin]++;
+             ((TH1F*)fDistr->FindObject("hnegpair"))->Fill(ptbin);
+           }
+         }
        }
        
        //normalise pt distr to half afterwards
@@ -946,13 +998,82 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
        fillthis="hd0p1B_";
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(1));
-
-       fillthis="hd0vp0B_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]);
-       fillthis="hd0vp1B_";
+       fillthis="hd0B_";
        fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(d0[1]);
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(0));
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(1));
+
+       if(fReadMC){
+         Int_t pdgMother[2]={0,0};
+         Double_t factor[2]={1,1};
+
+         for(Int_t iprong=0;iprong<2;iprong++){
+           AliAODTrack *prong=(AliAODTrack*)part->GetDaughter(iprong);
+           lab=prong->GetLabel();
+           if(lab>=0){
+             AliAODMCParticle* mcprong=(AliAODMCParticle*)arrMC->At(lab);
+             if(mcprong){
+               Int_t labmom=mcprong->GetMother();
+               if(labmom>=0){
+                 AliAODMCParticle* mcmother=(AliAODMCParticle*)arrMC->At(labmom);
+                 if(mcmother) pdgMother[iprong]=mcmother->GetPdgCode();
+               }
+             }
+           }
+
+           fillthis="hd0moresB_";
+           fillthis+=ptbin;
+         
+           if(TMath::Abs(pdgMother[iprong])==310 || TMath::Abs(pdgMother[iprong])==130 || TMath::Abs(pdgMother[iprong])==321){ //K^0_S, K^0_L, K^+-
+             if(part->PtProng(iprong)<=1)factor[iprong]=1./.7;
+             else factor[iprong]=1./.6;
+             fNentries->Fill(11);
+           }
+           
+           if(TMath::Abs(pdgMother[iprong])==3122) { //Lambda
+             factor[iprong]=1./0.25;
+             fNentries->Fill(12);
+           }
+           fillthis="hd0moresB_";
+           fillthis+=ptbin;
+
+           ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(iprong),factor[iprong]);
+
+           if(recalcvtx){
+             fillthis="hd0vmoresB_";
+             fillthis+=ptbin;
+             ((TH1F*)listout->FindObject(fillthis))->Fill(d0[iprong],factor[iprong]);
+           }
+
+         }
+
+         fillthis="hd0d0moresB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0(),factor[0]*factor[1]);
+
+         if(recalcvtx){
+           fillthis="hd0d0vmoresB_";
+           fillthis+=ptbin;
+           ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1],factor[0]*factor[1]);
+         }
+         fillthis="hcosthetapointmoresB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle(),factor[0]*factor[1]);
+       }
+
+       if(recalcvtx){
+         fillthis="hd0vp0B_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]);
+         fillthis="hd0vp1B_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[1]);
+         
+         fillthis="hd0vB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]);
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[1]);
+       }  
 
        fillthis="hcosthpointd0B_";
        fillthis+=ptbin;          
@@ -973,6 +1094,12 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
 
+       if(recalcvtx){
+         fillthis="hd0d0vB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
+       }
+
        fillthis="hcosthetapointB_";
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle());
@@ -980,7 +1107,26 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
        fillthis="hcosthpointd0d0B_";
        fillthis+=ptbin;
        ((TH2F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle(),part->Prodd0d0());
-       
+
+       fillthis="hdeclB_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->DecayLength());
+
+       fillthis="hnormdeclB_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->NormalizedDecayLength());
+
+       if(recalcvtx) {
+
+         fillthis="hdeclvB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
+
+         fillthis="hnormdeclvB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+
+       }
       }//mass cut      
     }//else (background)
   }
@@ -988,24 +1134,27 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
 }
 //____________________________________________________________________________
 
-void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliRDHFCutsD0toKpi* cuts, TList *listout){
+void AliAnalysisTaskSED0Mass::FillMassHists(AliAODEvent* aod,AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliRDHFCutsD0toKpi* cuts, TList *listout){
   //
   // function used in UserExec to fill mass histograms:
   //
 
 
-  Double_t mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
+  //  Double_t mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
+
+  Int_t isSelected=cuts->IsSelected(part,AliRDHFCuts::kCandidate,aod); //selected
 
-  Int_t isSelected=cuts->IsSelected(part,AliRDHFCuts::kCandidate); //selected
   //cout<<"is selected = "<<isSelected<<endl;
 
   //cout<<"check cuts = "<<endl;
   //cuts->PrintAll();
   if (!isSelected){
     //cout<<"Not Selected"<<endl;
+    //cout<<"Rejected because "<<cuts->GetWhy()<<endl;
     return;
   }
 
+
   if(fDebug>2)  cout<<"Candidate selected"<<endl;
 
   Double_t invmassD0 = part->InvMassD0(), invmassD0bar = part->InvMassD0bar();
@@ -1018,9 +1167,26 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
     return;
   }
   else{
-    if(prong->Charge()==1) {fTotPosPairs[ptbin]++;} else {fTotNegPairs[ptbin]++;}
+    // if(prong->Charge()==1) {
+    //   ((TH1F*)fDistr->FindObject("hpospair"))->Fill(fCuts->GetNPtBins()+ptbin);
+    //   //fTotPosPairs[ptbin]++;
+    // } else {
+    //   ((TH1F*)fDistr->FindObject("hnegpair"))->Fill(fCuts->GetNPtBins()+ptbin);
+    //   //fTotNegPairs[ptbin]++;
+    // }
   }
-
+  // for(Int_t it=0;it<2;it++){
+  //    //request on spd points to be addes
+  //   if(/*nSPD==2 && */part->Pt() > 5. && (TMath::Abs(invmassD0-mPDG)<0.01 || TMath::Abs(invmassD0bar-mPDG)<0.01)){
+  //     FILE *f=fopen("4display.txt","a");
+  //     fprintf(f,"pt: %f \n Rapidity: %f \t Period Number: %x \t Run Number: %d \t BunchCrossNumb: %d \t OrbitNumber: %d\n",part->Pt(),part->Y(421),aod->GetPeriodNumber(),aod->GetRunNumber(),aod->GetBunchCrossNumber(),aod->GetOrbitNumber());
+  //     fclose(f);
+  //     //printf("PrimVtx NContributors: %d \n Prongs Rel Angle: %f \n \n",ncont,relangle);
+  //   }
+  // }
   TString fillthis="";
   Int_t pdgDgD0toKpi[2]={321,211};
   Int_t labD0=-1;
@@ -1030,9 +1196,8 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
   fNentries->Fill(1);
   //count true D0 selected by cuts
   if (fReadMC && labD0>=0) fNentries->Fill(2);
-  //PostData(3,fNentries);
 
-  if (isSelected==1 || isSelected==3) { //D0
+  if ((isSelected==1 || isSelected==3) && fFillOnlyD0D0bar<2) { //D0
     fillthis="histMass_";
     fillthis+=ptbin;
     //cout<<"Filling "<<fillthis<<endl;
@@ -1051,11 +1216,11 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
        fillthis="histSgn_";
        fillthis+=ptbin;
        ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
-       if(TMath::Abs(invmassD0 - mPDG) < 0.027){
-         fillthis="histSgn27_";
-         fillthis+=ptbin;
-         ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
-       }
+       // if(TMath::Abs(invmassD0 - mPDG) < 0.027){
+       //   fillthis="histSgn27_";
+       //   fillthis+=ptbin;
+       //   ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
+       // }
       } else{ //it was a D0bar
        fillthis="histRfl_";
        fillthis+=ptbin;
@@ -1068,7 +1233,7 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
     }
       
   }
-  if (isSelected>1) { //D0bar
+  if (isSelected>1 && (fFillOnlyD0D0bar==0 || fFillOnlyD0D0bar==2)) { //D0bar
     fillthis="histMass_";
     fillthis+=ptbin;
     //printf("Fill mass with D0bar");
@@ -1083,11 +1248,11 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
        fillthis="histSgn_";
        fillthis+=ptbin;
        ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0bar);
-       if (TMath::Abs(invmassD0bar - mPDG) < 0.027){
-         fillthis="histSgn27_";
-         fillthis+=ptbin;
-         ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0bar);
-       }
+       // if (TMath::Abs(invmassD0bar - mPDG) < 0.027){
+       //   fillthis="histSgn27_";
+       //   fillthis+=ptbin;
+       //   ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0bar);
+       // }
 
          
       } else{
@@ -1109,10 +1274,6 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
 AliAODVertex* AliAnalysisTaskSED0Mass::GetPrimaryVtxSkipped(AliAODEvent *aodev,AliAODRecoDecayHF2Prong *d){
   //Calculate the primary vertex w/o the daughter tracks of the candidate
   
-  AliESDVertex *vertexESD=0x0;
-  AliAODVertex *vertexAOD=0x0;
-  AliVertexerTracks *vertexer = new AliVertexerTracks(aodev->GetMagneticField());
-  
   Int_t skipped[2];
   Int_t nTrksToSkip=2;
   AliAODTrack *dgTrack = (AliAODTrack*)d->GetDaughter(0);
@@ -1128,11 +1289,14 @@ AliAODVertex* AliAnalysisTaskSED0Mass::GetPrimaryVtxSkipped(AliAODEvent *aodev,A
   }
   skipped[1]=dgTrack->GetID();
 
+  AliESDVertex *vertexESD=0x0;
+  AliAODVertex *vertexAOD=0x0;
+  AliVertexerTracks *vertexer = new AliVertexerTracks(aodev->GetMagneticField());
+  
   //
   vertexer->SetSkipTracks(nTrksToSkip,skipped);
-  vertexESD = (AliESDVertex*)vertexer->FindPrimaryVertex(aodev); 
   vertexer->SetMinClusters(4);  
+  vertexESD = (AliESDVertex*)vertexer->FindPrimaryVertex(aodev); 
   if(!vertexESD) return vertexAOD;
   if(vertexESD->GetNContributors()<=0) { 
     AliDebug(2,"vertexing failed"); 
@@ -1181,23 +1345,21 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
     printf("ERROR: fNEntries not available\n");
     return;
   }
-
-  fChecks = dynamic_cast<TList*> (GetOutputData(4));
-  if (!fChecks) {
-    printf("ERROR: fChecks not available\n");
+  fCuts = dynamic_cast<AliRDHFCutsD0toKpi*>(GetOutputData(4));
+  if(!fCuts){
+    printf("ERROR: fCuts not available\n");
     return;
   }
-  
-  for(Int_t ipt=0;ipt<5;ipt++){ //change 5 in GetNPtBins when sure it is written and check
-
-    //sum d0p0 and d0p1
-    TString d0Bname=Form("hd0B_%d",ipt),d0p0Bname=Form("hd0p0B_%d",ipt),d0p1Bname=Form("hd0p1B_%d",ipt);
-    ((TH1F*)fDistr->FindObject(d0Bname))->Add( ((TH1F*)fDistr->FindObject(d0p0Bname)), ((TH1F*)fDistr->FindObject(d0p1Bname)) );
-  
+  fCounter = dynamic_cast<AliNormalizationCounter*>(GetOutputData(5));    
+  if (!fCounter) {
+    printf("ERROR: fCounter not available\n");
+    return;
+  }
+  Int_t nptbins=fCuts->GetNPtBins();
+  for(Int_t ipt=0;ipt<nptbins;ipt++){ 
 
     if(fArray==1){ 
-      fLsNormalization = 2.*TMath::Sqrt(fTotPosPairs[ipt]*fTotNegPairs[ipt]); 
+      fLsNormalization = 2.*TMath::Sqrt(((TH1F*)fDistr->FindObject("hpospair"))->Integral(nptbins+ipt+1,nptbins+ipt+2)*((TH1F*)fDistr->FindObject("hnegpair"))->Integral(nptbins+ipt+1,nptbins+ipt+2)); //after cuts
 
 
       if(fLsNormalization>1e-6) {
@@ -1209,7 +1371,8 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
       }
     
 
-      fLsNormalization = 2.*TMath::Sqrt(fTotPosPairs[4]*fTotNegPairs[4]);
+      fLsNormalization = 2.*TMath::Sqrt(((TH1F*)fDistr->FindObject("hpospair"))->Integral(ipt+1,ipt+2)*((TH1F*)fDistr->FindObject("hnegpair"))->Integral(ipt+1,ipt+2)); 
+      //fLsNormalization = 2.*TMath::Sqrt(fTotPosPairs[4]*fTotNegPairs[4]);
 
       if(fLsNormalization>1e-6) {