]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx
Added rejection of pileup from SPD (ChiaraB)
[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisTaskSED0Mass.cxx
index 656827b3411c582cfd0bfa85f09ead8173728681..fd7b67ffd957b96a9351b19af74d72407a6360db 100644 (file)
@@ -36,6 +36,7 @@
 #include <AliAnalysisDataContainer.h>
 #include "AliAnalysisManager.h"
 #include "AliESDtrack.h"
+#include "AliVertexerTracks.h"
 #include "AliAODHandler.h"
 #include "AliAODEvent.h"
 #include "AliAODVertex.h"
@@ -47,7 +48,7 @@
 #include "AliAnalysisVertexingHF.h"
 #include "AliAnalysisTaskSE.h"
 #include "AliAnalysisTaskSED0Mass.h"
-
+#include "AliNormalizationCounter.h"
 
 ClassImp(AliAnalysisTaskSED0Mass)
 
@@ -59,15 +60,17 @@ fOutputMass(0),
 fDistr(0),
 fNentries(0), 
 fChecks(0),
-//fCutList(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)
 
 
 {
@@ -81,16 +84,17 @@ fOutputMass(0),
 fDistr(0),
 fNentries(0),
 fChecks(0),
-//fCutList(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
@@ -100,7 +104,6 @@ fLsNormalization(1.)
   fTotNegPairs=new Int_t[fNPtBins];
   for(Int_t i=0;i<fNPtBins;i++) {fTotPosPairs[i]=0; fTotNegPairs[i]=0;}
     
-  //fCuts=new AliRDHFCutsD0toKpi(*cuts);
   fCuts=cuts;
 
   // Output slot #1 writes into a TList container (mass with cuts)
@@ -113,8 +116,8 @@ fLsNormalization(1.)
   DefineOutput(4,TList::Class());  //My private output
   // Output slot #5 writes into a TList container (cuts)
   DefineOutput(5,AliRDHFCutsD0toKpi::Class());  //My private output
-  //DefineOutput(5,TList::Class());  //My private output
-
+  // Output slot #6 writes Normalization Counter 
+  DefineOutput(6,AliNormalizationCounter::Class());
 }
 
 //________________________________________________________________________
@@ -140,11 +143,10 @@ AliAnalysisTaskSED0Mass::~AliAnalysisTaskSED0Mass()
     delete fNentries;
     fNentries = 0;
   }
-//   if(fCutList){
-//     delete fCutList;
-//     fCutList=0;
-//   }
+  if(fCounter){
+    delete fCounter;
+    fCounter=0;
+  }
  
 }  
 
@@ -156,15 +158,12 @@ void AliAnalysisTaskSED0Mass::Init()
   if(fDebug > 1) printf("AnalysisTaskSED0Mass::Init() \n");
 
   
-//   fCutList=new TList();
-//   fCutList->SetOwner();
-//   fCutList->SetName("listofCutsObj");
-//   fCutList->Add(fCuts);
-  
   AliRDHFCutsD0toKpi* copyfCuts=new AliRDHFCutsD0toKpi(*fCuts);
+  const char* nameoutput=GetOutputSlot(5)->GetContainer()->GetName();
+  copyfCuts->SetName(nameoutput);
   // Post the data
   PostData(5,copyfCuts);
-  //PostData(5,fCutList);
+
 
   return;
 }
@@ -266,9 +265,53 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     namedistr="hd0KS_";
     namedistr+=i;
     TH1F *hd0KS = new TH1F(namedistr.Data(), "Impact parameter distribution (kaons);d0(K) [cm]",200,-0.1,0.1);
+
     namedistr="hd0B_";
     namedistr+=i;
-    TH1F *hd0B = new TH1F(namedistr.Data(), "Impact parameter distribution;d0 [cm]",200,-0.1,0.1);
+    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="hd0moresB_";
+    namedistr+=i;
+    TH1F *hd0moresB = new TH1F(namedistr.Data(), "Impact parameter distribution (both);d0 [cm]",200,-0.1,0.1);
+
+    namedistr="hd0d0moresB_";
+    namedistr+=i;
+    TH1F *hd0d0moresB = new TH1F(namedistr.Data(), "Impact parameter distribution (prong +);d0 [cm]",200,-0.001,0.001);
+
+    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="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;
@@ -277,7 +320,47 @@ 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);
 
-    //  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.15);
+
+    namedistr="hdeclB_";
+    namedistr+=i;
+    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,6.);
+
+    namedistr="hnormdeclB_";
+    namedistr+=i;
+    TH1F *hnormdeclengthB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;Decay Length/Err ",200,0,6.);
+
+    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;
     TH1F *hcosthetapointS = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
@@ -285,6 +368,19 @@ 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;
+    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;
     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);
@@ -307,15 +403,46 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     fDistr->Add(hd0piS);
     fDistr->Add(hd0KS);
     fDistr->Add(hd0B);
+    fDistr->Add(hd0p0B);
+    fDistr->Add(hd0moresB);
+    fDistr->Add(hd0p1B);
+
+    fDistr->Add(hd0vpiS);
+    fDistr->Add(hd0vKS);
+    fDistr->Add(hd0vB);
+    fDistr->Add(hd0vp0B);
+    fDistr->Add(hd0vp1B);
+    fDistr->Add(hd0vmoresB);
 
     fDistr->Add(hd0d0S);
     fDistr->Add(hd0d0B);
+    fDistr->Add(hd0d0moresB);
+
+    fDistr->Add(hd0d0vS);
+    fDistr->Add(hd0d0vB);
+    fDistr->Add(hd0d0vmoresB);
 
     fDistr->Add(hcosthetastarS);
     fDistr->Add(hcosthetastarB);
 
     fDistr->Add(hcosthetapointS);
     fDistr->Add(hcosthetapointB);
+    fDistr->Add(hcosthetapointmoresB);
+
+    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);
@@ -372,7 +499,15 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
 
   }
 
-  //histograms for vertex checking
+  namedistr="hpospair";
+  TH1F* hpospair=new TH1F(namedistr.Data(),"Number of positive pairs",fCuts->GetNPtBins(),-0.5,fCuts->GetNPtBins()-0.5);
+  namedistr="hnegpair";
+  TH1F* hnegpair=new TH1F(namedistr.Data(),"Number of negative pairs",fCuts->GetNPtBins(),-0.5,fCuts->GetNPtBins()-0.5);
+  fDistr->Add(hpospair);
+  fDistr->Add(hnegpair);
+
+
+  //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.);
@@ -382,28 +517,63 @@ 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="hTPCsig";
+  TH1F* hTPCsig=new TH1F(checkname.Data(),"Distribution of TPC signal;TPC sig;Entries", 100, 35.,100.);
+
+  checkname="hTOFtimeKaonHyptime";
+  TH2F* hTOFtimeKaonHyptime=new TH2F(checkname.Data(),"TOFtime - timeHypothesisForKaon;p[GeV/c];TOFtime - timeHypothesisForKaon [ps]",200,0.,4.,1000,-20000.,20000.);
+
+  checkname="hTOFtimeKaonHyptimeAC";
+  TH2F* hTOFtimeKaonHyptimeAC=new TH2F(checkname.Data(),"TOFtime - timeHypothesisForKaon;p[GeV/c];TOFtime - timeHypothesisForKaon [ps]",200,0.,4.,1000,-20000.,20000.);
+
+  checkname="hTPCsigvsp";
+  TH2F* hTPCsigvsp=new TH2F(checkname.Data(),"TPCsig vs p;p[GeV/c];TPCsig",200,0.,4.,1000,35.,100.);
+ 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(hTPCsig);
+  fChecks->Add(hTOFtimeKaonHyptime);
+  fChecks->Add(hTOFtimeKaonHyptimeAC);
+  fChecks->Add(hTPCsigvsp);
+  fChecks->Add(hTOFtime);
 
   const char* nameoutput=GetOutputSlot(3)->GetContainer()->GetName();
-  cout<<nameoutput<<endl;
-  fNentries=new TH1F(nameoutput, "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.);
+
+  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", 15,-0.5,14.5);
 
   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(4,"nEventsGoodVtxS");
   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(9,"PID=0");
+  fNentries->GetXaxis()->SetBinLabel(10,"PID=1");
+  fNentries->GetXaxis()->SetBinLabel(11,"PID=2");
+  fNentries->GetXaxis()->SetBinLabel(12,"PID=3");
+  fNentries->GetXaxis()->SetBinLabel(13,"K");
+  fNentries->GetXaxis()->SetBinLabel(14,"Lambda");
+  fNentries->GetXaxis()->SetBinLabel(15,"Pile-up Rej");
   fNentries->GetXaxis()->SetNdivisions(1,kFALSE);
 
+  fCounter = new AliNormalizationCounter(Form("%s",GetOutputSlot(6)->GetContainer()->GetName()));
+
   // Post the data
   PostData(1,fOutputMass);
   PostData(2,fDistr);
   PostData(3,fNentries);
   PostData(4,fChecks);
-  
+  PostData(6,fCounter);  
   return;
 }
 
@@ -466,7 +636,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;
 
@@ -490,8 +664,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(14);
+    return;
+  }
   
   // AOD primary vertex
   AliAODVertex *vtx1 = (AliAODVertex*)aod->GetPrimaryVertex();
@@ -505,6 +683,7 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
     fNentries->Fill(3);
   }
 
+  
   //cout<<"Start checks"<<endl;
   Int_t ntracks=0,isGoodTrack=0;
 
@@ -515,7 +694,29 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   //loop on tracks in the event
   for (Int_t k=0;k<ntracks;k++){
     AliAODTrack* track=aod->GetTrack(k);
-    //cout<<"in loop"<<endl;
+    //cout<<"track n = "<<k<<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());
+    ((TH1F*)fChecks->FindObject("hTPCsig"))->Fill(pid->GetTPCsignal());
+    ((TH1F*)fChecks->FindObject("hTPCsigvsp"))->Fill(track->P(),pid->GetTPCsignal());
+    if (pid->GetTOFsignal()< 0) ((TH1F*)fChecks->FindObject("hTOFsig"))->Fill(-1);
+
     //check clusters of the tracks
     Int_t nclsTot=0,nclsSPD=0;
     
@@ -524,13 +725,13 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
        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++;
     }
@@ -540,51 +741,69 @@ 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);
 
+  // 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;
     AliAODRecoDecayHF2Prong *d = (AliAODRecoDecayHF2Prong*)inputArray->UncheckedAt(iD0toKpi);
-    Bool_t unsetvtx=kFALSE;
-    if(!d->GetOwnPrimaryVtx()) {
-      d->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
-      unsetvtx=kTRUE;
+
+    //check daughters
+    if(!(d->GetDaughter(0) || d->GetDaughter(1))) {
+      AliDebug(1,"at least one daughter not found!");
+      fNentries->Fill(6);
+      continue;
     }
+
+    // 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);
-   
-    if (TMath::Abs(eta0) < 0.9 && TMath::Abs(eta1) < 0.9) {
-      //apply cuts on tracks
+    */
+    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 (!isSelected) return;
-      if(fDebug>1) cout<<"tracks selected";
-
-      FillVarHists(d,mcArray,fCuts,fDistr);
-      FillMassHists(d,mcArray,fCuts,fOutputMass);
+      if(((AliAODTrack*)d->GetDaughter(0))->GetTPCNcls() < 70 || ((AliAODTrack*)d->GetDaughter(1))->GetTPCNcls() < 70) isSelected=kFALSE;
+      if (!isSelected) continue;
+      nSelectedtight++;
+      fNentries->Fill(7);       
+      if(fDebug>2) cout<<"tracks selected"<<endl;
+
+      Int_t ptbin=fCuts->PtBin(d->Pt());
+      if(ptbin==-1) {fNentries->Fill(5); continue;} //out of bounds
+      FillVarHists(aod,d,mcArray,fCuts,fDistr);
+      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);
-
-  cout<<"Other PostData"<<endl;
+  PostData(6,fCounter);
   return;
 }
 
 //____________________________________________________________________________
-void AliAnalysisTaskSED0Mass::FillVarHists(AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliRDHFCutsD0toKpi *cuts, TList *listout){
+void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Prong *part, TClonesArray *arrMC, AliRDHFCutsD0toKpi *cuts, TList *listout){
   //
   // function used in UserExec to fill variable histograms:
   //
@@ -605,36 +824,82 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODRecoDecayHF2Prong *part, TClone
   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(8);
+  if (isSelectedPID==1)fNentries->Fill(9);
+  if (isSelectedPID==2)fNentries->Fill(10);
+  if (isSelectedPID==3)fNentries->Fill(11);
+    //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;
     }
   }
 
+  Double_t invmasscut=0.03;
+
   TString fillthispi="",fillthisK="",fillthis="";
 
   Int_t ptbin=cuts->PtBin(part->Pt());
+
+
+  //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 vtxProp; vtxProp=NULL;
+    delete esdtrack1;
+    delete esdtrack2;
+  }
+
+  Double_t d0[2]={dz1[0],dz2[0]};
+  Double_t decl[2]={part->DecayLength(),part->NormalizedDecayLength()};
+  part->UnsetOwnPrimaryVtx();
+
   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)
+      //if(!vtxProp) fNentries->Fill(3);
       //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();
+      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
        
@@ -644,87 +909,138 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODRecoDecayHF2Prong *part, TClone
       fillthisK="hptKSnoMcut_";
       fillthisK+=ptbin;
 
-      if (TMath::Abs(pdgProng[0]) == 211 && TMath::Abs(pdgProng[1]) == 321){
+      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));
-      }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));
-       }
+      }
+
+      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);
       }
-      
+
       //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++){
          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_";
            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) {
+         if(TMath::Abs(pdgprong)==321 || !isPionHere[iprong]) {
            //cout<<"kappa"<<endl;
            
            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 ((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 ){
+         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="hd0d0S_";
+       fillthis="hdeclS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->DecayLength());
+
+       fillthis="hnormdeclS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(part->NormalizedDecayLength());
+
+       if(vtxProp) {
+         fillthis="hdeclvS_";
          fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
+         ((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
@@ -745,24 +1061,114 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODRecoDecayHF2Prong *part, TClone
       ((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";
+       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(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
        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));
+
+       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(12);
+           }
+           
+           if(TMath::Abs(pdgMother[iprong])==3122) { //Lambda
+             factor[iprong]=1./0.25;
+             fNentries->Fill(13);
+           }
+           fillthis="hd0moresB_";
+           fillthis+=ptbin;
+
+           ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(iprong),factor[iprong]);
+
+           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]);
+
+         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]);
+       }
+
+       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;
@@ -771,12 +1177,18 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODRecoDecayHF2Prong *part, TClone
        fillthis="hcosthetastarB_";
        fillthis+=ptbin;
        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());  
+       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());
@@ -784,15 +1196,32 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODRecoDecayHF2Prong *part, TClone
        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(decl[0]);
+
+         fillthis="hnormdeclvB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+       }
+      }//mass cut      
+    }//else (background)
   }
   return;
 }
 //____________________________________________________________________________
 
-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:
   //
@@ -800,28 +1229,53 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
 
   Double_t mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
 
-  Int_t isSelected=cuts->IsSelected(part,AliRDHFCuts::kCandidate); //selected
+  Int_t isSelected=cuts->IsSelected(part,AliRDHFCuts::kCandidate,aod); //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;
   }
 
-  cout<<"Candidate selected"<<endl;
+
+  if(fDebug>2)  cout<<"Candidate selected"<<endl;
 
   Double_t invmassD0 = part->InvMassD0(), invmassD0bar = part->InvMassD0bar();
   //printf("SELECTED\n");
   Int_t ptbin=cuts->PtBin(part->Pt());
 
   AliAODTrack *prong=(AliAODTrack*)part->GetDaughter(0);
-  if(!prong) cout<<"No daughter found";
+  if(!prong) {
+    AliDebug(2,"No daughter found");
+    return;
+  }
   else{
     if(prong->Charge()==1) {fTotPosPairs[ptbin]++;} else {fTotNegPairs[ptbin]++;}
   }
 
+  for(Int_t it=0;it<2;it++){
+    //fill TOFsig-kaontime
+    AliAODTrack* track=(AliAODTrack*)part->GetDaughter(it);
+    AliAODPid *pid = track->GetDetPid();
+    Double_t times[5];
+    pid->GetIntegratedTimes(times);
+    ((TH2F*)fChecks->FindObject("hTOFtimeKaonHyptimeAC"))->Fill(track->P(),pid->GetTOFsignal()-times[3]);
+  }
+
+  //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;
@@ -833,7 +1287,7 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
   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;
@@ -869,7 +1323,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");
@@ -905,6 +1359,57 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
 
   return;
 }
+
+//__________________________________________________________________________
+AliAODVertex* AliAnalysisTaskSED0Mass::GetPrimaryVtxSkipped(AliAODEvent *aodev,AliAODRecoDecayHF2Prong *d){
+  //Calculate the primary vertex w/o the daughter tracks of the candidate
+  
+  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();
+
+  AliESDVertex *vertexESD=0x0;
+  AliAODVertex *vertexAOD=0x0;
+  AliVertexerTracks *vertexer = new AliVertexerTracks(aodev->GetMagneticField());
+  
+  //
+  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*/)
 {
@@ -924,12 +1429,6 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
     return;
   }
  
-//   fNentries = dynamic_cast<TH1F*>(GetOutputData(3));
-//   if(!fNentries){
-//     printf("ERROR: fNEntries not available\n");
-//     return;
-//   }
-
   fNentries = dynamic_cast<TH1F*>(GetOutputData(3));
   
   if(!fNentries){
@@ -942,9 +1441,15 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
     printf("ERROR: fChecks not available\n");
     return;
   }
-  
-  if(fArray==1){
-    for(Int_t ipt=0;ipt<5;ipt++){ //change 5 in GetNPtBins when sure it is written and check
+  fCounter = dynamic_cast<AliNormalizationCounter*>(GetOutputData(6));    
+  if (!fCounter) {
+    printf("ERROR: fCounter 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){ 
       fLsNormalization = 2.*TMath::Sqrt(fTotPosPairs[ipt]*fTotNegPairs[ipt]); 
 
 
@@ -986,22 +1491,28 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
       }
     }
   }
-  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*)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();
-  //((TH1F*)fDistr->FindObject("nEntriesD0"))->Draw("htext0");
   fNentries->Draw("htext0");
 
+  // TCanvas *ccheck=new TCanvas(Form("cc%d",fArray),Form("cc%d",fArray));
+  // ccheck->cd();
+
   return;
 }