Fix (Chiara)
[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisTaskSED0Mass.cxx
index 0bab0e8..afd9f2c 100644 (file)
@@ -58,57 +58,56 @@ ClassImp(AliAnalysisTaskSED0Mass)
 //________________________________________________________________________
 AliAnalysisTaskSED0Mass::AliAnalysisTaskSED0Mass():
 AliAnalysisTaskSE(),
-fOutputMass(0),
-fDistr(0),
-fNentries(0), 
-fCuts(0),
-fArray(0),
-fReadMC(0),
-fCutOnDistr(0),
-fUsePid4Distr(0),
-fCounter(0),
-fNPtBins(1),
-fLsNormalization(1.),
-fFillOnlyD0D0bar(0),
-fDaughterTracks(),
-fIsSelectedCandidate(0),
-fFillVarHists(kTRUE)
+  fOutputMass(0),
+  fDistr(0),
+  fNentries(0), 
+  fCuts(0),
+  fArray(0),
+  fReadMC(0),
+  fCutOnDistr(0),
+  fUsePid4Distr(0),
+  fCounter(0),
+  fNPtBins(1),
+  fLsNormalization(1.),
+  fFillOnlyD0D0bar(0),
+  fDaughterTracks(),
+  fIsSelectedCandidate(0),
+  fFillVarHists(kTRUE),
+  fSys(0)
 {
   // Default constructor
 }
 
 //________________________________________________________________________
 AliAnalysisTaskSED0Mass::AliAnalysisTaskSED0Mass(const char *name,AliRDHFCutsD0toKpi* cuts):
-AliAnalysisTaskSE(name),
-fOutputMass(0), 
-fDistr(0),
-fNentries(0),
-fCuts(0),
-fArray(0),
-fReadMC(0),
-fCutOnDistr(0),
-fUsePid4Distr(0),
-fCounter(0),
-fNPtBins(1),
-fLsNormalization(1.),
-fFillOnlyD0D0bar(0),
-fDaughterTracks(),
-fIsSelectedCandidate(0),
-fFillVarHists(kTRUE)
+  AliAnalysisTaskSE(name),
+  fOutputMass(0), 
+  fDistr(0),
+  fNentries(0),
+  fCuts(0),
+  fArray(0),
+  fReadMC(0),
+  fCutOnDistr(0),
+  fUsePid4Distr(0),
+  fCounter(0),
+  fNPtBins(1),
+  fLsNormalization(1.),
+  fFillOnlyD0D0bar(0),
+  fDaughterTracks(),
+  fIsSelectedCandidate(0),
+  fFillVarHists(kTRUE),
+  fSys(0)
 {
   // Default constructor
 
   fNPtBins=cuts->GetNPtBins();
-  // fTotPosPairs=new Int_t[fNPtBins];
-  // fTotNegPairs=new Int_t[fNPtBins];
-  // for(Int_t i=0;i<fNPtBins;i++) {fTotPosPairs[i]=0; fTotNegPairs[i]=0;}
     
   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 (distributions)
-  DefineOutput(2,TList::Class());  //My private output
+  if(fFillVarHists) DefineOutput(2,TList::Class());  //My private output
   // Output slot #3 writes into a TH1F container (number of events)
   DefineOutput(3,TH1F::Class());  //My private output
   // Output slot #4 writes into a TList container (cuts)
@@ -120,7 +119,7 @@ fFillVarHists(kTRUE)
 //________________________________________________________________________
 AliAnalysisTaskSED0Mass::~AliAnalysisTaskSED0Mass()
 {
-   if (fOutputMass) {
+  if (fOutputMass) {
     delete fOutputMass;
     fOutputMass = 0;
   }
@@ -198,339 +197,453 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
     nameMassNocutsB+=i;
 
     //histograms of cut variable distributions
+    if(fFillVarHists){
+      if(fReadMC){
+       //  dca
+       namedistr="hdcaS_";
+       namedistr+=i;
+       TH1F *hdcaS = new TH1F(namedistr.Data(), "DCA distribution;dca [cm]",200,0.,0.1);
+       // impact parameter
+       namedistr="hd0piS_";
+       namedistr+=i;
+       TH1F *hd0piS = new TH1F(namedistr.Data(), "Impact parameter distribution (pions);d0(#pi) [cm]",200,-0.1,0.1);
+
+       namedistr="hd0KS_";
+       namedistr+=i;
+       TH1F *hd0KS = new TH1F(namedistr.Data(), "Impact parameter distribution (kaons);d0(K) [cm]",200,-0.1,0.1);
+       namedistr="hd0d0S_";
+       namedistr+=i;
+       TH1F *hd0d0S = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution;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^{2} distribution;Decay Length^{2} [cm]",200,0,0.015);
 
-    //  pT
-    namedistr="hptpiS_";
-    namedistr+=i;
-    TH1F *hptpiS = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
+       namedistr="hnormdeclS_";
+       namedistr+=i;
+       TH1F *hnormdeclengthS = new TH1F(namedistr.Data(), "Normalized Decay Length^{2} distribution;(Decay Length/Err)^{2} ",200,0,12.);
 
-    namedistr="hptKS_";
-    namedistr+=i;
-    TH1F *hptKS = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
+       namedistr="hdeclxyS_";
+       namedistr+=i;
+       TH1F* hdeclxyS=new TH1F(namedistr.Data(),"Decay Length XY distribution;Decay Length XY [cm]",200,0,0.15);
+       namedistr="hnormdeclxyS_";
+       namedistr+=i;
+       TH1F* hnormdeclxyS=new TH1F(namedistr.Data(),"Normalized decay Length XY distribution;Decay Length XY/Err",200,0,6.); 
 
-    namedistr="hptB_";
-    namedistr+=i;
-    TH1F *hptB = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
+       namedistr="hdeclxyd0d0S_";
+       namedistr+=i;
+       TH2F* hdeclxyd0d0S=new TH2F(namedistr.Data(),"Correlation decay Length XY - d_{0}#times d_{0};Decay Length XY [cm];d_{0}#times d_{0}[cm^{2}]",200,0,0.15,200,-0.001,0.001);
 
-    //  pT no mass cut
-    // namedistr="hptpiSnoMcut_";
-    // namedistr+=i;
-    // TH1F *hptpiSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
+       namedistr="hnormdeclxyd0d0S_";
+       namedistr+=i;
+       TH2F* hnormdeclxyd0d0S=new TH2F(namedistr.Data(),"Correlation normalized decay Length XY - d_{0}#times d_{0};Decay Length XY/Err;d_{0}#times d_{0}[cm^{2}]",200,0,6,200,-0.001,0.001);
 
-    // namedistr="hptKSnoMcut_";
-    // namedistr+=i;
-    // TH1F *hptKSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
+       //  costhetapoint
+       namedistr="hcosthetapointS_";
+       namedistr+=i;
+       TH1F *hcosthetapointS = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
 
-    // namedistr="hptB1prongnoMcut_";
-    // namedistr+=i;
-    // TH1F *hptB1pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
+       namedistr="hcosthetapointxyS_";
+       namedistr+=i;
+       TH1F *hcosthetapointxyS = new TH1F(namedistr.Data(), "cos#theta_{Point} XYdistribution;cos#theta_{Point}",300,0.,1.);
 
-    // namedistr="hptB2prongsnoMcut_";
-    // namedistr+=i;
-    // TH1F *hptB2pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
-    
-    // fDistr->Add(hptpiSnoMcut);
-    // fDistr->Add(hptKSnoMcut);
-    // fDistr->Add(hptB1pnoMcut);
-    // fDistr->Add(hptB2pnoMcut);
-
-
-    //  dca
-    namedistr="hdcaS_";
-    namedistr+=i;
-    TH1F *hdcaS = new TH1F(namedistr.Data(), "DCA distribution;dca [cm]",200,0.,0.1);
-    namedistr="hdcaB_";
-    namedistr+=i;
-    TH1F *hdcaB = new TH1F(namedistr.Data(), "DCA distribution;dca [cm]",200,0.,0.1);
-
-    //  costhetastar
-    namedistr="hcosthetastarS_";
-    namedistr+=i;
-    TH1F *hcosthetastarS = new TH1F(namedistr.Data(), "cos#theta* distribution;cos#theta*",200,-1.,1.);
-    namedistr="hcosthetastarB_";
-    namedistr+=i;
-    TH1F *hcosthetastarB = new TH1F(namedistr.Data(), "cos#theta* distribution;cos#theta*",200,-1.,1.);
-
-    // impact parameter
-    namedistr="hd0piS_";
-    namedistr+=i;
-    TH1F *hd0piS = new TH1F(namedistr.Data(), "Impact parameter distribution (pions);d0(#pi) [cm]",200,-0.1,0.1);
-
-    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 (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="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="hd0d0S_";
-    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;
-    TH1F *hd0d0B = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution;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.);
-
-   //  costhetapoint
-    namedistr="hcosthetapointS_";
-    namedistr+=i;
-    TH1F *hcosthetapointS = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
-    namedistr="hcosthetapointB_";
-    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);
-    namedistr="hcosthpointd0d0B_";
-    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);
-    fDistr->Add(hptKS);
-    fDistr->Add(hptB);
-
-    fDistr->Add(hdcaS);
-    fDistr->Add(hdcaB);
-
-    fDistr->Add(hd0piS);
-    fDistr->Add(hd0KS);
-    fDistr->Add(hd0B);
-    fDistr->Add(hd0p0B);
-    fDistr->Add(hd0p1B);
-    fDistr->Add(hd0moresB);
-
-    fDistr->Add(hd0d0S);
-    fDistr->Add(hd0d0B);
-    fDistr->Add(hd0d0moresB);
-
-    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(hcosthpointd0S);
-    fDistr->Add(hcosthpointd0B);
-
-    fDistr->Add(hcosthpointd0d0S);
-    fDistr->Add(hcosthpointd0d0B);
-
-    //histograms filled only when the secondary vertex is recalculated w/o the daughter tracks (as requested in the cut object)
-
-    if(fCuts->GetIsPrimaryWithoutDaughters()){
-      namedistr="hd0vmoresB_";
-      namedistr+=i;
-      TH1F *hd0vmoresB = new TH1F(namedistr.Data(), "Impact parameter distribution (both);d0 [cm]",200,-0.1,0.1);
+       TH1F* tmpMS = new TH1F(nameMassNocutsS.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,1.5648,2.1648); //range (MD0-300MeV, mD0 + 300MeV)
+       tmpMS->Sumw2();
 
-      namedistr="hd0d0vmoresB_";
-      namedistr+=i;
-      TH1F *hd0d0vmoresB = new TH1F(namedistr.Data(), "Impact parameter distribution (prong +);d0 [cm]",200,-0.001,0.001);
 
+       fDistr->Add(hdcaS);
+
+       fDistr->Add(hd0piS);
+       fDistr->Add(hd0KS);
+
+       fDistr->Add(hd0d0S);
+
+       fDistr->Add(hcosthetapointS);
+
+       fDistr->Add(hcosthetapointxyS);
+
+       fDistr->Add(hdeclengthS);
+
+       fDistr->Add(hnormdeclengthS);
 
-      namedistr="hd0vpiS_";
+       fDistr->Add(hdeclxyS);
+
+       fDistr->Add(hnormdeclxyS);
+
+       fDistr->Add(hdeclxyd0d0S);
+       fDistr->Add(hnormdeclxyd0d0S);
+
+       fDistr->Add(tmpMS);
+      }
+
+      //  dca
+      namedistr="hdcaB_";
       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);
+      TH1F *hdcaB = new TH1F(namedistr.Data(), "DCA distribution;dca [cm]",200,0.,0.1);
 
-      namedistr="hd0vKS_";
+      // impact parameter
+      namedistr="hd0B_";
       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_";
+      TH1F *hd0B = new TH1F(namedistr.Data(), "Impact parameter distribution (both);d0 [cm]",200,-0.1,0.1);
+      namedistr="hd0d0B_";
       namedistr+=i;
-      TH1F *hd0vB = new TH1F(namedistr.Data(), "Impact parameter distribution (vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
+      TH1F *hd0d0B = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution;d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
 
-      namedistr="hd0vp0B_";
+      //decay lenght
+      namedistr="hdeclB_";
       namedistr+=i;
-      TH1F *hd0vp0B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong + ** vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
+      TH1F *hdeclengthB = new TH1F(namedistr.Data(), "Decay Length^{2} distribution;Decay Length^{2} [cm^{2}]",200,0,0.015);
 
-      namedistr="hd0vp1B_";
+      namedistr="hnormdeclB_";
       namedistr+=i;
-      TH1F *hd0vp1B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong - ** vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
-
+      TH1F *hnormdeclengthB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;(Decay Length/Err)^{2} ",200,0,12.);
 
-      namedistr="hd0d0vS_";
+      namedistr="hdeclxyB_";
       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_";
+      TH1F* hdeclxyB=new TH1F(namedistr.Data(),"Decay Length XY distribution;Decay Length XY [cm]",200,0,0.15);
+      namedistr="hnormdeclxyB_";
       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);
+      TH1F* hnormdeclxyB=new TH1F(namedistr.Data(),"Normalized decay Length XY distribution;Decay Length XY/Err",200,0,6.); 
 
-      namedistr="hdeclvS_";
+      namedistr="hdeclxyd0d0B_";
       namedistr+=i;
-      TH1F *hdeclengthvS = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
+      TH2F* hdeclxyd0d0B=new TH2F(namedistr.Data(),"Correlation decay Length XY - d_{0}#times d_{0};Decay Length XY [cm];d_{0}#times d_{0}[cm^{2}]",200,0,0.15,200,-0.001,0.001);
 
-      namedistr="hdeclvB_";
+      namedistr="hnormdeclxyd0d0B_";
       namedistr+=i;
-      TH1F *hdeclengthvB = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
+      TH2F* hnormdeclxyd0d0B=new TH2F(namedistr.Data(),"Correlation normalized decay Length XY - d_{0}#times d_{0};Decay Length XY/Err;d_{0}#times d_{0}[cm^{2}]",200,0,6,200,-0.001,0.001);
 
-      namedistr="hnormdeclvS_";
+      //  costhetapoint
+      namedistr="hcosthetapointB_";
       namedistr+=i;
-      TH1F *hnormdeclengthvS = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
+      TH1F *hcosthetapointB = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
 
-      namedistr="hnormdeclvB_";
+      namedistr="hcosthetapointxyB_";
       namedistr+=i;
-      TH1F *hnormdeclengthvB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
+      TH1F *hcosthetapointxyB = new TH1F(namedistr.Data(), "cos#theta_{Point} XY distribution;cos#theta_{Point} XY",300,0.,1.);
+
+      TH1F* tmpMB = new TH1F(nameMassNocutsB.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,1.5648,2.1648); //range (MD0-300MeV, mD0 + 300MeV)
+      tmpMB->Sumw2();
+
 
+
+      fDistr->Add(hdcaB);
+
+      fDistr->Add(hd0B);
+
+      fDistr->Add(hd0d0B);
+
+      fDistr->Add(hcosthetapointB);
+
+      fDistr->Add(hcosthetapointxyB);
+
+      fDistr->Add(hdeclengthB);
+
+      fDistr->Add(hnormdeclengthB);
+
+      fDistr->Add(hdeclxyB);
+
+      fDistr->Add(hnormdeclxyB);
+
+      fDistr->Add(hdeclxyd0d0B);
+      fDistr->Add(hnormdeclxyd0d0B);
+
+      fDistr->Add(tmpMB);
+
+      //histograms filled only when the secondary vertex is recalculated w/o the daughter tracks (as requested in the cut object)
+
+      if(fCuts->GetIsPrimaryWithoutDaughters()){
+       if(fReadMC){
+         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="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="hdeclvS_";
+         namedistr+=i;
+         TH1F *hdeclengthvS = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
 
-      fDistr->Add(hd0vpiS);
-      fDistr->Add(hd0vKS);
-      fDistr->Add(hd0vB);
-      fDistr->Add(hd0vp0B);
-      fDistr->Add(hd0vp1B);
-      fDistr->Add(hd0vmoresB);
+         namedistr="hnormdeclvS_";
+         namedistr+=i;
+         TH1F *hnormdeclengthvS = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
 
-      fDistr->Add(hd0d0vS);
-      fDistr->Add(hd0d0vB);
-      fDistr->Add(hd0d0vmoresB);
+         fDistr->Add(hd0vpiS);
+         fDistr->Add(hd0vKS);
+         fDistr->Add(hd0d0vS);
+         fDistr->Add(hdeclengthvS);
+         fDistr->Add(hnormdeclengthvS);
 
-      fDistr->Add(hdeclengthvS);
-      fDistr->Add(hdeclengthvB);
+       }
 
-      fDistr->Add(hnormdeclengthvS);
-      fDistr->Add(hnormdeclengthvB);
-    }
+       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="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="hd0d0vB_";
+       namedistr+=i;
+       TH1F *hd0d0vB = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution (vtx w/o these tracks);d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
+
+       namedistr="hdeclvB_";
+       namedistr+=i;
+       TH1F *hdeclengthvB = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
+
+       namedistr="hnormdeclvB_";
+       namedistr+=i;
+       TH1F *hnormdeclengthvB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
+
+       fDistr->Add(hd0vB);
+       fDistr->Add(hd0vp0B);
+       fDistr->Add(hd0vp1B);
+       fDistr->Add(hd0vmoresB);
+
+       fDistr->Add(hd0d0vB);
+       fDistr->Add(hd0d0vmoresB);
+
+       fDistr->Add(hdeclengthvB);
+
+       fDistr->Add(hnormdeclengthvB);
+      }
+
+
+    }
     //histograms of invariant mass distributions
 
+
+    //MC signal
+    if(fReadMC){
+      TH1F* tmpSt = new TH1F(nameSgn.Data(), "D^{0} invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
+
+      TH1F *tmpSl=(TH1F*)tmpSt->Clone();
+      tmpSt->Sumw2();
+      tmpSl->Sumw2();
+
+      //Reflection: histo filled with D0Mass which pass the cut (also) as D0bar and with D0bar which pass (also) the cut as D0
+      TH1F* tmpRt = new TH1F(nameRfl.Data(), "Reflected signal invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
+      //TH1F *tmpRl=(TH1F*)tmpRt->Clone();
+      TH1F* tmpBt = new TH1F(nameBkg.Data(), "Background invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
+      //TH1F *tmpBl=(TH1F*)tmpBt->Clone();
+      tmpBt->Sumw2();
+      //tmpBl->Sumw2();
+      tmpRt->Sumw2();
+      //tmpRl->Sumw2();
+
+      fOutputMass->Add(tmpSt);
+      fOutputMass->Add(tmpRt);
+      fOutputMass->Add(tmpBt);
+
+    }
+
+    //mass
     TH1F* tmpMt = new TH1F(nameMass.Data(),"D^{0} invariant mass; M [GeV]; Entries",200,1.5648,2.1648);
-    TH1F *tmpMl=(TH1F*)tmpMt->Clone();
+    //TH1F *tmpMl=(TH1F*)tmpMt->Clone();
     tmpMt->Sumw2();
-    tmpMl->Sumw2();
+    //tmpMl->Sumw2();
+    //distribution w/o cuts large range
+    // TH1F* tmpMS = new TH1F(nameMassNocutsS.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,0.7,3.);
+
+    fOutputMass->Add(tmpMt);
 
-    //to compare with AliAnalysisTaskCharmFraction
-    // TH1F* tmpS27t = new TH1F(nameSgn27.Data(),"D^{0} invariant mass in M(D^{0}) +/- 27 MeV - MC; M [GeV]; Entries",200,1.5648,2.1648);
-    // TH1F *tmpS27l=(TH1F*)tmpS27t->Clone();
-    // tmpS27t->Sumw2();
-    // tmpS27l->Sumw2();
+    if(fSys==0){ //histograms filled only in pp to save time in PbPb
+      if(fFillVarHists){
+
+       if(fReadMC){
+         //  pT
+         namedistr="hptpiS_";
+         namedistr+=i;
+         TH1F *hptpiS = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
+       
+         namedistr="hptKS_";
+         namedistr+=i;
+         TH1F *hptKS = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
+
+         //  costhetastar
+         namedistr="hcosthetastarS_";
+         namedistr+=i;
+         TH1F *hcosthetastarS = new TH1F(namedistr.Data(), "cos#theta* distribution;cos#theta*",200,-1.,1.);
+
+         //pT no mass cut
+
+         namedistr="hptpiSnoMcut_";
+         namedistr+=i;
+         TH1F *hptpiSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
+
+         namedistr="hptKSnoMcut_";
+         namedistr+=i;
+         TH1F *hptKSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
+
+         fDistr->Add(hptpiS);
+         fDistr->Add(hptKS);
+         fDistr->Add(hcosthetastarS);
+
+         fDistr->Add(hptpiSnoMcut);
+         fDistr->Add(hptKSnoMcut);
+
+         //  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="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);
+
+         fDistr->Add(hcosthpointd0S);
+         fDistr->Add(hcosthpointd0d0S);
+
+         //to compare with AliAnalysisTaskCharmFraction
+         TH1F* tmpS27t = new TH1F(nameSgn27.Data(),"D^{0} invariant mass in M(D^{0}) +/- 27 MeV - MC; M [GeV]; Entries",200,1.5648,2.1648);
+         TH1F *tmpS27l=(TH1F*)tmpS27t->Clone();
+         tmpS27t->Sumw2();
+         tmpS27l->Sumw2();
  
-    //distribution w/o cuts
-    //   TH1F* tmpMS = new TH1F(nameMassNocutsS.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,0.7,3.);
-    TH1F* tmpMS = new TH1F(nameMassNocutsS.Data(),"D^{0} invariant mass; M [GeV]; Entries",300,1.5648,2.1648); //range (MD0-300MeV, mD0 + 300MeV)
-    TH1F *tmpMB=(TH1F*)tmpMS->Clone();
-    tmpMB->SetName(nameMassNocutsB.Data());
-    tmpMS->Sumw2();
-    tmpMB->Sumw2();
-
-    //MC signal and background
-    TH1F* tmpSt = new TH1F(nameSgn.Data(), "D^{0} invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
-    TH1F *tmpSl=(TH1F*)tmpSt->Clone();
-    tmpSt->Sumw2();
-    tmpSl->Sumw2();
-
-    TH1F* tmpBt = new TH1F(nameBkg.Data(), "Background invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
-    TH1F *tmpBl=(TH1F*)tmpBt->Clone();
-    tmpBt->Sumw2();
-    tmpBl->Sumw2();
-
-    //Reflection: histo filled with D0Mass which pass the cut (also) as D0bar and with D0bar which pass (also) the cut as D0
-    TH1F* tmpRt = new TH1F(nameRfl.Data(), "Reflected signal invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
-    TH1F *tmpRl=(TH1F*)tmpRt->Clone();
-    tmpRt->Sumw2();
-    tmpRl->Sumw2();
-  //  printf("Created histograms %s\t%s\t%s\t%s\n",tmpM->GetName(),tmpS->GetName(),tmpB->GetName(),tmpR->GetName());
+         fOutputMass->Add(tmpS27t);
+         fOutputMass->Add(tmpS27l);
 
-    fOutputMass->Add(tmpMt);
-    fOutputMass->Add(tmpSt);
-    //    fOutputMass->Add(tmpS27t);
-    fOutputMass->Add(tmpBt);
-    fOutputMass->Add(tmpRt);
+       }
+
+       //  pT
+       namedistr="hptB_";
+       namedistr+=i;
+       TH1F *hptB = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
+
+       //  costhetastar
+       namedistr="hcosthetastarB_";
+       namedistr+=i;
+       TH1F *hcosthetastarB = new TH1F(namedistr.Data(), "cos#theta* distribution;cos#theta*",200,-1.,1.);
+
+       //pT no mass cut
+       namedistr="hptB1prongnoMcut_";
+       namedistr+=i;
+       TH1F *hptB1pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
+
+       namedistr="hptB2prongsnoMcut_";
+       namedistr+=i;
+       TH1F *hptB2pnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
+    
+       fDistr->Add(hptB);
+       fDistr->Add(hcosthetastarB);
+
+       fDistr->Add(hptB1pnoMcut);
+       fDistr->Add(hptB2pnoMcut);
+
+       //impact parameter of negative/positive track
+       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);
+
+       //impact parameter corrected for strangeness
+       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="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="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="hcosthpointd0d0B_";
+       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(hd0p0B);
+       fDistr->Add(hd0p1B);
 
-    fDistr->Add(tmpMS);
-    fDistr->Add(tmpMB);
+       fDistr->Add(hd0moresB);
+       fDistr->Add(hd0d0moresB);
+       fDistr->Add(hcosthetapointmoresB);
 
 
+       fDistr->Add(hcosthpointd0B);
+
+
+       fDistr->Add(hcosthpointd0d0B);
+      }
+
+    } //end pp histo
   }
 
+
+  //for Like sign analysis
+
   if(fArray==1){
     namedistr="hpospair";
-    TH1F* hpospair=new TH1F(namedistr.Data(),"Number of positive pairs",2*fCuts->GetNPtBins(),-0.5,fCuts->GetNPtBins()-0.5);
+    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,2*fCuts->GetNPtBins()-0.5);
-    fDistr->Add(hpospair);
-    fDistr->Add(hnegpair);
+    TH1F* hnegpair=new TH1F(namedistr.Data(),"Number of negative pairs",fCuts->GetNPtBins(),-0.5,fCuts->GetNPtBins()-0.5);
+    fOutputMass->Add(hpospair);
+    fOutputMass->Add(hnegpair);
   }
 
   const char* nameoutput=GetOutputSlot(3)->GetContainer()->GetName();
 
-  fNentries=new TH1F(nameoutput, "Integral(1,2) = number of AODs *** Integral(2,3) = number of candidates selected with cuts *** Integral(3,4) = number of D0 selected with cuts *** Integral(4,5) = events with good vertex ***  Integral(5,6) = pt out of bounds", 15,-0.5,14.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", 16,-0.5,15.5);
 
   fNentries->GetXaxis()->SetBinLabel(1,"nEventsAnal");
   fNentries->GetXaxis()->SetBinLabel(2,"nCandSel(Cuts)");
-  fNentries->GetXaxis()->SetBinLabel(3,"nD0Selected");
+  if(fReadMC) fNentries->GetXaxis()->SetBinLabel(3,"nD0Selected");
+  else fNentries->GetXaxis()->SetBinLabel(3,"Dstar<-D0");
   fNentries->GetXaxis()->SetBinLabel(4,"nEventsGoodVtxS");
   fNentries->GetXaxis()->SetBinLabel(5,"ptbin = -1");
   fNentries->GetXaxis()->SetBinLabel(6,"no daughter");
-  fNentries->GetXaxis()->SetBinLabel(7,"nCandSel(Tr)");
-  fNentries->GetXaxis()->SetBinLabel(8,"PID=0");
-  fNentries->GetXaxis()->SetBinLabel(9,"PID=1");
-  fNentries->GetXaxis()->SetBinLabel(10,"PID=2");
-  fNentries->GetXaxis()->SetBinLabel(11,"PID=3");
-  fNentries->GetXaxis()->SetBinLabel(12,"K");
-  fNentries->GetXaxis()->SetBinLabel(13,"Lambda");
+  if(fSys==0) fNentries->GetXaxis()->SetBinLabel(7,"nCandSel(Tr)");
+  if(fFillVarHists){
+    fNentries->GetXaxis()->SetBinLabel(8,"PID=0");
+    fNentries->GetXaxis()->SetBinLabel(9,"PID=1");
+    fNentries->GetXaxis()->SetBinLabel(10,"PID=2");
+    fNentries->GetXaxis()->SetBinLabel(11,"PID=3");
+  }
+  if(fReadMC && fSys==0){
+    fNentries->GetXaxis()->SetBinLabel(12,"K");
+    fNentries->GetXaxis()->SetBinLabel(13,"Lambda");
+  }
   fNentries->GetXaxis()->SetBinLabel(14,"Pile-up Rej");
   fNentries->GetXaxis()->SetBinLabel(15,"N. of 0SMH");
+  if(fSys==1) fNentries->GetXaxis()->SetBinLabel(16,"Nev in centr");
   fNentries->GetXaxis()->SetNdivisions(1,kFALSE);
 
   fCounter = new AliNormalizationCounter(Form("%s",GetOutputSlot(5)->GetContainer()->GetName()));
 
   // Post the data
   PostData(1,fOutputMass);
-  PostData(2,fDistr);
+  if(fFillVarHists) PostData(2,fDistr);
   PostData(3,fNentries);
   PostData(5,fCounter);  
   return;
@@ -544,16 +657,16 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   //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]);
+  //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());
@@ -632,6 +745,7 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   if(!fCuts->IsEventSelected(aod)) {
     if(fCuts->GetWhyRejection()==1) // rejected for pileup
       fNentries->Fill(13);
+    if(fSys==1 && (fCuts->GetWhyRejection()==2 || fCuts->GetWhyRejection()==3)) fNentries->Fill(15);
     return;
   }
   
@@ -640,7 +754,7 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
 
   Bool_t isGoodVtx=kFALSE;
 
-   //vtx1->Print();
+  //vtx1->Print();
   TString primTitle = vtx1->GetTitle();
   if(primTitle.Contains("VertexerTracks") && vtx1->GetNContributors()>0) {
     isGoodVtx=kTRUE;
@@ -655,50 +769,55 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   // 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);
+    if(d->GetSelectionMap()) if(!d->HasSelectionBit(AliRDHFCuts::kD0toKpiCuts)){
+       fNentries->Fill(2);     
+       continue; //skip the D0 from Dstar
+      }
 
-
-    Bool_t unsetvtx=kFALSE;
-    if(!d->GetOwnPrimaryVtx()) {
-      d->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
-      unsetvtx=kTRUE;
-    }
+    // Bool_t unsetvtx=kFALSE;
+    // if(!d->GetOwnPrimaryVtx()) {
+    //   d->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
+    //   unsetvtx=kTRUE;
+    // }
   
     
     if ( fCuts->IsInFiducialAcceptance(d->Pt(),d->Y(421)) ) {
       nSelectedloose++;
       nSelectedtight++;      
-      fNentries->Fill(6);       
+      if(fSys==0){
+       if(fCuts->IsSelected(d,AliRDHFCuts::kTracks,aod))fNentries->Fill(6);       
+      }
       Int_t ptbin=fCuts->PtBin(d->Pt());
       if(ptbin==-1) {fNentries->Fill(4); continue;} //out of bounds
       fIsSelectedCandidate=fCuts->IsSelected(d,AliRDHFCuts::kCandidate,aod); //selected
       if(fFillVarHists) {
-       if(!fCutOnDistr || (fCutOnDistr && fIsSelectedCandidate)) {
-         fDaughterTracks.AddAt((AliAODTrack*)d->GetDaughter(0),0);
-         fDaughterTracks.AddAt((AliAODTrack*)d->GetDaughter(1),1);
-         //check daughters
-         if(!fDaughterTracks.UncheckedAt(0) || !fDaughterTracks.UncheckedAt(1)) {
-           AliDebug(1,"at least one daughter not found!");
-           fNentries->Fill(5);
-           fDaughterTracks.Clear();
-           continue;
-         }
+       //if(!fCutOnDistr || (fCutOnDistr && fIsSelectedCandidate)) {
+       fDaughterTracks.AddAt((AliAODTrack*)d->GetDaughter(0),0);
+       fDaughterTracks.AddAt((AliAODTrack*)d->GetDaughter(1),1);
+       //check daughters
+       if(!fDaughterTracks.UncheckedAt(0) || !fDaughterTracks.UncheckedAt(1)) {
+         AliDebug(1,"at least one daughter not found!");
+         fNentries->Fill(5);
+         fDaughterTracks.Clear();
+         continue;
        }
+       //}
        FillVarHists(aod,d,mcArray,fCuts,fDistr);
       }
+
       FillMassHists(d,mcArray,fCuts,fOutputMass);
     }
   
     fDaughterTracks.Clear();
-    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);
+  if(fFillVarHists) PostData(2,fDistr);
   PostData(3,fNentries);
   PostData(5,fCounter);
   return;
@@ -715,14 +834,15 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
   Int_t lab=-9999;
   if(fReadMC) lab=part->MatchToMC(421,arrMC,2,pdgDgD0toKpi); //return MC particle label if the array corresponds to a D0, -1 if not (cf. AliAODRecoDecay.cxx)
   //Double_t pt = d->Pt(); //mother pt
-  Int_t isSelectedPID=cuts->IsSelectedPID(part); //0 rejected,1 D0,2 Dobar, 3 both
+  Int_t isSelectedPID=3;
+  if(!fReadMC || (fReadMC && fUsePid4Distr)) isSelectedPID=cuts->IsSelectedPID(part); //0 rejected,1 D0,2 Dobar, 3 both
   if (isSelectedPID==0)fNentries->Fill(7);
   if (isSelectedPID==1)fNentries->Fill(8);
   if (isSelectedPID==2)fNentries->Fill(9);
   if (isSelectedPID==3)fNentries->Fill(10);
-    //fNentries->Fill(8+isSelectedPID);
+  //fNentries->Fill(8+isSelectedPID);
 
-  if(fCutOnDistr && !fIsSelectedCandidate) return;
+  if(fCutOnDistr && !fIsSelectedCandidate) return; 
   //printf("\nif no cuts or cuts passed\n");
 
 
@@ -773,8 +893,8 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
     d0[0]=dz1[0];
     d0[1]=dz2[0];
 
-    decl[0]=part->DecayLength();
-    decl[1]=part->NormalizedDecayLength();
+    decl[0]=part->DecayLength2();
+    decl[1]=part->NormalizedDecayLength2();
     part->UnsetOwnPrimaryVtx();
   
   }
@@ -782,147 +902,201 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
   Double_t cosThetaStarD0 = 99;
   Double_t cosThetaStarD0bar = 99;
   Double_t cosPointingAngle = 99;
-  Double_t normalizedDecayLength = -1;
-  Double_t decayLength = -1;
+  Double_t normalizedDecayLength2 = -1, normalizedDecayLengthxy=-1;
+  Double_t decayLength2 = -1, decayLengthxy=-1;
   Double_t ptProng[2]={-99,-99};
-
+  Double_t d0Prong[2]={-99,-99};
   
 
-    //disable the PID
-    if(!fUsePid4Distr) isSelectedPID=0;
-    if((lab>=0 && fReadMC) || (!fReadMC && isSelectedPID)){ //signal (from MC or PID)
+  //disable the PID
+  if(!fUsePid4Distr) isSelectedPID=0;
+  if((lab>=0 && fReadMC) || (!fReadMC && isSelectedPID)){ //signal (from MC or PID)
    
-      //check pdg of the prongs
-      AliAODTrack *prong0=(AliAODTrack*)fDaughterTracks.UncheckedAt(0);
-      AliAODTrack *prong1=(AliAODTrack*)fDaughterTracks.UncheckedAt(1);
-      if(!prong0 || !prong1) {
-       return;
-      }
-      Int_t labprong[2];
-      if(fReadMC){
-       labprong[0]=prong0->GetLabel();
-       labprong[1]=prong1->GetLabel();
-      }
-      AliAODMCParticle *mcprong=0;
-      Int_t pdgProng[2]={0,0};
+    //check pdg of the prongs
+    AliAODTrack *prong0=(AliAODTrack*)fDaughterTracks.UncheckedAt(0);
+    AliAODTrack *prong1=(AliAODTrack*)fDaughterTracks.UncheckedAt(1);
 
-      for (Int_t iprong=0;iprong<2;iprong++){
-       if(fReadMC && labprong[iprong]>=0) {
-         mcprong= (AliAODMCParticle*)arrMC->At(labprong[iprong]);
-         pdgProng[iprong]=mcprong->GetPdgCode();
-       }
+    if(!prong0 || !prong1) {
+      return;
+    }
+    Int_t labprong[2];
+    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(fReadMC && labprong[iprong]>=0) {
+       mcprong= (AliAODMCParticle*)arrMC->At(labprong[iprong]);
+       pdgProng[iprong]=mcprong->GetPdgCode();
       }
+    }
     
-
+    if(fSys==0){
       //no mass cut ditributions: ptbis
        
-      // fillthispi="hptpiSnoMcut_";
-      // fillthispi+=ptbin;
-
-      // fillthisK="hptKSnoMcut_";
-      // fillthisK+=ptbin;
-
-      // if ((TMath::Abs(pdgProng[0]) == 211 && TMath::Abs(pdgProng[1]) == 321)
-      //     || (isSelectedPID==1 || isSelectedPID==3)){
-      //       ((TH1F*)listout->FindObject(fillthispi))->Fill(ptProng[0]);
-      //       ((TH1F*)listout->FindObject(fillthisK))->Fill(ptProng[1]);
-      // }
-
-      // if ((TMath::Abs(pdgProng[0]) == 321 && TMath::Abs(pdgProng[1]) == 211)
-      //     || (isSelectedPID==2 || isSelectedPID==3)){
-      //       ((TH1F*)listout->FindObject(fillthisK))->Fill(ptProng[0]);
-      //       ((TH1F*)listout->FindObject(fillthispi))->Fill(ptProng[1]);
-      // }
-      
-      //no mass cut ditributions: mass
-      fillthis="hMassS_";
-      fillthis+=ptbin;
-      
-      if ((fReadMC && ((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421)
-         || (!fReadMC && (isSelectedPID==1 || isSelectedPID==3))){//D0
-       ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0);
+      fillthispi="hptpiSnoMcut_";
+      fillthispi+=ptbin;
+
+      fillthisK="hptKSnoMcut_";
+      fillthisK+=ptbin;
+
+      if ((TMath::Abs(pdgProng[0]) == 211 && TMath::Abs(pdgProng[1]) == 321)
+         || (isSelectedPID==1 || isSelectedPID==3)){
+       ((TH1F*)listout->FindObject(fillthispi))->Fill(prong0->Pt());
+       ((TH1F*)listout->FindObject(fillthisK))->Fill(prong1->Pt());
       }
-      else { //D0bar
-       if(fReadMC || (!fReadMC && isSelectedPID > 1))
-       ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0bar);
+
+      if ((TMath::Abs(pdgProng[0]) == 321 && TMath::Abs(pdgProng[1]) == 211)
+         || (isSelectedPID==2 || isSelectedPID==3)){
+       ((TH1F*)listout->FindObject(fillthisK))->Fill(prong0->Pt());
+       ((TH1F*)listout->FindObject(fillthispi))->Fill(prong1->Pt());
       }
+    }
 
-      //apply cut on invariant mass on the pair
-      if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
+    //no mass cut ditributions: mass
+    fillthis="hMassS_";
+    fillthis+=ptbin;
+      
+    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);
+    }
 
-       cosThetaStarD0 = part->CosThetaStarD0();
-       cosThetaStarD0bar = part->CosThetaStarD0bar();
-       cosPointingAngle = part->CosPointingAngle();
-       normalizedDecayLength = part->NormalizedDecayLength();
-       decayLength = part->DecayLength();
-       ptProng[0]=part->PtProng(0); ptProng[1]=part->PtProng(1);
-       
-       if(fArray==1) cout<<"LS signal: ERROR"<<endl;
-       for (Int_t iprong=0; iprong<2; iprong++){
-         AliAODTrack *prong=(AliAODTrack*)fDaughterTracks.UncheckedAt(iprong);
-         if (fReadMC) labprong[iprong]=prong->GetLabel();
+    //apply cut on invariant mass on the pair
+    if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
+
+      cosThetaStarD0 = part->CosThetaStarD0();
+      cosThetaStarD0bar = part->CosThetaStarD0bar();
+      cosPointingAngle = part->CosPointingAngle();
+      normalizedDecayLength2 = part->NormalizedDecayLength2();
+      decayLength2 = part->DecayLength2();
+      decayLengthxy = part->DecayLengthXY();
+      normalizedDecayLengthxy=decayLengthxy/part->DecayLengthXYError();
+
+      ptProng[0]=prong0->Pt(); ptProng[1]=prong1->Pt();
+      d0Prong[0]=part->Getd0Prong(0); d0Prong[1]=part->Getd0Prong(1);
+
+      if(fArray==1) cout<<"LS signal: ERROR"<<endl;
+      for (Int_t iprong=0; iprong<2; iprong++){
+       AliAODTrack *prong=(AliAODTrack*)fDaughterTracks.UncheckedAt(iprong);
+       if (fReadMC) labprong[iprong]=prong->GetLabel();
          
-         //cout<<"prong name = "<<prong->GetName()<<" label = "<<prong->GetLabel()<<endl;
-         Int_t pdgprong=0;
-         if(fReadMC && labprong[iprong]>=0) {
-           mcprong= (AliAODMCParticle*)arrMC->At(labprong[iprong]);
-           pdgprong=mcprong->GetPdgCode();
-         }
+       //cout<<"prong name = "<<prong->GetName()<<" label = "<<prong->GetLabel()<<endl;
+       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};
+       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;
-           
+       if(TMath::Abs(pdgprong)==211 || isPionHere[iprong]) {
+         //cout<<"pi"<<endl;
+          
+         if(fSys==0){ 
            fillthispi="hptpiS_";
            fillthispi+=ptbin;
            ((TH1F*)listout->FindObject(fillthispi))->Fill(ptProng[iprong]);
-           fillthispi="hd0piS_";
-           fillthispi+=ptbin;
-           ((TH1F*)listout->FindObject(fillthispi))->Fill(part->Getd0Prong(iprong));
-           if(recalcvtx) {
-
-             fillthispi="hd0vpiS_";
-             fillthispi+=ptbin;
-             ((TH1F*)listout->FindObject(fillthispi))->Fill(d0[iprong]);
-           }
+         }
+         fillthispi="hd0piS_";
+         fillthispi+=ptbin;
+         ((TH1F*)listout->FindObject(fillthispi))->Fill(d0Prong[iprong]);
+         if(recalcvtx) {
 
+           fillthispi="hd0vpiS_";
+           fillthispi+=ptbin;
+           ((TH1F*)listout->FindObject(fillthispi))->Fill(d0[iprong]);
          }
+
+       }
          
-         if(TMath::Abs(pdgprong)==321 || !isPionHere[iprong]) {
-           //cout<<"kappa"<<endl;
-           
+       if(TMath::Abs(pdgprong)==321 || !isPionHere[iprong]) {
+         //cout<<"kappa"<<endl;
+         if(fSys==0){
            fillthisK="hptKS_";
            fillthisK+=ptbin;
            ((TH1F*)listout->FindObject(fillthisK))->Fill(ptProng[iprong]);
-           fillthisK="hd0KS_";
+         }
+         fillthisK="hd0KS_";
+         fillthisK+=ptbin;
+         ((TH1F*)listout->FindObject(fillthisK))->Fill(d0Prong[iprong]);
+         if (recalcvtx){
+           fillthisK="hd0vKS_";
            fillthisK+=ptbin;
-           ((TH1F*)listout->FindObject(fillthisK))->Fill(part->Getd0Prong(iprong));
-           if (recalcvtx){
-             fillthisK="hd0vKS_";
-             fillthisK+=ptbin;
-             ((TH1F*)listout->FindObject(fillthisK))->Fill(d0[iprong]);
-           }
+           ((TH1F*)listout->FindObject(fillthisK))->Fill(d0[iprong]);
          }
+       }
 
+       if(fSys==0){
          fillthis="hcosthpointd0S_";
          fillthis+=ptbin;        
-         ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Getd0Prong(iprong));
+         ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,d0Prong[iprong]);
+       }
+      } //end loop on prongs
 
-       } //end loop on prongs
+      fillthis="hdcaS_";
+      fillthis+=ptbin;   
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
 
-       fillthis="hdcaS_";
-       fillthis+=ptbin;          
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
+      fillthis="hcosthetapointS_";
+      fillthis+=ptbin;   
+      ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle);
 
-       fillthis="hcosthetapointS_";
-       fillthis+=ptbin;          
-       ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle);
+      fillthis="hcosthetapointxyS_";
+      fillthis+=ptbin;   
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngleXY());
 
-       fillthis="hcosthpointd0d0S_";
-       fillthis+=ptbin;          
-       ((TH2F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Prodd0d0());
-         
+
+      fillthis="hd0d0S_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
+
+      fillthis="hdeclS_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength2);
+
+      fillthis="hnormdeclS_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLength2);
+
+      fillthis="hdeclxyS_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(decayLengthxy);
+
+      fillthis="hnormdeclxyS_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy);
+
+      fillthis="hdeclxyd0d0S_";
+      fillthis+=ptbin;
+      ((TH2F*)listout->FindObject(fillthis))->Fill(decayLengthxy,d0Prong[0]*d0Prong[1]);
+
+      fillthis="hnormdeclxyd0d0S_";
+      fillthis+=ptbin;
+      ((TH2F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy,d0Prong[0]*d0Prong[1]);
+
+      if(recalcvtx) {
+       fillthis="hdeclvS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
+
+       fillthis="hnormdeclvS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+
+       fillthis="hd0d0vS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
+      }
+
+      if(fSys==0){
        fillthis="hcosthetastarS_";
        fillthis+=ptbin;
        if ((fReadMC && ((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421)) ((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0);
@@ -930,118 +1104,92 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
          if (fReadMC || isSelectedPID>1)((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0bar);
          if(isSelectedPID==1 || isSelectedPID==3)((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0);
        }
-       fillthis="hd0d0S_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
-
-       if(recalcvtx){
-         fillthis="hd0d0vS_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
-       }
-
-       fillthis="hdeclS_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength);
-
-       fillthis="hnormdeclS_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLength);
 
-       if(recalcvtx) {
-         fillthis="hdeclvS_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
+       fillthis="hcosthpointd0d0S_";
+       fillthis+=ptbin;          
+       ((TH2F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Prodd0d0());
+      }
 
-         fillthis="hnormdeclvS_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
-       }
-      } //end mass cut
+    } //end mass cut
     
-    } else{ //Background or LS
-      //if(!fReadMC){
-      //cout<<"is background"<<endl;
+  } else{ //Background or LS
+    //if(!fReadMC){
+    //cout<<"is background"<<endl;
      
-      //no mass cut distributions: mass, ptbis
-      fillthis="hMassB_";
-      fillthis+=ptbin;
-      
-      if (!fCutOnDistr || (fCutOnDistr && (fIsSelectedCandidate==1 || fIsSelectedCandidate==3))) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0);
-      if (!fCutOnDistr || (fCutOnDistr && fIsSelectedCandidate>1)) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0bar);
+    //no mass cut distributions: mass, ptbis
+    fillthis="hMassB_";
+    fillthis+=ptbin;
 
-      // fillthis="hptB1prongnoMcut_";
-      // fillthis+=ptbin;
+    if (!fCutOnDistr || (fCutOnDistr && (fIsSelectedCandidate==1 || fIsSelectedCandidate==3))) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0);
+    if (!fCutOnDistr || (fCutOnDistr && fIsSelectedCandidate>1)) ((TH1F*)listout->FindObject(fillthis))->Fill(minvD0bar);
+    if(fSys==0){
+      fillthis="hptB1prongnoMcut_";
+      fillthis+=ptbin;
       
-      // ((TH1F*)listout->FindObject(fillthis))->Fill(ptProng[0]);
+      ((TH1F*)listout->FindObject(fillthis))->Fill(((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt());
       
-      // fillthis="hptB2prongsnoMcut_";
-      // fillthis+=ptbin;
-      // ((TH1F*)listout->FindObject(fillthis))->Fill(ptProng[0]);
-      // ((TH1F*)listout->FindObject(fillthis))->Fill(ptProng[1]);
-
-      //apply cut on invariant mass on the pair
-      if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
-
+      fillthis="hptB2prongsnoMcut_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt());
+      ((TH1F*)listout->FindObject(fillthis))->Fill(((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt());
+    }
+    //apply cut on invariant mass on the pair
+    if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
+      if(fSys==0){
+       ptProng[0]=((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt(); ptProng[1]=((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt();
        cosThetaStarD0 = part->CosThetaStarD0();
        cosThetaStarD0bar = part->CosThetaStarD0bar();
-       cosPointingAngle = part->CosPointingAngle();
-       normalizedDecayLength = part->NormalizedDecayLength();
-       decayLength = part->DecayLength();
-       ptProng[0]=part->PtProng(0); ptProng[1]=part->PtProng(1);
+      }
 
+      cosPointingAngle = part->CosPointingAngle();
+      normalizedDecayLength2 = part->NormalizedDecayLength2();
+      decayLength2 = part->DecayLength2();
+      decayLengthxy = part->DecayLengthXY();
+      normalizedDecayLengthxy=decayLengthxy/part->DecayLengthXYError();
+      d0Prong[0]=part->Getd0Prong(0); d0Prong[1]=part->Getd0Prong(1);
 
-       AliAODTrack *prongg=(AliAODTrack*)fDaughterTracks.UncheckedAt(0);
-       if(!prongg) {
-         if(fDebug>2) cout<<"No daughter found";
-         return;
-       }
-       else{
-         if(fArray==1){
-           if(prongg->Charge()==1) {
-             //fTotPosPairs[ptbin]++;
-             ((TH1F*)fDistr->FindObject("hpospair"))->Fill(ptbin);
-           } else {
-             //fTotNegPairs[ptbin]++;
-             ((TH1F*)fDistr->FindObject("hnegpair"))->Fill(ptbin);
-           }
+
+      AliAODTrack *prongg=(AliAODTrack*)fDaughterTracks.UncheckedAt(0);
+      if(!prongg) {
+       if(fDebug>2) cout<<"No daughter found";
+       return;
+      }
+      else{
+       if(fArray==1){
+         if(prongg->Charge()==1) {
+           //fTotPosPairs[ptbin]++;
+           ((TH1F*)fOutputMass->FindObject("hpospair"))->Fill(ptbin);
+         } else {
+           //fTotNegPairs[ptbin]++;
+           ((TH1F*)fOutputMass->FindObject("hnegpair"))->Fill(ptbin);
          }
        }
+      }
        
-       //normalise pt distr to half afterwards
-       fillthis="hptB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(ptProng[0]);
-       ((TH1F*)listout->FindObject(fillthis))->Fill(ptProng[1]);
+      fillthis="hd0B_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[0]);
+      ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[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};
 
-       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*)fDaughterTracks.UncheckedAt(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();
-               }
+       for(Int_t iprong=0;iprong<2;iprong++){
+         AliAODTrack *prong=(AliAODTrack*)fDaughterTracks.UncheckedAt(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();
              }
            }
+         }
+
+         if(fSys==0){
 
            fillthis="hd0moresB_";
            fillthis+=ptbin;
@@ -1059,31 +1207,65 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
            fillthis="hd0moresB_";
            fillthis+=ptbin;
 
-           ((TH1F*)listout->FindObject(fillthis))->Fill(part->Getd0Prong(iprong),factor[iprong]);
+           ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[iprong],factor[iprong]);
 
            if(recalcvtx){
              fillthis="hd0vmoresB_";
              fillthis+=ptbin;
              ((TH1F*)listout->FindObject(fillthis))->Fill(d0[iprong],factor[iprong]);
            }
-
          }
+       } //loop on prongs
 
+       if(fSys==0){
          fillthis="hd0d0moresB_";
          fillthis+=ptbin;
          ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0(),factor[0]*factor[1]);
 
+         fillthis="hcosthetapointmoresB_";
+         fillthis+=ptbin;
+         ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,factor[0]*factor[1]);
+
          if(recalcvtx){
            fillthis="hd0d0vmoresB_";
            fillthis+=ptbin;
            ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1],factor[0]*factor[1]);
          }
-         fillthis="hcosthetapointmoresB_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,factor[0]*factor[1]);
        }
+      } //readMC
+
+      if(fSys==0){         
+       //normalise pt distr to half afterwards
+       fillthis="hptB_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(ptProng[0]);
+       ((TH1F*)listout->FindObject(fillthis))->Fill(ptProng[1]);
+
+       fillthis="hcosthetastarB_";
+       fillthis+=ptbin;
+       if (!fCutOnDistr || (fCutOnDistr && (fIsSelectedCandidate==1 || fIsSelectedCandidate==3)))((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0);
+       if (!fCutOnDistr || (fCutOnDistr && fIsSelectedCandidate>1))((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0bar);    
+
+
+       fillthis="hd0p0B_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[0]);
+       fillthis="hd0p1B_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[1]);
+       
+       fillthis="hcosthpointd0d0B_";
+       fillthis+=ptbin;
+       ((TH2F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Prodd0d0());
+       
+       fillthis="hcosthpointd0B_";
+       fillthis+=ptbin;          
+       ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,d0Prong[0]);
+       ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,d0Prong[1]);
+         
 
        if(recalcvtx){
+
          fillthis="hd0vp0B_";
          fillthis+=ptbin;
          ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]);
@@ -1095,62 +1277,71 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
          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(cosPointingAngle,part->Getd0Prong(0));
-       ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Getd0Prong(1));
+       }
 
+      }  
 
-       fillthis="hdcaB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
+      fillthis="hdcaB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
 
-       fillthis="hcosthetastarB_";
-       fillthis+=ptbin;
-       if (!fCutOnDistr || (fCutOnDistr && (fIsSelectedCandidate==1 || fIsSelectedCandidate==3)))((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0);
-       if (!fCutOnDistr || (fCutOnDistr && fIsSelectedCandidate>1))((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0bar);    
+      fillthis="hd0d0B_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[0]*d0Prong[1]);
 
-       fillthis="hd0d0B_";
+      if(recalcvtx){
+       fillthis="hd0d0vB_";
        fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
+       ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
+      }
 
-       if(recalcvtx){
-         fillthis="hd0d0vB_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
-       }
+      fillthis="hcosthetapointB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle);
 
-       fillthis="hcosthetapointB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle);
+      fillthis="hcosthetapointxyB_";
+      fillthis+=ptbin;   
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngleXY());
 
-       fillthis="hcosthpointd0d0B_";
-       fillthis+=ptbin;
-       ((TH2F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Prodd0d0());
+      fillthis="hdeclB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength2);
 
-       fillthis="hdeclB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength);
+      fillthis="hnormdeclB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLength2);
 
-       fillthis="hnormdeclB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLength);
+      fillthis="hdeclxyB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(decayLengthxy);
 
-       if(recalcvtx) {
+      fillthis="hnormdeclxyB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy);
 
-         fillthis="hdeclvB_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
+      fillthis="hdeclxyd0d0B_";
+      fillthis+=ptbin;
+      ((TH2F*)listout->FindObject(fillthis))->Fill(decayLengthxy,d0Prong[0]*d0Prong[1]);
 
-         fillthis="hnormdeclvB_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+      fillthis="hnormdeclxyd0d0B_";
+      fillthis+=ptbin;
+      ((TH2F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy,d0Prong[0]*d0Prong[1]);     
 
-       }
-      }//mass cut      
-    }//else (background)
+      if(recalcvtx) {
+
+       fillthis="hdeclvB_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
+
+       fillthis="hnormdeclvB_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+
+
+      }
+    }//mass cut        
+  }//else (background)
   
   return;
 }
@@ -1162,7 +1353,7 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
   //
 
 
-  //  Double_t mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
+  Double_t mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
 
   //cout<<"is selected = "<<fIsSelectedCandidate<<endl;
 
@@ -1181,12 +1372,12 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
   //printf("SELECTED\n");
   Int_t ptbin=cuts->PtBin(part->Pt());
 
-  AliAODTrack *prong=(AliAODTrack*)fDaughterTracks.UncheckedAt(0);
-  if(!prong) {
-    AliDebug(2,"No daughter found");
-    return;
-  }
-  else{
+  // AliAODTrack *prong=(AliAODTrack*)fDaughterTracks.UncheckedAt(0);
+  // if(!prong) {
+  //   AliDebug(2,"No daughter found");
+  //   return;
+  // }
+  // else{
     // if(prong->Charge()==1) {
     //   ((TH1F*)fDistr->FindObject("hpospair"))->Fill(fCuts->GetNPtBins()+ptbin);
     //   //fTotPosPairs[ptbin]++;
@@ -1194,7 +1385,7 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
     //   ((TH1F*)fDistr->FindObject("hnegpair"))->Fill(fCuts->GetNPtBins()+ptbin);
     //   //fTotNegPairs[ptbin]++;
     // }
-  }
+  //  }
  
   // for(Int_t it=0;it<2;it++){
  
@@ -1218,72 +1409,80 @@ void AliAnalysisTaskSED0Mass::FillMassHists(AliAODRecoDecayHF2Prong *part, TClon
   if (fReadMC && labD0>=0) fNentries->Fill(2);
 
   if ((fIsSelectedCandidate==1 || fIsSelectedCandidate==3) && fFillOnlyD0D0bar<2) { //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(fReadMC){
+      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(fSys==0){
+           if(TMath::Abs(invmassD0 - mPDG) < 0.027){
+             fillthis="histSgn27_";
+             fillthis+=ptbin;
+             ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
+           }
+         }
+       } else{ //it was a D0bar
+         fillthis="histRfl_";
+         fillthis+=ptbin;
+         ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
+       }
+      } else {//background
+       fillthis="histBkg_";
        fillthis+=ptbin;
        ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
       }
-    } else {//background
-      fillthis="histBkg_";
+
+    }else{
+      fillthis="histMass_";
       fillthis+=ptbin;
+      //cout<<"Filling "<<fillthis<<endl;
+
+      //printf("Fill mass with D0");
       ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0);
     }
-      
+     
   }
   if (fIsSelectedCandidate>1 && (fFillOnlyD0D0bar==0 || fFillOnlyD0D0bar==2)) { //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_";
-       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(fReadMC){
+      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);
+         // }
 
          
-      } else{
-       fillthis="histRfl_";
+       } 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 {//background or LS
-      fillthis="histBkg_";
+    }else{
+      fillthis="histMass_";
       fillthis+=ptbin;
-      ((TH1F*)(listout->FindObject(fillthis)))->Fill(invmassD0bar);
+      //printf("Fill mass with D0bar");
+      ((TH1F*)listout->FindObject(fillthis))->Fill(invmassD0bar);
+
     }
   }
 
@@ -1353,12 +1552,14 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
     printf("ERROR: fOutputMass not available\n");
     return;
   }
-  fDistr = dynamic_cast<TList*> (GetOutputData(2));
-  if (!fDistr) {
-    printf("ERROR: fDistr not available\n");
-    return;
+  if(fFillVarHists){
+    fDistr = dynamic_cast<TList*> (GetOutputData(2));
+    if (!fDistr) {
+      printf("ERROR: fDistr not available\n");
+      return;
+    }
   }
+
   fNentries = dynamic_cast<TH1F*>(GetOutputData(3));
   
   if(!fNentries){
@@ -1378,8 +1579,8 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
   Int_t nptbins=fCuts->GetNPtBins();
   for(Int_t ipt=0;ipt<nptbins;ipt++){ 
 
-    if(fArray==1){ 
-      fLsNormalization = 2.*TMath::Sqrt(((TH1F*)fDistr->FindObject("hpospair"))->Integral(nptbins+ipt+1,nptbins+ipt+2)*((TH1F*)fDistr->FindObject("hnegpair"))->Integral(nptbins+ipt+1,nptbins+ipt+2)); //after cuts
+    if(fArray==1 && fFillVarHists){ 
+      fLsNormalization = 2.*TMath::Sqrt(((TH1F*)fOutputMass->FindObject("hpospair"))->Integral(nptbins+ipt+1,nptbins+ipt+2)*((TH1F*)fOutputMass->FindObject("hnegpair"))->Integral(nptbins+ipt+1,nptbins+ipt+2)); //after cuts
 
 
       if(fLsNormalization>1e-6) {
@@ -1391,7 +1592,7 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
       }
     
 
-      fLsNormalization = 2.*TMath::Sqrt(((TH1F*)fDistr->FindObject("hpospair"))->Integral(ipt+1,ipt+2)*((TH1F*)fDistr->FindObject("hnegpair"))->Integral(ipt+1,ipt+2)); 
+      fLsNormalization = 2.*TMath::Sqrt(((TH1F*)fOutputMass->FindObject("hpospair"))->Integral(ipt+1,ipt+2)*((TH1F*)fOutputMass->FindObject("hnegpair"))->Integral(ipt+1,ipt+2)); 
       //fLsNormalization = 2.*TMath::Sqrt(fTotPosPairs[4]*fTotNegPairs[4]);
 
       if(fLsNormalization>1e-6) {
@@ -1414,10 +1615,11 @@ void AliAnalysisTaskSED0Mass::Terminate(Option_t */*option*/)
        nameDistr="hcosthetapointB_";
        nameDistr+=ipt;
        ((TH1F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH1F*)fDistr->FindObject(nameDistr))->GetEntries());
-       nameDistr="hcosthpointd0d0B_";
-       nameDistr+=ipt;
-       ((TH2F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH2F*)fDistr->FindObject(nameDistr))->GetEntries());
-
+       if(fSys==0){
+         nameDistr="hcosthpointd0d0B_";
+         nameDistr+=ipt;
+         ((TH2F*)fDistr->FindObject(nameDistr))->Scale((1/fLsNormalization)*((TH2F*)fDistr->FindObject(nameDistr))->GetEntries());
+       }
       }
     }
   }