Use new functionality of MatchToMC: check also PDG codes of daughter tracks

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx b/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx
index 6d5fe506cb1c9290011f13ec46693e05d47849c2..a6c76973fef02f768145ca54214f31172d006ee2 100644 (file)
--- a/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx
+++ b/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx
@@ -194,6 +194,10 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
   AliAODRecoDecayHF3Prong *d3=0;
   AliAODRecoDecayHF4Prong *d4=0;
 
+  Int_t pdgDgD0toKpi[2]={321,211};
+  Int_t pdgDgDplustoKpipi[3]={321,211,211};
+  Int_t pdgDgD0toKpipipi[4]={321,211,211,211};
+
   // loop over vertices
   Int_t nVertices = inputArrayVertices->GetEntriesFast();
   if(fDebug>1) printf("Number of vertices: %d\n",nVertices);
@@ -226,7 +230,7 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
       d2 = (AliAODRecoDecayHF2Prong*)vtx->GetParent();
       if(d2->IsLikeSign()) continue;
       if(d2->Charge() != 0) continue; // these are D* 
-      lab = d2->MatchToMC(421,mcArray);
+      lab = d2->MatchToMC(421,mcArray,2,pdgDgD0toKpi);
       if(lab>=0) {
        unsetvtx=kFALSE;
        if(!d2->GetOwnPrimaryVtx()) {
@@ -240,13 +244,7 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
          invmass = (pdg==421 ? d2->InvMassD0() : d2->InvMassD0bar());
          // get a daughter for true pos of decay vertex
          AliAODMCParticle *dg0MC = (AliAODMCParticle*)mcArray->At(dMC->GetDaughter(0));
-         AliAODMCParticle *dg1MC = (AliAODMCParticle*)mcArray->At(dMC->GetDaughter(1));
          dg0MC->XvYvZv(posTrue);
-         // check that the D0 decayed in two prong (this is not necessary, because the check is already done, implicitely, in MatchToMC)
-         if(TMath::Abs(dMC->GetDaughter(0)-dMC->GetDaughter(1))!=1) continue;
-         // check that the D0 decayed in K-pi+
-         if(!(TMath::Abs(dg0MC->GetPdgCode())==321 && TMath::Abs(dg1MC->GetPdgCode())==211) && 
-            !(TMath::Abs(dg0MC->GetPdgCode())==211 && TMath::Abs(dg1MC->GetPdgCode())==321)) continue;
          fHistMass->Fill(invmass);
          // Post the data already here
          PostData(1,fOutput);
@@ -265,7 +263,7 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
     case 3: // look for D+
       d3 = (AliAODRecoDecayHF3Prong*)vtx->GetParent();
       if(d3->IsLikeSign()) continue;
-      lab = d3->MatchToMC(411,mcArray);
+      lab = d3->MatchToMC(411,mcArray,3,pdgDgDplustoKpipi);
       if(lab>=0) {
        unsetvtx=kFALSE;
        if(!d3->GetOwnPrimaryVtx()) {
@@ -279,17 +277,6 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
        // get a daughter for true pos of decay vertex
        AliAODMCParticle *dg0MC = (AliAODMCParticle*)mcArray->At(dMC->GetDaughter(0));
        dg0MC->XvYvZv(posTrue);
-       // check that the D+ decayed in K-pi+pi+
-       AliAODTrack *dg0 = (AliAODTrack*)d3->GetDaughter(0);
-       AliAODTrack *dg1 = (AliAODTrack*)d3->GetDaughter(1);
-       AliAODTrack *dg2 = (AliAODTrack*)d3->GetDaughter(2);
-        dg0MC = (AliAODMCParticle*)mcArray->At(TMath::Abs(dg0->GetLabel()));
-       AliAODMCParticle *dg1MC = (AliAODMCParticle*)mcArray->At(TMath::Abs(dg1->GetLabel()));
-       AliAODMCParticle *dg2MC = (AliAODMCParticle*)mcArray->At(TMath::Abs(dg2->GetLabel()));
-
-         if(!(TMath::Abs(dg0MC->GetPdgCode())==321 && TMath::Abs(dg1MC->GetPdgCode())==211 && TMath::Abs(dg2MC->GetPdgCode())==211) && 
-            !(TMath::Abs(dg0MC->GetPdgCode())==211 && TMath::Abs(dg1MC->GetPdgCode())==321 && TMath::Abs(dg2MC->GetPdgCode())==211) &&
-            !(TMath::Abs(dg0MC->GetPdgCode())==211 && TMath::Abs(dg1MC->GetPdgCode())==211 && TMath::Abs(dg2MC->GetPdgCode())==321)) continue;
        Float_t tmp[16]={(Float_t)pdg,(Float_t)nprongs,
                         (Float_t)posRec[0],(Float_t)posTrue[0],(Float_t)errx,
                         (Float_t)posRec[1],(Float_t)posTrue[1],(Float_t)erry,
@@ -305,7 +292,7 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
     case 4: // look for D0->Kpipipi
       d4 = (AliAODRecoDecayHF4Prong*)vtx->GetParent();
       if(d4->IsLikeSign()) continue;
-      lab = d4->MatchToMC(421,mcArray);
+      lab = d4->MatchToMC(421,mcArray,4,pdgDgD0toKpipipi);
       if(lab>=0) {
        unsetvtx=kFALSE;
        if(!d4->GetOwnPrimaryVtx()) {

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx b/PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx
index f465431f1e9e47460cf0da245bf88ffb8bcc3b5d..4fa60ac9c4fcfc72c2b14e4aa6bcaa6b658a341d 100644 (file)
--- a/PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx
+++ b/PWG3/vertexingHF/AliAnalysisTaskSED0Mass.cxx
@@ -315,7 +315,8 @@ void AliAnalysisTaskSED0Mass::FillHists(Int_t ptbin, AliAODRecoDecayHF2Prong *pa
   if(part->SelectD0(vhf->GetD0toKpiCuts(),okD0,okD0bar)) {//selected
     Double_t invmassD0 = part->InvMassD0(), invmassD0bar = part->InvMassD0bar();
     //printf("SELECTED\n");
-    Int_t labD0 = part->MatchToMC(421,arrMC); //return MC particle label if the array corresponds to a D0, -1 if not (cf. AliAODRecoDecay.cxx)
+    Int_t pdgDgD0toKpi[2]={321,211};
+    Int_t labD0 = part->MatchToMC(421,arrMC,2,pdgDgD0toKpi); //return MC particle label if the array corresponds to a D0, -1 if not (cf. AliAODRecoDecay.cxx)
     //printf("labD0 %d",labD0);
     
     TString fillthis="";

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSEDplus.cxx b/PWG3/vertexingHF/AliAnalysisTaskSEDplus.cxx
index a255436aa7b98734877debef7fbe4606b47c0fde..c1ddc39c953301d54cc3f8d9309286808413e262 100644 (file)
--- a/PWG3/vertexingHF/AliAnalysisTaskSEDplus.cxx
+++ b/PWG3/vertexingHF/AliAnalysisTaskSEDplus.cxx
@@ -180,6 +180,8 @@ void AliAnalysisTaskSEDplus::UserExec(Option_t */*option*/)
     if(fDebug>1) printf("Number of D+->Kpipi: %d\n",n3Prong);
 
 
+    Int_t pdgDgDplustoKpipi[3]={321,211,211};
+
     for (Int_t i3Prong = 0; i3Prong < n3Prong; i3Prong++) {
       AliAODRecoDecayHF3Prong *d = (AliAODRecoDecayHF3Prong*)array3Prong->UncheckedAt(i3Prong);
 
@@ -192,7 +194,7 @@ void AliAnalysisTaskSEDplus::UserExec(Option_t */*option*/)
       if(d->SelectDplus(fVHF->GetDplusCuts())) {
          
          
-       Int_t labDp = d->MatchToMC(411,arrayMC);
+       Int_t labDp = d->MatchToMC(411,arrayMC,3,pdgDgDplustoKpipi);
     
        if(labDp>=0) {
          AliAODMCParticle *partDp = (AliAODMCParticle*)arrayMC->At(labDp);