Updates (Chiara)
authordainese <dainese@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 1 Apr 2011 16:23:15 +0000 (16:23 +0000)
committerdainese <dainese@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 1 Apr 2011 16:23:15 +0000 (16:23 +0000)
PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx
PWG3/vertexingHF/macros/AddTaskD0Mass.C

index 8c9df31..275d10c 100644 (file)
@@ -58,45 +58,45 @@ 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),
-fSys(0)
+  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),
-fSys(0)
+  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
 
@@ -198,131 +198,192 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
 
     //histograms of cut variable distributions
     if(fFillVarHists){
-      //  pT
-      namedistr="hptpiS_";
-      namedistr+=i;
-      TH1F *hptpiS = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
+      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="hptKS_";
-      namedistr+=i;
-      TH1F *hptKS = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
+       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);
 
-      namedistr="hptB_";
-      namedistr+=i;
-      TH1F *hptB = new TH1F(namedistr.Data(), "P_{T} distribution;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="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="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);
+
+       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);
+
+       //  costhetapoint
+       namedistr="hcosthetapointS_";
+       namedistr+=i;
+       TH1F *hcosthetapointS = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
+
+       namedistr="hcosthetapointxyS_";
+       namedistr+=i;
+       TH1F *hcosthetapointxyS = new TH1F(namedistr.Data(), "cos#theta_{Point} XYdistribution;cos#theta_{Point}",300,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();
+
+
+       fDistr->Add(hdcaS);
+
+       fDistr->Add(hd0piS);
+       fDistr->Add(hd0KS);
+
+       fDistr->Add(hd0d0S);
+
+       fDistr->Add(hcosthetapointS);
+
+       fDistr->Add(hcosthetapointxyS);
+
+       fDistr->Add(hdeclengthS);
+
+       fDistr->Add(hnormdeclengthS);
+
+       fDistr->Add(hdeclxyS);
+
+       fDistr->Add(hnormdeclxyS);
+
+       fDistr->Add(hdeclxyd0d0S);
+       fDistr->Add(hnormdeclxyd0d0S);
+
+       fDistr->Add(tmpMS);
+      }
 
       //  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="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="hdeclB_";
       namedistr+=i;
-      TH1F *hdeclengthS = new TH1F(namedistr.Data(), "Decay Length^{2} distribution;Decay Length^{2} [cm]",200,0,0.025);
+      TH1F *hdeclengthB = new TH1F(namedistr.Data(), "Decay Length^{2} distribution;Decay Length^{2} [cm^{2}]",200,0,0.015);
 
-      namedistr="hdeclB_";
+      namedistr="hnormdeclB_";
       namedistr+=i;
-      TH1F *hdeclengthB = new TH1F(namedistr.Data(), "Decay Length^{2} distribution;Decay Length^{2} [cm^{2}]",200,0,0.025);
+      TH1F *hnormdeclengthB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;(Decay Length/Err)^{2} ",200,0,12.);
 
-      namedistr="hnormdeclS_";
+      namedistr="hdeclxyB_";
       namedistr+=i;
-      TH1F *hnormdeclengthS = new TH1F(namedistr.Data(), "Normalized Decay Length^{2} distribution;(Decay Length/Err)^{2} ",200,0,6.);
+      TH1F* hdeclxyB=new TH1F(namedistr.Data(),"Decay Length XY distribution;Decay Length XY [cm]",200,0,0.15);
+      namedistr="hnormdeclxyB_";
+      namedistr+=i;
+      TH1F* hnormdeclxyB=new TH1F(namedistr.Data(),"Normalized decay Length XY distribution;Decay Length XY/Err",200,0,6.); 
 
-      namedistr="hnormdeclB_";
+      namedistr="hdeclxyd0d0B_";
       namedistr+=i;
-      TH1F *hnormdeclengthB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution;(Decay Length/Err)^{2} ",200,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);
 
-      //  costhetapoint
-      namedistr="hcosthetapointS_";
+      namedistr="hnormdeclxyd0d0B_";
       namedistr+=i;
-      TH1F *hcosthetapointS = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
+      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);
+
+      //  costhetapoint
       namedistr="hcosthetapointB_";
       namedistr+=i;
       TH1F *hcosthetapointB = new TH1F(namedistr.Data(), "cos#theta_{Point} distribution;cos#theta_{Point}",200,0,1.);
 
-      namedistr="hdeclxyS_";
+      namedistr="hcosthetapointxyB_";
       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); //check range 0.15
+      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();
 
-      namedistr="hdeclxyB_";
-      namedistr+=i;
-      TH1F* hdeclxyB=new TH1F(namedistr.Data(),"Decay Length XY distribution;Decay Length XY [cm]",200,0,0.15);//chech range 0.15
-      namedistr="hnormdeclxyB_";
-      namedistr+=i;
-      TH1F* hnormdeclxyB=new TH1F(namedistr.Data(),"Normalized decay Length XY distribution;Decay Length XY/Err",200,0,6); //check range 0.15
 
-      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(hd0d0S);
       fDistr->Add(hd0d0B);
 
-      fDistr->Add(hcosthetastarS);
-      fDistr->Add(hcosthetastarB);
-
-      fDistr->Add(hcosthetapointS);
       fDistr->Add(hcosthetapointB);
 
+      fDistr->Add(hcosthetapointxyB);
 
-      fDistr->Add(hdeclengthS);
       fDistr->Add(hdeclengthB);
 
-      fDistr->Add(hnormdeclengthS);
       fDistr->Add(hnormdeclengthB);
 
-      fDistr->Add(hdeclxyS);
       fDistr->Add(hdeclxyB);
 
-      fDistr->Add(hnormdeclxyS);
       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);
+
+         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(hd0vpiS);
+         fDistr->Add(hd0vKS);
+         fDistr->Add(hd0d0vS);
+         fDistr->Add(hdeclengthvS);
+         fDistr->Add(hnormdeclengthvS);
+
+       }
+
        namedistr="hd0vmoresB_";
        namedistr+=i;
        TH1F *hd0vmoresB = new TH1F(namedistr.Data(), "Impact parameter distribution (both);d0 [cm]",200,-0.1,0.1);
@@ -332,13 +393,6 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
        TH1F *hd0d0vmoresB = new TH1F(namedistr.Data(), "Impact parameter distribution (prong +);d0 [cm]",200,-0.001,0.001);
 
 
-       namedistr="hd0vpiS_";
-       namedistr+=i;
-       TH1F *hd0vpiS = new TH1F(namedistr.Data(), "Impact parameter distribution (pions)(vtx w/o these tracks);d0(#pi) [cm]",200,-0.1,0.1);
-
-       namedistr="hd0vKS_";
-       namedistr+=i;
-       TH1F *hd0vKS = new TH1F(namedistr.Data(), "Impact parameter distribution (kaons) (vtx w/o these tracks);d0(K) [cm]",200,-0.1,0.1);
        namedistr="hd0vB_";
        namedistr+=i;
        TH1F *hd0vB = new TH1F(namedistr.Data(), "Impact parameter distribution (vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
@@ -351,91 +405,65 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
        namedistr+=i;
        TH1F *hd0vp1B = new TH1F(namedistr.Data(), "Impact parameter distribution (prong - ** vtx w/o these tracks);d0 [cm]",200,-0.1,0.1);
 
-
-       namedistr="hd0d0vS_";
-       namedistr+=i;
-       TH1F *hd0d0vS = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution (vtx w/o these tracks);d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
        namedistr="hd0d0vB_";
        namedistr+=i;
        TH1F *hd0d0vB = new TH1F(namedistr.Data(), "d_{0}#timesd_{0} distribution (vtx w/o these tracks);d_{0}#timesd_{0} [cm^{2}]",200,-0.001,0.001);
 
-       namedistr="hdeclvS_";
-       namedistr+=i;
-       TH1F *hdeclengthvS = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
-
        namedistr="hdeclvB_";
        namedistr+=i;
        TH1F *hdeclengthvB = new TH1F(namedistr.Data(), "Decay Length distribution (vtx w/o tracks);Decay Length [cm]",200,0,0.6);
 
-       namedistr="hnormdeclvS_";
-       namedistr+=i;
-       TH1F *hnormdeclengthvS = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
-
        namedistr="hnormdeclvB_";
        namedistr+=i;
        TH1F *hnormdeclengthvB = new TH1F(namedistr.Data(), "Normalized Decay Length distribution (vtx w/o tracks);Decay Length/Err ",200,0,10.);
 
-
-       fDistr->Add(hd0vpiS);
-       fDistr->Add(hd0vKS);
        fDistr->Add(hd0vB);
        fDistr->Add(hd0vp0B);
        fDistr->Add(hd0vp1B);
        fDistr->Add(hd0vmoresB);
 
-       fDistr->Add(hd0d0vS);
        fDistr->Add(hd0d0vB);
        fDistr->Add(hd0d0vmoresB);
 
-       fDistr->Add(hdeclengthvS);
        fDistr->Add(hdeclengthvB);
 
-       fDistr->Add(hnormdeclengthvS);
        fDistr->Add(hnormdeclengthvB);
       }
 
-      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();
-
-      fDistr->Add(tmpMS);
-      fDistr->Add(tmpMB);
 
     }
     //histograms of invariant mass distributions
 
 
-    //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();
+    //MC signal
+    if(fReadMC){
+      TH1F* tmpSt = new TH1F(nameSgn.Data(), "D^{0} invariant mass - MC; M [GeV]; Entries",200,1.5648,2.1648);
 
-    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();
+      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();
-    tmpRt->Sumw2();
-    tmpRl->Sumw2();
-    //  printf("Created histograms %s\t%s\t%s\t%s\n",tmpM->GetName(),tmpS->GetName(),tmpB->GetName(),tmpR->GetName());
+      //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(tmpBt);
-    fOutputMass->Add(tmpRt);
+      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.);
 
@@ -443,16 +471,72 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
 
     if(fSys==0){ //histograms filled only in pp to save time in PbPb
       if(fFillVarHists){
-       //pT no mass cut
 
-       namedistr="hptpiSnoMcut_";
+       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();
+         fOutputMass->Add(tmpS27t);
+         fOutputMass->Add(tmpS27l);
+
+       }
+
+       //  pT
+       namedistr="hptB_";
        namedistr+=i;
-       TH1F *hptpiSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (pions);p_{T} [GeV/c]",200,0.,8.);
+       TH1F *hptB = new TH1F(namedistr.Data(), "P_{T} distribution;p_{T} [GeV/c]",200,0.,8.);
 
-       namedistr="hptKSnoMcut_";
+       //  costhetastar
+       namedistr="hcosthetastarB_";
        namedistr+=i;
-       TH1F *hptKSnoMcut = new TH1F(namedistr.Data(), "P_{T} distribution (kaons);p_{T} [GeV/c]",200,0.,8.);
+       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.);
@@ -461,8 +545,9 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
        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(hptB);
+       fDistr->Add(hcosthetastarB);
+
        fDistr->Add(hptB1pnoMcut);
        fDistr->Add(hptB2pnoMcut);
 
@@ -490,17 +575,10 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
        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);
@@ -512,21 +590,13 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
        fDistr->Add(hd0d0moresB);
        fDistr->Add(hcosthetapointmoresB);
 
-       fDistr->Add(hcosthpointd0S);
+
        fDistr->Add(hcosthpointd0B);
 
-       fDistr->Add(hcosthpointd0d0S);
+
        fDistr->Add(hcosthpointd0d0B);
       }
 
-      //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();
-      fOutputMass->Add(tmpS27t);
-      fOutputMass->Add(tmpS27l);
     } //end pp histo
   }
 
@@ -544,7 +614,7 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
 
   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)");
@@ -565,6 +635,7 @@ void AliAnalysisTaskSED0Mass::UserCreateOutputObjects()
   }
   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()));
@@ -585,16 +656,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());
@@ -673,6 +744,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;
   }
   
@@ -681,7 +753,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;
@@ -698,6 +770,8 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   for (Int_t iD0toKpi = 0; iD0toKpi < nInD0toKpi; iD0toKpi++) {
     AliAODRecoDecayHF2Prong *d = (AliAODRecoDecayHF2Prong*)inputArray->UncheckedAt(iD0toKpi);
 
+    if(d->GetSelectionMap()) if(!d->HasSelectionBit(AliRDHFCuts::kD0toKpiCuts)) continue; //skip the D0 from Dstar
+
     Bool_t unsetvtx=kFALSE;
     if(!d->GetOwnPrimaryVtx()) {
       d->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
@@ -716,16 +790,16 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
       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;
-         }
-         //}
+       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);
       }
 
@@ -762,7 +836,7 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
   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; 
   //printf("\nif no cuts or cuts passed\n");
@@ -830,303 +904,319 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
   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
+    if(fSys==0){
+      //no mass cut ditributions: ptbis
        
-       fillthispi="hptpiSnoMcut_";
-       fillthispi+=ptbin;
+      fillthispi="hptpiSnoMcut_";
+      fillthispi+=ptbin;
 
-       fillthisK="hptKSnoMcut_";
-       fillthisK+=ptbin;
+      fillthisK="hptKSnoMcut_";
+      fillthisK+=ptbin;
 
-       if ((TMath::Abs(pdgProng[0]) == 211 && TMath::Abs(pdgProng[1]) == 321)
-           || (isSelectedPID==1 || isSelectedPID==3)){
-         ((TH1F*)listout->FindObject(fillthispi))->Fill(part->PtProng(0));
-         ((TH1F*)listout->FindObject(fillthisK))->Fill(part->PtProng(1));
-       }
+      if ((TMath::Abs(pdgProng[0]) == 211 && TMath::Abs(pdgProng[1]) == 321)
+         || (isSelectedPID==1 || isSelectedPID==3)){
+       ((TH1F*)listout->FindObject(fillthispi))->Fill(prong0->Pt());
+       ((TH1F*)listout->FindObject(fillthisK))->Fill(prong1->Pt());
+      }
 
-       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));
-       }
+      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());
       }
+    }
 
-      //no mass cut ditributions: mass
-      fillthis="hMassS_";
-      fillthis+=ptbin;
+    //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))
+    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)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
+    //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();
+      cosThetaStarD0 = part->CosThetaStarD0();
+      cosThetaStarD0bar = part->CosThetaStarD0bar();
+      cosPointingAngle = part->CosPointingAngle();
+      normalizedDecayLength2 = part->NormalizedDecayLength2();
+      decayLength2 = part->DecayLength2();
+      decayLengthxy = part->DecayLengthXY();
+      normalizedDecayLengthxy=decayLengthxy/part->DecayLengthXYError();
 
-       ptProng[0]=part->PtProng(0); ptProng[1]=part->PtProng(1);
-       d0Prong[0]=part->Getd0Prong(0); d0Prong[1]=part->Getd0Prong(1);
+      ptProng[0]=prong0->Pt(); ptProng[1]=prong1->Pt();
+      // ptProng[0]=part->PtProng(0); ptProng[1]=part->PtProng(1);
+      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();
+      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(d0Prong[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(d0Prong[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,d0Prong[iprong]);
-         }
-       } //end loop on prongs
+       if(fSys==0){
+         fillthis="hcosthpointd0S_";
+         fillthis+=ptbin;        
+         ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,d0Prong[iprong]);
+       }
+      } //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="hcosthetastarS_";
-       fillthis+=ptbin;
-       if ((fReadMC && ((AliAODMCParticle*)arrMC->At(lab))->GetPdgCode() == 421)) ((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0);
-       else {
-         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());
 
-       fillthis="hdeclS_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength2);
+      fillthis="hd0d0S_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0());
 
-       fillthis="hnormdeclS_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLength2);
+      fillthis="hdeclS_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength2);
 
-       fillthis="hdeclxyS_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(decayLengthxy);
+      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]);
 
-       fillthis="hnormdeclxyS_";
+      if(recalcvtx) {
+       fillthis="hdeclvS_";
        fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy);
+       ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
 
-       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="hnormdeclvS_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+       fillthis="hd0d0vS_";
+       fillthis+=ptbin;
+       ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[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);
+       else {
+         if (fReadMC || isSelectedPID>1)((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0bar);
+         if(isSelectedPID==1 || isSelectedPID==3)((TH1F*)listout->FindObject(fillthis))->Fill(cosThetaStarD0);
        }
 
-       if(fSys==0){
-         fillthis="hcosthpointd0d0S_";
-         fillthis+=ptbin;        
-         ((TH2F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Prodd0d0());
-       }
+       fillthis="hcosthpointd0d0S_";
+       fillthis+=ptbin;          
+       ((TH2F*)listout->FindObject(fillthis))->Fill(cosPointingAngle,part->Prodd0d0());
+      }
 
-      } //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;
+    //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);
-      if(fSys==0){
-       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(part->PtProng(0));
+      ((TH1F*)listout->FindObject(fillthis))->Fill(((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt());
       
-       fillthis="hptB2prongsnoMcut_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(0));
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->PtProng(1));
-      }
-      //apply cut on invariant mass on the pair
-      if(TMath::Abs(minvD0-mPDG)<invmasscut || TMath::Abs(minvD0bar-mPDG)<invmasscut){
-
+      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]=part->PtProng(0); ptProng[1]=part->PtProng(1);
+       ptProng[0]=((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt(); ptProng[1]=((AliAODTrack*)fDaughterTracks.UncheckedAt(0))->Pt(); 
        cosThetaStarD0 = part->CosThetaStarD0();
        cosThetaStarD0bar = part->CosThetaStarD0bar();
-       cosPointingAngle = part->CosPointingAngle();
-       normalizedDecayLength2 = part->NormalizedDecayLength2();
-       decayLength2 = part->DecayLength2();
-       decayLengthxy = part->DecayLengthXY();
-       normalizedDecayLengthxy=decayLengthxy/part->DecayLengthXYError();
-       ptProng[0]=part->PtProng(0); ptProng[1]=part->PtProng(1);
-       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);
-           }
+      }
+
+      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);
          }
        }
+      }
        
-       //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="hd0B_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[0]);
-       ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[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){
+         if(fSys==0){
 
-             fillthis="hd0moresB_";
-             fillthis+=ptbin;
+           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(ptProng[iprong]<=1)factor[iprong]=1./.7;
-               else factor[iprong]=1./.6;
-               fNentries->Fill(11);
-             }
+           if(TMath::Abs(pdgMother[iprong])==310 || TMath::Abs(pdgMother[iprong])==130 || TMath::Abs(pdgMother[iprong])==321){ //K^0_S, K^0_L, K^+-
+             if(ptProng[iprong]<=1)factor[iprong]=1./.7;
+             else factor[iprong]=1./.6;
+             fNentries->Fill(11);
+           }
            
-             if(TMath::Abs(pdgMother[iprong])==3122) { //Lambda
-               factor[iprong]=1./0.25;
-               fNentries->Fill(12);
-             }
-             fillthis="hd0moresB_";
-             fillthis+=ptbin;
+           if(TMath::Abs(pdgMother[iprong])==3122) { //Lambda
+             factor[iprong]=1./0.25;
+             fNentries->Fill(12);
+           }
+           fillthis="hd0moresB_";
+           fillthis+=ptbin;
 
-             ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[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]);
-             }
+           if(recalcvtx){
+             fillthis="hd0vmoresB_";
+             fillthis+=ptbin;
+             ((TH1F*)listout->FindObject(fillthis))->Fill(d0[iprong],factor[iprong]);
            }
-         } //loop on prongs
+         }
+       } //loop on prongs
 
-         if(fSys==0){
+       if(fSys==0){
          fillthis="hd0d0moresB_";
          fillthis+=ptbin;
          ((TH1F*)listout->FindObject(fillthis))->Fill(part->Prodd0d0(),factor[0]*factor[1]);
@@ -1140,98 +1230,117 @@ void AliAnalysisTaskSED0Mass::FillVarHists(AliAODEvent* aod,AliAODRecoDecayHF2Pr
            fillthis+=ptbin;
            ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1],factor[0]*factor[1]);
          }
-         }
-       } //readMC
-
-       if(fSys==0){        
-         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]);
-           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]);
-
-         }
-
-       }  
+       }
+      } //readMC
 
-       fillthis="hdcaB_";
+      if(fSys==0){         
+       //normalise pt distr to half afterwards
+       fillthis="hptB_";
        fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
+       ((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="hd0d0B_";
+
+       fillthis="hd0p0B_";
        fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[0]*d0Prong[1]);
+       ((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="hd0d0vB_";
+
+         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]*d0[1]);
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]);
+         ((TH1F*)listout->FindObject(fillthis))->Fill(d0[1]);
+
        }
 
-       fillthis="hcosthetapointB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle);
+      }  
 
-       fillthis="hdeclB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength2);
+      fillthis="hdcaB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->GetDCA());
 
-       fillthis="hnormdeclB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLength2);
+      fillthis="hd0d0B_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(d0Prong[0]*d0Prong[1]);
 
-       fillthis="hdeclxyB_";
+      if(recalcvtx){
+       fillthis="hd0d0vB_";
        fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(decayLengthxy);
+       ((TH1F*)listout->FindObject(fillthis))->Fill(d0[0]*d0[1]);
+      }
 
-       fillthis="hnormdeclxyB_";
-       fillthis+=ptbin;
-       ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy);
+      fillthis="hcosthetapointB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(cosPointingAngle);
 
-       if(recalcvtx) {
+      fillthis="hcosthetapointxyB_";
+      fillthis+=ptbin;   
+      ((TH1F*)listout->FindObject(fillthis))->Fill(part->CosPointingAngleXY());
 
-         fillthis="hdeclvB_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[0]);
+      fillthis="hdeclB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(decayLength2);
 
-         fillthis="hnormdeclvB_";
-         fillthis+=ptbin;
-         ((TH1F*)listout->FindObject(fillthis))->Fill(decl[1]);
+      fillthis="hnormdeclB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLength2);
 
+      fillthis="hdeclxyB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(decayLengthxy);
 
-       }
-      }//mass cut      
-    }//else (background)
+      fillthis="hnormdeclxyB_";
+      fillthis+=ptbin;
+      ((TH1F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy);
+
+      fillthis="hdeclxyd0d0B_";
+      fillthis+=ptbin;
+      ((TH2F*)listout->FindObject(fillthis))->Fill(decayLengthxy,d0Prong[0]*d0Prong[1]);
+
+      fillthis="hnormdeclxyd0d0B_";
+      fillthis+=ptbin;
+      ((TH2F*)listout->FindObject(fillthis))->Fill(normalizedDecayLengthxy,d0Prong[0]*d0Prong[1]);     
+
+      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;
 }
@@ -1299,74 +1408,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(fSys==0){
-       if(TMath::Abs(invmassD0 - mPDG) < 0.027){
-         fillthis="histSgn27_";
+    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{ //it was a D0bar
-       fillthis="histRfl_";
+      } 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);
+
     }
   }
 
@@ -1499,10 +1614,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());
+       }
       }
     }
   }
index 5ed89d2..bd67fbc 100644 (file)
@@ -1,4 +1,4 @@
-AliAnalysisTaskSED0Mass *AddTaskD0Mass(Int_t flag=0/*0 = D0,1 = LS*/,Bool_t readMC=kFALSE,Bool_t cutOnDistr=kFALSE,Int_t flagD0D0bar=0,TString finname="D0toKpiCuts.root")
+AliAnalysisTaskSED0Mass *AddTaskD0Mass(Int_t flag=0/*0 = D0,1 = LS*/,Bool_t readMC=kFALSE,Bool_t filldistr=kFALSE,Bool_t cutOnDistr=kFALSE,Int_t system=0/*0=pp,1=PbPb*/,Int_t flagD0D0bar=0,TString finname="D0toKpiCuts.root")
 {
   //
   // AddTask for the AliAnalysisTaskSE for D0 candidates
@@ -109,7 +109,10 @@ AliAnalysisTaskSED0Mass *AddTaskD0Mass(Int_t flag=0/*0 = D0,1 = LS*/,Bool_t read
   }
 
   AliRDHFCutsD0toKpi* RDHFD0toKpi=new AliRDHFCutsD0toKpi();
-  if(stdcuts) RDHFD0toKpi->SetStandardCutsPP2010();
+  if(stdcuts) {
+    if(system==0) RDHFD0toKpi->SetStandardCutsPP2010();
+    else RDHFD0toKpi->SetStandardCutsPbPb2010();
+  }
   else   RDHFD0toKpi = (AliRDHFCutsD0toKpi*)filecuts->Get("D0toKpiCuts");
   RDHFD0toKpi->SetName(Form("D0toKpiCuts%d",flag));
 
@@ -137,8 +140,8 @@ AliAnalysisTaskSED0Mass *AddTaskD0Mass(Int_t flag=0/*0 = D0,1 = LS*/,Bool_t read
   massD0Task->SetCutOnDistr(cutOnDistr);
   massD0Task->SetUsePid4Distr(kFALSE);
   massD0Task->SetFillOnlyD0D0bar(flagD0D0bar);
-  massD0Task->SetSystem(1); //0=pp, 1=PbPb
-  //massD0Task->SetFillVarHists(kTRUE); // default is FALSE if System=PbPb
+  massD0Task->SetSystem(system); //0=pp, 1=PbPb
+  massD0Task->SetFillVarHists(filldistr); // default is FALSE if System=PbPb
  
   mgr->AddTask(massD0Task);