]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx
Dplus task used AliAODPidHF via AliRDHFCutsDplustoKpipi (Renu, Francesco)
[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisTaskSED0Mass.cxx
index 04f271a4b7504b0478e994eed5191cf50aea6096..b1bb03352256e205d1a66d7072fcb75dee8ed23e 100644 (file)
 #include <TH2F.h>
 #include <TDatabasePDG.h>
 
+#include <AliAnalysisDataSlot.h>
+#include <AliAnalysisDataContainer.h>
 #include "AliAnalysisManager.h"
 #include "AliESDtrack.h"
+#include "AliVertexerTracks.h"
 #include "AliAODHandler.h"
 #include "AliAODEvent.h"
 #include "AliAODVertex.h"
@@ -53,90 +56,89 @@ ClassImp(AliAnalysisTaskSED0Mass)
 //________________________________________________________________________
 AliAnalysisTaskSED0Mass::AliAnalysisTaskSED0Mass():
 AliAnalysisTaskSE(),
-fOutputPPR(0),
-fOutputmycuts(0),
-fNentries(0),
-fDistr(0), 
+fOutputMass(0),
+fDistr(0),
+fNentries(0), 
 fChecks(0),
-fVHFPPR(0),
-fVHFmycuts(0),
+fCuts(0),
 fArray(0),
 fReadMC(0),
 fCutOnDistr(0),
+fNPtBins(1),
+fTotPosPairs(0),
+fTotNegPairs(0),
 fLsNormalization(1.)
 
+
 {
   // Default constructor
-  for(Int_t i=0;i<5;i++) {fTotPosPairs[i]=0; fTotNegPairs[i]=0;}
 }
 
 //________________________________________________________________________
-AliAnalysisTaskSED0Mass::AliAnalysisTaskSED0Mass(const char *name):
+AliAnalysisTaskSED0Mass::AliAnalysisTaskSED0Mass(const char *name,AliRDHFCutsD0toKpi* cuts):
 AliAnalysisTaskSE(name),
-fOutputPPR(0), 
-fOutputmycuts(0), 
-fNentries(0),
+fOutputMass(0), 
 fDistr(0),
+fNentries(0),
 fChecks(0),
-fVHFPPR(0),
-fVHFmycuts(0),
+fCuts(0),
 fArray(0),
 fReadMC(0),
 fCutOnDistr(0),
+fNPtBins(1),
+fTotPosPairs(0),
+fTotNegPairs(0),
 fLsNormalization(1.)
 
+
 {
   // Default constructor
-  for(Int_t i=0;i<5;i++) {fTotPosPairs[i]=0; fTotNegPairs[i]=0;}
 
-  // Output slot #1 writes into a TList container
+  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;}
+    
+  fCuts=cuts;
+
+  // Output slot #1 writes into a TList container (mass with cuts)
   DefineOutput(1,TList::Class());  //My private output
-  // Output slot #2 writes into a TList container
+  // Output slot #2 writes into a TList container (distributions)
   DefineOutput(2,TList::Class());  //My private output
-  // Output slot #3 writes into a TH1F container
+  // 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
+  // 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
-  DefineOutput(5,TList::Class());  //My private output
+  // Output slot #5 writes into a TList container (cuts)
+  DefineOutput(5,AliRDHFCutsD0toKpi::Class());  //My private output
+
 }
 
 //________________________________________________________________________
 AliAnalysisTaskSED0Mass::~AliAnalysisTaskSED0Mass()
 {
-   if (fOutputPPR) {
-    delete fOutputPPR;
-    fOutputPPR = 0;
+   if (fOutputMass) {
+    delete fOutputMass;
+    fOutputMass = 0;
   }
-  if (fVHFPPR) {
-    delete fVHFPPR;
-    fVHFPPR = 0;
-  }
-  if (fOutputmycuts) {
-    delete fOutputmycuts;
-    fOutputmycuts = 0;
-  }
-
   if (fDistr) {
     delete fDistr;
     fDistr = 0;
   }
-
   if (fChecks) {
     delete fChecks;
     fChecks = 0;
   }
-
-  if (fVHFmycuts) {
-    delete fVHFmycuts;
-    fVHFmycuts = 0;
+  if (fCuts) {
+    delete fCuts;
+    fCuts = 0;
   }
   if (fNentries){
     delete fNentries;
     fNentries = 0;
   }
-
-
 }  
 
 //________________________________________________________________________
@@ -146,11 +148,14 @@ void AliAnalysisTaskSED0Mass::Init()
 
   if(fDebug > 1) printf("AnalysisTaskSED0Mass::Init() \n");
 
-  gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/ConfigVertexingHF.C");
+  
+  AliRDHFCutsD0toKpi* copyfCuts=new AliRDHFCutsD0toKpi(*fCuts);
+  const char* nameoutput=GetOutputSlot(5)->GetContainer()->GetName();
+  copyfCuts->SetName(nameoutput);
+  // Post the data
+  PostData(5,copyfCuts);
+
 
-  // 2 sets of dedidcated cuts -- defined in UserExec
-  fVHFPPR = (AliAnalysisVertexingHF*)gROOT->ProcessLine("ConfigVertexingHF()");
-  fVHFmycuts = (AliAnalysisVertexingHF*)gROOT->ProcessLine("ConfigVertexingHF()");  
   return;
 }
 
@@ -163,13 +168,9 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
   if(fDebug > 1) printf("AnalysisTaskSED0Mass::UserCreateOutputObjects() \n");
 
   // Several histograms are more conveniently managed in a TList
-  fOutputPPR = new TList();
-  fOutputPPR->SetOwner();
-  fOutputPPR->SetName("listPPR");
-
-  fOutputmycuts = new TList();
-  fOutputmycuts->SetOwner();
-  fOutputmycuts->SetName("listloose");
+  fOutputMass = new TList();
+  fOutputMass->SetOwner();
+  fOutputMass->SetName("listMass");
 
   fDistr = new TList();
   fDistr->SetOwner();
@@ -179,108 +180,183 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
   fChecks->SetOwner();
   fChecks->SetName("checkHistograms");
 
-  const Int_t nhist=5;
-
   TString nameMass=" ",nameSgn27=" ",nameSgn=" ", nameBkg=" ", nameRfl=" ",nameMassNocutsS =" ",nameMassNocutsB =" ", namedistr=" ";
 
-  for(Int_t i=0;i<nhist;i++){
+  for(Int_t i=0;i<fCuts->GetNPtBins();i++){
 
     nameMass="histMass_";
-    nameMass+=i+1;
+    nameMass+=i;
     nameSgn27="histSgn27_";
-    nameSgn27+=i+1;
+    nameSgn27+=i;
     nameSgn="histSgn_";
-    nameSgn+=i+1;
+    nameSgn+=i;
     nameBkg="histBkg_";
-    nameBkg+=i+1;
+    nameBkg+=i;
     nameRfl="histRfl_";
-    nameRfl+=i+1;
+    nameRfl+=i;
     nameMassNocutsS="hMassS_";
-    nameMassNocutsS+=i+1;
+    nameMassNocutsS+=i;
     nameMassNocutsB="hMassB_";
-    nameMassNocutsB+=i+1;
+    nameMassNocutsB+=i;
 
     //histograms of cut variable distributions
 
     //  pT
     namedistr="hptpiS_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hptpiS = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
 
     namedistr="hptKS_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hptKS = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
 
     namedistr="hptB_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hptB = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
 
     //  pT no mass cut
     namedistr="hptpiSnoMcut_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hptpiSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
 
     namedistr="hptKSnoMcut_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hptKSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
 
     namedistr="hptB1prongnoMcut_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hptB1pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
 
     namedistr="hptB2prongsnoMcut_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hptB2pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
 
     
     //  dca
     namedistr="hdcaS_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hdcaS = new TH1F(namedistr.Data(), "DCA distribution;dca [cm]",200,0.,0.1);
     namedistr="hdcaB_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hdcaB = new TH1F(namedistr.Data(), "DCA distribution;dca [cm]",200,0.,0.1);
 
     //  costhetastar
     namedistr="hcosthetastarS_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hcosthetastarS = new TH1F(namedistr.Data(), "cos#theta* distribution;cos#theta*",200,-1.,1.);
     namedistr="hcosthetastarB_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hcosthetastarB = new TH1F(namedistr.Data(), "cos#theta* distribution;cos#theta*",200,-1.,1.);
 
     // impact parameter
     namedistr="hd0piS_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hd0piS = new TH1F(namedistr.Data(), "Impact parameter distribution (pions);d0(#pi) [cm]",200,-0.1,0.1);
 
     namedistr="hd0KS_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hd0KS = new TH1F(namedistr.Data(), "Impact parameter distribution (kaons);d0(K) [cm]",200,-0.1,0.1);
+
     namedistr="hd0B_";
-    namedistr+=i+1;
-    TH1F *hd0B = new TH1F(namedistr.Data(), "Impact parameter distribution;d0 [cm]",200,-0.1,0.1);
+    namedistr+=i;
+    TH1F *hd0B = new TH1F(namedistr.Data(), "Impact parameter distribution (both);d0 [cm]",200,-0.1,0.1);
+
+    namedistr="hd0p0B_";
+    namedistr+=i;
+    TH1F *hd0p0B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong +);d0 [cm]",200,-0.1,0.1);
+
+    namedistr="hd0p1B_";
+    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+=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="hd0d0S_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hd0d0S = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution;d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
     namedistr="hd0d0B_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hd0d0B = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution;d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
 
-    //  costhetapoint
+     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);
+
+    namedistr="hdeclB_";
+    namedistr+=i;
+    TH1F *hdeclengthB = new TH1F(namedistr.Data(), "Decay Length distribution;Decay Length [cm]",200,0,0.6);
+
+    namedistr="hnormdeclS_";
+    namedistr+=i;
+    TH1F *hnormdeclengthS = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;Decay Length/Err ",200,0,10.);
+
+    namedistr="hnormdeclB_";
+    namedistr+=i;
+    TH1F *hnormdeclengthB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;Decay Length/Err ",200,0,10.);
+
+    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.);
+
+   //  costhetapoint
     namedistr="hcosthetapointS_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hcosthetapointS = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
     namedistr="hcosthetapointB_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH1F *hcosthetapointB = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
 
+   //  costhetapoint vs d0 or d0d0
+    namedistr="hcosthpointd0S_";
+    namedistr+=i;
+    TH2F *hcosthpointd0S= new TH2F(namedistr.Data(),"Correlation cos#theta_{Point}-d_{0};cos#theta_{Point};d_{0} [cm^{2}]",200,0,1.,200,-0.001,0.001);
+
+    namedistr="hcosthpointd0B_";
+    namedistr+=i;
+    TH2F *hcosthpointd0B= new TH2F(namedistr.Data(),"Correlation cos#theta_{Point}-d_{0};cos#theta_{Point};d_{0} [cm^{2}]",200,0,1.,200,-0.001,0.001);
+
     namedistr="hcosthpointd0d0S_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH2F *hcosthpointd0d0S= new TH2F(namedistr.Data(),"Correlation cos#theta_{Point}-d_{0}#timesd_{0};cos#theta_{Point};d_{0}#timesd_{0} [cm^{2}]",200,0,1.,200,-0.001,0.001);
     namedistr="hcosthpointd0d0B_";
-    namedistr+=i+1;
+    namedistr+=i;
     TH2F *hcosthpointd0d0B= new TH2F(namedistr.Data(),"Correlation cos#theta_{Point}-d_{0}#timesd_{0};cos#theta_{Point};d_{0}#timesd_{0} [cm^{2}]",200,0,1.,200,-0.001,0.001);
 
     fDistr->Add(hptpiS);
@@ -298,16 +374,42 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     fDistr->Add(hd0piS);
     fDistr->Add(hd0KS);
     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(hd0d0S);
     fDistr->Add(hd0d0B);
 
+    fDistr->Add(hd0d0vS);
+    fDistr->Add(hd0d0vB);
+
     fDistr->Add(hcosthetastarS);
     fDistr->Add(hcosthetastarB);
 
     fDistr->Add(hcosthetapointS);
     fDistr->Add(hcosthetapointB);
 
+    fDistr->Add(hdeclengthS);
+    fDistr->Add(hdeclengthB);
+
+    fDistr->Add(hnormdeclengthS);
+    fDistr->Add(hnormdeclengthB);
+
+    fDistr->Add(hdeclengthvS);
+    fDistr->Add(hdeclengthvB);
+
+    fDistr->Add(hnormdeclengthvS);
+    fDistr->Add(hnormdeclengthvB);
+
+    fDistr->Add(hcosthpointd0S);
+    fDistr->Add(hcosthpointd0B);
+
     fDistr->Add(hcosthpointd0d0S);
     fDistr->Add(hcosthpointd0d0B);
 
@@ -351,25 +453,19 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     tmpRl->Sumw2();
   //  printf("Created histograms %s\t%s\t%s\t%s\n",tmpM->GetName(),tmpS->GetName(),tmpB->GetName(),tmpR->GetName());
 
-    fOutputPPR->Add(tmpMt);
-    fOutputPPR->Add(tmpSt);
-    fOutputPPR->Add(tmpS27t);
-    fOutputPPR->Add(tmpBt);
-    fOutputPPR->Add(tmpRt);
-
-    fOutputmycuts->Add(tmpMl);
-    fOutputmycuts->Add(tmpSl);
-    fOutputmycuts->Add(tmpS27l);
-    fOutputmycuts->Add(tmpBl);
-    fOutputmycuts->Add(tmpRl);
+    fOutputMass->Add(tmpMt);
+    fOutputMass->Add(tmpSt);
+    fOutputMass->Add(tmpS27t);
+    fOutputMass->Add(tmpBt);
+    fOutputMass->Add(tmpRt);
+
     fDistr->Add(tmpMS);
     fDistr->Add(tmpMB);
 
 
   }
 
-  //histograms for vertex checking
+  //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.);
@@ -379,26 +475,44 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
   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");
 
-  //conta gli eventi con vertice buoni e almeno due tracce utilizzabili 
+  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);
 
-  fNentries=new TH1F("nentriesD0", "nentriesD0->Integral(1,2) = number of AODs *** nentriesD0->Integral(3,4) = number of candidates selected with cuts *** nentriesD0->Integral(5,6) = number of D0 selected with cuts *** nentriesD0->Integral(7,8) = events with good vertex", 5,0.,5.);
+  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->GetXaxis()->SetBinLabel(1,"nEventsAnal");
-  fNentries->GetXaxis()->SetBinLabel(2,"nCandidatesSelected");
+  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()->SetNdivisions(1,kFALSE);
 
   // Post the data
-  PostData(1,fOutputPPR);
-  PostData(2,fOutputmycuts);
+  PostData(1,fOutputMass);
+  PostData(2,fDistr);
   PostData(3,fNentries);
-  PostData(4,fDistr);
-  PostData(5,fChecks);
-
+  PostData(4,fChecks);
+  
   return;
 }
 
@@ -408,6 +522,20 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   // Execute analysis for current event:
   // heavy flavor candidates association to MC truth
   //cout<<"I'm in UserExec"<<endl;
+
+
+    //cuts order
+    //       printf("    |M-MD0| [GeV]    < %f\n",fD0toKpiCuts[0]);
+    //     printf("    dca    [cm]  < %f\n",fD0toKpiCuts[1]);
+    //     printf("    cosThetaStar     < %f\n",fD0toKpiCuts[2]);
+    //     printf("    pTK     [GeV/c]    > %f\n",fD0toKpiCuts[3]);
+    //     printf("    pTpi    [GeV/c]    > %f\n",fD0toKpiCuts[4]);
+    //     printf("    |d0K|  [cm]  < %f\n",fD0toKpiCuts[5]);
+    //     printf("    |d0pi| [cm]  < %f\n",fD0toKpiCuts[6]);
+    //     printf("    d0d0  [cm^2] < %f\n",fD0toKpiCuts[7]);
+    //     printf("    cosThetaPoint    > %f\n",fD0toKpiCuts[8]);
+  
+
   AliAODEvent *aod = dynamic_cast<AliAODEvent*> (InputEvent());
 
   TString bname;
@@ -491,13 +619,33 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
 
   if(aod) ntracks=aod->GetNTracks();
 
-
   //cout<<"ntracks = "<<ntracks<<endl;
-  //cout<<"Before loop"<<endl;
   //loop on tracks in the event
   for (Int_t k=0;k<ntracks;k++){
     AliAODTrack* track=aod->GetTrack(k);
-    //cout<<"in loop"<<endl;
+
+    //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)  {if (fDebug>1)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;
     
@@ -512,7 +660,7 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
        track->GetStatus()&AliESDtrack::kITSrefit &&
        nclsTot>3 &&
        nclsSPD>0) {//fill hist good tracks
-      //cout<<"in if"<<endl;
+     
       ((TH1F*)fChecks->FindObject("hptGoodTr"))->Fill(track->Pt());
       isGoodTrack++;
     }
@@ -521,138 +669,64 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   }
   //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>1) printf("Number of D0->Kpi: %d\n",nInD0toKpi);
+  if(fDebug>2) printf("Number of D0->Kpi: %d\n",nInD0toKpi);
 
-  AliAnalysisVertexingHF*  fdummy = 0;
-  
   for (Int_t iD0toKpi = 0; iD0toKpi < nInD0toKpi; iD0toKpi++) {
     //Int_t nPosPairs=0, nNegPairs=0;
     //cout<<"inside the loop"<<endl;
     AliAODRecoDecayHF2Prong *d = (AliAODRecoDecayHF2Prong*)inputArray->UncheckedAt(iD0toKpi);
+
+    //check daughters
+    if(!(d->GetDaughter(0) || d->GetDaughter(1))) {
+      AliDebug(1,"at least one daughter not found!");
+      fNentries->Fill(6);
+      return;
+    }
+
     Bool_t unsetvtx=kFALSE;
     if(!d->GetOwnPrimaryVtx()) {
       d->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
       unsetvtx=kTRUE;
     }
+  
     
     //check reco daughter in acceptance
+    /*
     Double_t eta0=d->EtaProng(0);
     Double_t eta1=d->EtaProng(1);
-    Bool_t prongsinacc=kFALSE;
-    if (TMath::Abs(eta0) < 0.9 && TMath::Abs(eta1) < 0.9) prongsinacc=kTRUE;
-    
-    //cuts order
-    //       printf("    |M-MD0| [GeV]    < %f\n",fD0toKpiCuts[0]);
-    //     printf("    dca    [cm]  < %f\n",fD0toKpiCuts[1]);
-    //     printf("    cosThetaStar     < %f\n",fD0toKpiCuts[2]);
-    //     printf("    pTK     [GeV/c]    > %f\n",fD0toKpiCuts[3]);
-    //     printf("    pTpi    [GeV/c]    > %f\n",fD0toKpiCuts[4]);
-    //     printf("    |d0K|  [cm]  < %f\n",fD0toKpiCuts[5]);
-    //     printf("    |d0pi| [cm]  < %f\n",fD0toKpiCuts[6]);
-    //     printf("    d0d0  [cm^2] < %f\n",fD0toKpiCuts[7]);
-    //     printf("    cosThetaPoint    > %f\n",fD0toKpiCuts[8]);
-    
-    Int_t ptbin=0;
-    Bool_t isInRange=kFALSE;
-    Double_t pt = d->Pt(); //mother pt    
-    //cout<<"P_t = "<<pt<<endl;
-    if (pt>0. && pt<=1.) {
-      ptbin=1;
-      isInRange=kTRUE;
-      /*
-      //test d0 cut
-      fVHFPPR->SetD0toKpiCuts(0.7,0.04,0.8,0.5,0.5,0.05,0.1,-0.0002,0.5);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.04,0.8,0.5,0.5,0.05,0.1,-0.00025,0.7);
-      */
-      //original
-      fVHFPPR->SetD0toKpiCuts(0.7,0.04,0.8,0.5,0.5,0.05,0.05,-0.0002,0.5);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.04,0.8,0.5,0.5,0.05,0.05,-0.00025,0.7);
-      
-      //       fVHFPPR->SetD0toKpiCuts(0.7,0.04,0.8,0.5,0.5,0.05,0.05,-0.0002,0.7);
-      //       fVHFmycuts->SetD0toKpiCuts(0.7,0.04,0.8,0.5,0.5,1,1,-0.00015,0.5);
-      //printf("I'm in the bin %d\n",ptbin);
-      
-    }
-    
-    if(pt>1. && pt<=3.) {
-      if(pt>1. && pt<=2.) ptbin=2;  
-      if(pt>2. && pt<=3.) ptbin=3;  
-      isInRange=kTRUE;
-      /*
-      //test d0 cut
-      fVHFPPR->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.1,-0.0002,0.6);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,1,0.1,-0.00025,0.8);
-      */
-      //original
-      fVHFPPR->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.05,-0.0002,0.6);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,1,1,-0.00025,0.8);
-      
-      //printf("I'm in the bin %d\n",ptbin);
-    }
-    
-    if(pt>3. && pt<=5.){
-      ptbin=4;  
-      isInRange=kTRUE;
-      /*
-      //test d0 cut
-      fVHFPPR->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.1,-0.0001,0.8);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.1,-0.00015,0.8);
-      */
-      //original
-      fVHFPPR->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.05,-0.0001,0.8);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.05,-0.00015,0.8);
-      
-      //printf("I'm in the bin %d\n",ptbin);
-    }
-    if(pt>5.&& pt<=10.){ //additional upper limit to compare with Correction Framework
-      ptbin=5;
-      isInRange=kTRUE;
-      /*
-      //test d0 cut
-      fVHFPPR->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.1,-0.00005,0.8);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.1,-0.00015,0.9);
-      */
-      //original
-      fVHFPPR->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.05,-0.00005,0.8);
-      fVHFmycuts->SetD0toKpiCuts(0.7,0.02,0.8,0.7,0.7,0.05,0.05,-0.00015,0.9);
-      
-    }//if(pt>5)    if (pt>0. && pt<=1.) {
-    //printf("I'm in the bin %d\n",ptbin);
-    //old
-    //fVHF->SetD0toKpiCuts(0.7,0.03,0.8,0.06,0.06,0.05,0.05,-0.0002,0.6); //2.p-p vertex reconstructed    
-    
-    if(prongsinacc && isInRange){
-
-      if(!fCutOnDistr){
-       FillVarHists(ptbin,d,mcArray,fdummy,fDistr);
-      }else{
-       
-       if(fCutOnDistr==1) FillVarHists(ptbin,d,mcArray,fVHFPPR,fDistr);
-       if(fCutOnDistr==2) FillVarHists(ptbin,d,mcArray,fVHFmycuts,fDistr);
-      }
-      
-      FillMassHists(ptbin,d,mcArray,fVHFPPR,fOutputPPR);
-      FillMassHists(ptbin,d,mcArray,fVHFmycuts,fOutputmycuts);
+    */
+    if ( fCuts->IsInFiducialAcceptance(d->Pt(),d->Y(421)) ) {
+      //if( TMath::Abs(eta0)<0.9 && TMath::Abs(eta1)<0.9 ){
+       //apply cuts on tracks
+      Int_t isSelected = fCuts->IsSelected(d,AliRDHFCuts::kTracks);
+      if(((AliAODTrack*)d->GetDaughter(0))->GetTPCNcls() < 70 || ((AliAODTrack*)d->GetDaughter(1))->GetTPCNcls() < 70) isSelected=kFALSE;
+      if (!isSelected) return;
+      fNentries->Fill(7);       
+      if(fDebug>2) cout<<"tracks selected"<<endl;
+
+      FillVarHists(aod,d,mcArray,fCuts,fDistr);
+      FillMassHists(d,mcArray,fCuts,fOutputMass);
     }
+  
     if(unsetvtx) d->UnsetOwnPrimaryVtx();
   } //end for prongs
 
+
   // Post the data
-  PostData(1,fOutputPPR);
-  PostData(2,fOutputmycuts);
+  PostData(1,fOutputMass);
+  PostData(2,fDistr);
   PostData(3,fNentries);
-  PostData(4,fDistr);
-  PostData(5,fChecks);
-  cout<<"Other PostData"<<endl;
+  PostData(4,fChecks);
+
   return;
 }
 
 //____________________________________________________________________________
-void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliAnalysisVertexingHF *vhf, TList *listout){
+void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliRDHFCutsD0toKpi *cuts, TList *listout){
   //
   // function used in UserExec to fill variable histograms:
   //
@@ -674,26 +748,58 @@ void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong
   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 okD0=-1,okD0bar=-1;
 
-  if(fCutOnDistr && vhf) 
-    if(part->SelectD0(vhf->GetD0toKpiCuts(),okD0,okD0bar)) 
-      isSelected=kTRUE;//selected  
+
+  if(fCutOnDistr){
+    isSelected = cuts->IsSelected(part,AliRDHFCuts::kCandidate);
+    if (!isSelected){
+      //cout<<"Not Selected"<<endl;
+      return;
+    }
+  }
+
+  Double_t invmasscut=0.03;
 
   TString fillthispi="",fillthisK="",fillthis="";
 
-  if(!fCutOnDistr || (fCutOnDistr && isSelected)){ //if no cuts or cuts passed 
+  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]={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
 
       //check pdg of the prongs
       AliAODTrack *prong0=(AliAODTrack*)part->GetDaughter(0);
       AliAODTrack *prong1=(AliAODTrack*)part->GetDaughter(1);
+      if(!prong0 || !prong1) {
+       return;
+      }
       Int_t labprong[2];
       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();
@@ -727,9 +833,9 @@ void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong
       else { //D0bar
        ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0bar);
       }
-      
+
       //apply cut on invariant mass on the pair
-      if(TMath::Abs(minvD0-mPDG)<0.03 || TMath::Abs(minvD0bar-mPDG)<0.03){
+      if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
        
        if(fArray==1) cout<<"LS signal: ERROR"<<endl;
        for (Int_t iprong=0; iprong<2; iprong++){
@@ -746,10 +852,16 @@ void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong
            fillthispi="hptpiS_";
            fillthispi+=ptbin;
            ((TH1F*)listout->FindObject(fillthispi))->Fill(part->PtProng(iprong));
-           
-           fillthisK="hd0KS_";
-           fillthisK+=ptbin;
-           ((TH1F*)listout->FindObject(fillthisK))->Fill(part->Getd0Prong(iprong));
+           fillthispi="hd0piS_";
+           fillthispi+=ptbin;
+           ((TH1F*)listout->FindObject(fillthispi))->Fill(part->Getd0Prong(iprong));
+           if(d0[iprong] != -99) {
+
+             fillthispi="hd0vpiS_";
+             fillthispi+=ptbin;
+             ((TH1F*)listout->FindObject(fillthispi))->Fill(d0[iprong]);
+           }
+
          }
          
          if(TMath::Abs(pdgprong)==321) {
@@ -758,44 +870,77 @@ void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong
            fillthisK="hptKS_";
            fillthisK+=ptbin;
            ((TH1F*)listout->FindObject(fillthisK))->Fill(part->PtProng(iprong));
-           
            fillthisK="hd0KS_";
            fillthisK+=ptbin;
            ((TH1F*)listout->FindObject(fillthisK))->Fill(part->Getd0Prong(iprong));
+           if (d0[iprong] != -99){
+             fillthisK="hd0vKS_";
+             fillthisK+=ptbin;
+             ((TH1F*)listout->FindObject(fillthisK))->Fill(d0[iprong]);
+           }
          }
 
-         fillthis="hdcaS_";
+         fillthis="hcosthpointd0S_";
          fillthis+=ptbin;        
-         ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
+         ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle(),part->Getd0Prong(iprong));
 
-         fillthis="hcosthetapointS_";
-         fillthis+=ptbin;        
-         ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle());
+       } //end loop on prongs
 
-         fillthis="hcosthpointd0d0S_";
-         fillthis+=ptbin;        
-         ((TH2F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle(),part->Prodd0d0());
+       fillthis="hdcaS_";
+       fillthis+=ptbin;          
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
+
+       fillthis="hcosthetapointS_";
+       fillthis+=ptbin;          
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle());
+
+       fillthis="hcosthpointd0d0S_";
+       fillthis+=ptbin;          
+       ((TH2F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle(),part->Prodd0d0());
          
-         fillthis="hcosthetastarS_";
+       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());
+
+       fillthis="hd0d0S_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
+
+       if(d0[0] != -99 && d0[1] != -99 ){
+         fillthis="hd0d0vS_";
          fillthis+=ptbin;
-         if (((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421)((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0());
-         else ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0bar());
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
+       }
+
+       fillthis="hdeclS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->DecayLength());
+
+       fillthis="hnormdeclS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->NormalizedDecayLength());
 
-         fillthis="hd0d0S_";
+       if(vtxProp) {
+         fillthis="hdeclvS_";
          fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
+         ((TH1F*)listout->FindObject(fillthis))->Fill(part->AliAODRecoDecay::DecayLength(vtxProp));
+
+         fillthis="hnormdeclvS_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(part->AliAODRecoDecay::NormalizedDecayLength(vtxProp));
        }
-      }
+     } //end mass cut
+    
     } else{ //Background or LS
       //cout<<"is background"<<endl;
      
       //no mass cut distributions: mass, ptbis
       fillthis="hMassB_";
       fillthis+=ptbin;
-
-      if (!fCutOnDistr || (fCutOnDistr>0 && okD0==1)) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0);
-      if (!fCutOnDistr || (fCutOnDistr>0 && okD0bar==1)) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0bar);
+      
+      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;
@@ -808,24 +953,53 @@ void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong
       ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(1));
 
       //apply cut on invariant mass on the pair
-      if(TMath::Abs(minvD0-mPDG)<0.03 || TMath::Abs(minvD0bar-mPDG)<0.03){
+      if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
 
 
        AliAODTrack *prong=(AliAODTrack*)part->GetDaughter(0);
-       if(!prong) cout<<"No daughter found";
+       if(!prong) {
+         if(fDebug>2) cout<<"No daughter found";
+         return;
+       }
        else{
-         if(prong->Charge()==1) {fTotPosPairs[4]++;} else {fTotNegPairs[4]++;}
+         if(prong->Charge()==1) {fTotPosPairs[ptbin]++;} else {fTotNegPairs[ptbin]++;}
        }
        
        //normalise pt distr to half afterwards
        fillthis="hptB_";
        fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(0));
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(1));
 
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(0));((TH1F*)listout->FindObject("hptB_1"))->Fill(part->PtProng(1));
-
+       fillthis="hd0p0B_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(0));
+       fillthis="hd0p1B_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(1));
        fillthis="hd0B_";
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(0));
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(1));
+
+       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;          
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle(),part->Getd0Prong(0));
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle(),part->Getd0Prong(1));
+
 
        fillthis="hdcaB_";
        fillthis+=ptbin;
@@ -833,13 +1007,19 @@ void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong
 
        fillthis="hcosthetastarB_";
        fillthis+=ptbin;
-       if (!fCutOnDistr || (fCutOnDistr>0 && okD0==1))((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0());
-       if (!fCutOnDistr || (fCutOnDistr>0 && okD0bar==1))((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0bar());      
+       if (!fCutOnDistr || (fCutOnDistr && (isSelected==1 || isSelected==3)))((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0());
+       if (!fCutOnDistr || (fCutOnDistr && isSelected>1))((TH1F*)listout->FindObject(fillthis))->Fill(part->CosThetaStarD0bar());      
 
        fillthis="hd0d0B_";
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
 
+       if(d0[0] != -99 && d0[1] != -99 ){
+         fillthis="hd0d0vB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
+       }
+
        fillthis="hcosthetapointB_";
        fillthis+=ptbin;
        ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngle());
@@ -847,14 +1027,32 @@ void AliAnalysisTaskSED0Mass::FillVarHists(Int_t ptbin, AliAODRecoDecayHF2Prong
        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(vtxProp) {
+         fillthis="hdeclvB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(part->AliAODRecoDecay::DecayLength(vtxProp));
+
+         fillthis="hnormdeclvB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(part->AliAODRecoDecay::NormalizedDecayLength(vtxProp));
+       }
+     }//mass cut       
+    }//else (background)
   }
   return;
 }
-//____________________________________________________________________________*
-void AliAnalysisTaskSED0Mass::FillMassHists(Int_t ptbin, AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliAnalysisVertexingHF *vhf, TList *listout){
+//____________________________________________________________________________
+
+void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliRDHFCutsD0toKpi* cuts, TList *listout){
   //
   // function used in UserExec to fill mass histograms:
   //
@@ -862,104 +1060,166 @@ void AliAnalysisTaskSED0Mass::FillMassHists(Int_t ptbin, AliAODRecoDecayHF2Prong
 
   Double_t mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
 
-  Int_t okD0=0,okD0bar=0;
-  //cout<<"inside FillHist"<<endl;
-  if(part->SelectD0(vhf->GetD0toKpiCuts(),okD0,okD0bar)) {//selected
-    Double_t invmassD0 = part->InvMassD0(), invmassD0bar = part->InvMassD0bar();
-    printf("SELECTED\n");
-
+  Int_t isSelected=cuts->IsSelected(part,AliRDHFCuts::kCandidate); //selected
+  //cout<<"is selected = "<<isSelected<<endl;
 
-    AliAODTrack *prong=(AliAODTrack*)part->GetDaughter(0);
-    if(!prong) cout<<"No daughter found";
-    else{
-      if(prong->Charge()==1) {fTotPosPairs[ptbin-1]++;} else {fTotNegPairs[ptbin-1]++;}
-    }
+  //cout<<"check cuts = "<<endl;
+  //cuts->PrintAll();
+  if (!isSelected){
+    //cout<<"Not Selected"<<endl;
+    return;
+  }
 
-    TString fillthis="";
-    Int_t pdgDgD0toKpi[2]={321,211};
-    Int_t labD0=-1;
-    if (fReadMC) labD0 = part->MatchToMC(421,arrMC,2,pdgDgD0toKpi); //return MC particle label if the array corresponds to a D0, -1 if not (cf. AliAODRecoDecay.cxx)
+  if(fDebug>2)  cout<<"Candidate selected"<<endl;
 
-    //count candidates selected by cuts
-    fNentries->Fill(1);
-    //count true D0 selected by cuts
-    if (fReadMC && labD0>=0) fNentries->Fill(2);
-    PostData(3,fNentries);
+  Double_t invmassD0 = part->InvMassD0(), invmassD0bar = part->InvMassD0bar();
+  //printf("SELECTED\n");
+  Int_t ptbin=cuts->PtBin(part->Pt());
 
-    if (okD0==1) {
-      fillthis="histMass_";
-      fillthis+=ptbin;
-      //cout<<"Filling "<<fillthis<<endl;
+  AliAODTrack *prong=(AliAODTrack*)part->GetDaughter(0);
+  if(!prong) {
+    AliDebug(2,"No daughter found");
+    return;
+  }
+  else{
+    if(prong->Charge()==1) {fTotPosPairs[ptbin]++;} else {fTotNegPairs[ptbin]++;}
+  }
 
-      //printf("Fill mass with D0");
-      ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
+  TString fillthis="";
+  Int_t pdgDgD0toKpi[2]={321,211};
+  Int_t labD0=-1;
+  if (fReadMC) labD0 = part->MatchToMC(421,arrMC,2,pdgDgD0toKpi); //return MC particle label if the array corresponds to a D0, -1 if not (cf. AliAODRecoDecay.cxx)
+
+  //count candidates selected by cuts
+  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
+    fillthis="histMass_";
+    fillthis+=ptbin;
+    //cout<<"Filling "<<fillthis<<endl;
+
+    //printf("Fill mass with D0");
+    ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
  
-      if(labD0>=0) {
-       if(fArray==1) cout<<"LS signal ERROR"<<endl;
-
-       AliAODMCParticle *partD0 = (AliAODMCParticle*)arrMC->At(labD0);
-       Int_t pdgD0 = partD0->GetPdgCode();
-       //cout<<"pdg = "<<pdgD0<<endl;
-       if (pdgD0==421){ //D0
-         //cout<<"Fill S with D0"<<endl;
-         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);
-         }
-       } else{ //it was a D0bar
-         fillthis="histRfl_";
+    if(labD0>=0) {
+      if(fArray==1) cout<<"LS signal ERROR"<<endl;
+
+      AliAODMCParticle *partD0 = (AliAODMCParticle*)arrMC->At(labD0);
+      Int_t pdgD0 = partD0->GetPdgCode();
+      //cout<<"pdg = "<<pdgD0<<endl;
+      if (pdgD0==421){ //D0
+       //cout<<"Fill S with D0"<<endl;
+       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);
        }
-      } else {//background
-       fillthis="histBkg_";
+      } else{ //it was a D0bar
+       fillthis="histRfl_";
        fillthis+=ptbin;
        ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
       }
-      
-    }
-    if (okD0bar==1) {
-      fillthis="histMass_";
+    } else {//background
+      fillthis="histBkg_";
       fillthis+=ptbin;
-      //printf("Fill mass with D0bar");
-      ((TH1F*)listout->FindObject(fillthis))->Fill(invmassD0bar);
+      ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
+    }
+      
+  }
+  if (isSelected>1) { //D0bar
+    fillthis="histMass_";
+    fillthis+=ptbin;
+    //printf("Fill mass with D0bar");
+    ((TH1F*)listout->FindObject(fillthis))->Fill(invmassD0bar);
  
-      if(labD0>=0) {
-       if(fArray==1) cout<<"LS signal ERROR"<<endl;
-       AliAODMCParticle *partD0 = (AliAODMCParticle*)arrMC->At(labD0);
-       Int_t pdgD0 = partD0->GetPdgCode();
-       //cout<<" pdg = "<<pdgD0<<endl;
-       if (pdgD0==-421){ //D0bar
-         fillthis="histSgn_";
+    if(labD0>=0) {
+      if(fArray==1) cout<<"LS signal ERROR"<<endl;
+      AliAODMCParticle *partD0 = (AliAODMCParticle*)arrMC->At(labD0);
+      Int_t pdgD0 = partD0->GetPdgCode();
+      //cout<<" pdg = "<<pdgD0<<endl;
+      if (pdgD0==-421){ //D0bar
+       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{
-         fillthis="histRfl_";
-         fillthis+=ptbin;
-         ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0bar);
-       }
-      } else {//background or LS
-       fillthis="histBkg_";
+      } else{
+       fillthis="histRfl_";
        fillthis+=ptbin;
        ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0bar);
       }
+    } else {//background or LS
+      fillthis="histBkg_";
+      fillthis+=ptbin;
+      ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0bar);
     }
+  }
 
-
-  } //else cout<<"NOT SELECTED"<<endl;
   return;
 }
+
+//__________________________________________________________________________
+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);
+  if(!dgTrack){
+    AliDebug(2,"no daughter found!");
+    return 0x0;
+  }
+  skipped[0]=dgTrack->GetID();
+  dgTrack = (AliAODTrack*)d->GetDaughter(1);
+  if(!dgTrack){
+    AliDebug(2,"no daughter found!");
+    return 0x0;
+  }
+  skipped[1]=dgTrack->GetID();
+
+  //
+  vertexer->SetSkipTracks(nTrksToSkip,skipped);
+  vertexer->SetMinClusters(4);  
+  vertexESD = (AliESDVertex*)vertexer->FindPrimaryVertex(aodev); 
+  if(!vertexESD) return vertexAOD;
+  if(vertexESD->GetNContributors()<=0) { 
+    AliDebug(2,"vertexing failed"); 
+    delete vertexESD; vertexESD=NULL;
+    return vertexAOD;
+  }
+  
+  delete vertexer; vertexer=NULL;
+  
+  
+  // convert to AliAODVertex
+  Double_t pos[3],cov[6],chi2perNDF;
+  vertexESD->GetXYZ(pos); // position
+  vertexESD->GetCovMatrix(cov); //covariance matrix
+  chi2perNDF = vertexESD->GetChi2toNDF();
+  delete vertexESD; vertexESD=NULL;
+  
+  vertexAOD = new AliAODVertex(pos,cov,chi2perNDF);
+  return vertexAOD;
+  
+}
+
+
 //________________________________________________________________________
 void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
 {
@@ -968,90 +1228,98 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
   if(fDebug > 1) printf("AnalysisTaskSED0Mass: Terminate() \n");
 
 
-  fOutputPPR = dynamic_cast<TList*> (GetOutputData(1));
-  if (!fOutputPPR) {     
-    printf("ERROR: fOutputthight not available\n");
+  fOutputMass = dynamic_cast<TList*> (GetOutputData(1));
+  if (!fOutputMass) {     
+    printf("ERROR: fOutputMass not available\n");
     return;
   }
-  fOutputmycuts = dynamic_cast<TList*> (GetOutputData(2));
-  if (!fOutputmycuts) {     
-    printf("ERROR: fOutputmycuts not available\n");
+  fDistr = dynamic_cast<TList*> (GetOutputData(2));
+  if (!fDistr) {
+    printf("ERROR: fDistr not available\n");
     return;
   }
   fNentries = dynamic_cast<TH1F*>(GetOutputData(3));
+  
   if(!fNentries){
     printf("ERROR: fNEntries not available\n");
     return;
   }
-  fDistr = dynamic_cast<TList*> (GetOutputData(4));
-  if (!fDistr) {
-    printf("ERROR: fDistr not available\n");
-    return;
-  }
-  fChecks = dynamic_cast<TList*> (GetOutputData(5));
+
+  fChecks = dynamic_cast<TList*> (GetOutputData(4));
   if (!fChecks) {
     printf("ERROR: fChecks not available\n");
     return;
   }
+  
+  for(Int_t ipt=0;ipt<5;ipt++){ //change 5 in GetNPtBins when sure it is written and check
+
 
-  if(fArray==1){
-    for(Int_t ipt=0;ipt<5;ipt++){
+    if(fArray==1){ 
       fLsNormalization = 2.*TMath::Sqrt(fTotPosPairs[ipt]*fTotNegPairs[ipt]); 
 
 
-      if(fLsNormalization>10e-6) {
+      if(fLsNormalization>1e-6) {
        
        TString massName="histMass_";
-       massName+=ipt+1;
-       ((TH1F*)fOutputPPR->FindObject(massName))->Scale((1/fLsNormalization)*((TH1F*)fOutputPPR->FindObject(massName))->GetEntries());
-       ((TH1F*)fOutputmycuts->FindObject(massName))->Scale((1/fLsNormalization)*((TH1F*)fOutputmycuts->FindObject(massName))->GetEntries());
+       massName+=ipt;
+       ((TH1F*)fOutputMass->FindObject(massName))->Scale((1/fLsNormalization)*((TH1F*)fOutputMass->FindObject(massName))->GetEntries());
+
       }
     
 
       fLsNormalization = 2.*TMath::Sqrt(fTotPosPairs[4]*fTotNegPairs[4]);
 
-      if(fLsNormalization>10e-6) {
+      if(fLsNormalization>1e-6) {
 
        TString nameDistr="hptB_";
-       nameDistr+=ipt+1;
+       nameDistr+=ipt;
        ((TH1F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH1F*)fDistr->FindObject(nameDistr))->GetEntries());
        nameDistr="hdcaB_";
-       nameDistr+=ipt+1;
+       nameDistr+=ipt;
        ((TH1F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH1F*)fDistr->FindObject(nameDistr))->GetEntries());
        nameDistr="hcosthetastarB_";
-       nameDistr+=ipt+1;
+       nameDistr+=ipt;
        ((TH1F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH1F*)fDistr->FindObject(nameDistr))->GetEntries());
        nameDistr="hd0B_";
-       nameDistr+=ipt+1;
+       nameDistr+=ipt;
        ((TH1F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH1F*)fDistr->FindObject(nameDistr))->GetEntries());
        nameDistr="hd0d0B_";
-       nameDistr+=ipt+1;
+       nameDistr+=ipt;
        ((TH1F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH1F*)fDistr->FindObject(nameDistr))->GetEntries());
        nameDistr="hcosthetapointB_";
-       nameDistr+=ipt+1;
+       nameDistr+=ipt;
        ((TH1F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH1F*)fDistr->FindObject(nameDistr))->GetEntries());
        nameDistr="hcosthpointd0d0B_";
-       nameDistr+=ipt+1;
+       nameDistr+=ipt;
        ((TH2F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH2F*)fDistr->FindObject(nameDistr))->GetEntries());
 
       }
     }
   }
-  TString cvname;
+  TString cvname,cstname;
 
   if (fArray==0){
     cvname="D0invmass";
-  } else cvname="LSinvmass";
+    cstname="cstat0";
+  } else {
+    cvname="LSinvmass";
+    cstname="cstat1";
+  }
 
   TCanvas *cMass=new TCanvas(cvname,cvname);
   cMass->cd();
-  ((TH1F*)fOutputPPR->FindObject("histMass_4"))->Draw();
+  ((TH1F*)fOutputMass->FindObject("histMass_3"))->Draw();
 
-  TCanvas* cStat=new TCanvas("cstat","Stat");
+  TCanvas* cStat=new TCanvas(cstname,Form("Stat%s",fArray ? "LS" : "D0"));
   cStat->cd();
   cStat->SetGridy();
   fNentries->Draw("htext0");
 
+  // TCanvas *ccheck=new TCanvas(Form("cc%d",fArray),Form("cc%d",fArray));
+  // ccheck->cd();
+
   return;
 }