Use check origin method to tag prompt/nonprompt charm hadrons

fgrosa · fgrosa · commit ca6f9d95ef79 · 2022-07-08T15:22:34.000+02:00
diff --git a/Common/Core/RecoDecay.h b/Common/Core/RecoDecay.h
@@ -950,14 +950,8 @@ class RecoDecay
 
             if (!searchUpToQuark) {
               if (
-                (PDGParticleIMother / 100 == 5 ||            // b mesons
-                 PDGParticleIMother / 1000 == 5 ||           // b baryons
-                 (PDGParticleIMother - 10000) / 100 == 5 ||  // bbbar resonances
-                 (PDGParticleIMother - 20000) / 100 == 5 ||  // bbbar resonances
-                 (PDGParticleIMother - 30000) / 100 == 5 ||  // bbbar resonances
-                 (PDGParticleIMother - 100000) / 100 == 5 || // bbbar resonances
-                 (PDGParticleIMother - 200000) / 100 == 5 || // bbbar resonances
-                 (PDGParticleIMother - 300000) / 100 == 5)   // bbbar resonances
+                (PDGParticleIMother / 100 == 5 || // b mesons
+                 PDGParticleIMother / 1000 == 5)  // b baryons
               ) {
                 return 2;
               }
diff --git a/EventFiltering/PWGHF/HFFilter.cxx b/EventFiltering/PWGHF/HFFilter.cxx
@@ -982,10 +982,10 @@ struct HfFilter { // Main struct for HF triggers
       auto indexRec = RecoDecay::getMatchedMCRec(particlesMC, std::array{trackPos, trackNeg}, pdg::Code::kD0, array{+kPiPlus, -kKPlus}, true, &sign);
       if (indexRec > -1) {
         auto particle = particlesMC.rawIteratorAt(indexRec);
-        origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
         if (origin == OriginType::NonPrompt) {
           flag = kNonPrompt;
-        } else {
+        } else if (origin == OriginType::Prompt) {
           flag = kPrompt;
         }
       } else {
@@ -1041,7 +1041,7 @@ struct HfFilter { // Main struct for HF triggers
 
       if (indexRec > -1) {
         auto particle = particlesMC.rawIteratorAt(indexRec);
-        origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
         if (origin == OriginType::NonPrompt) {
           flag = kNonPrompt;
         } else {
diff --git a/PWGHF/TableProducer/HFCandidateCreator2Prong.cxx b/PWGHF/TableProducer/HFCandidateCreator2Prong.cxx
@@ -210,7 +210,7 @@ struct HFCandidateCreator2ProngExpressions {
       // Check whether the particle is non-prompt (from a b quark).
       if (flag != 0) {
         auto particle = particlesMC.rawIteratorAt(indexRec);
-        origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
       }
 
       rowMCMatchRec(flag, origin);
@@ -246,7 +246,7 @@ struct HFCandidateCreator2ProngExpressions {
 
       // Check whether the particle is non-prompt (from a b quark).
       if (flag != 0) {
-        origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
       }
 
       rowMCMatchGen(flag, origin);
diff --git a/PWGHF/TableProducer/HFCandidateCreator3Prong.cxx b/PWGHF/TableProducer/HFCandidateCreator3Prong.cxx
@@ -251,7 +251,7 @@ struct HFCandidateCreator3ProngExpressions {
       // Check whether the particle is non-prompt (from a b quark).
       if (flag != 0) {
         auto particle = particlesMC.rawIteratorAt(indexRec);
-        origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
       }
 
       rowMCMatchRec(flag, origin, swapping, channel);
@@ -305,7 +305,7 @@ struct HFCandidateCreator3ProngExpressions {
 
       // Check whether the particle is non-prompt (from a b quark).
       if (flag != 0) {
-        origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
       }
 
       rowMCMatchGen(flag, origin, channel);
diff --git a/PWGHF/TableProducer/HFCandidateCreatorChic.cxx b/PWGHF/TableProducer/HFCandidateCreatorChic.cxx
@@ -249,7 +249,7 @@ struct HFCandidateCreatorChicMC {
       }
       if (flag != 0) {
         auto particle = particlesMC.rawIteratorAt(indexRec);
-        origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? NonPrompt : Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
       }
       rowMCMatchRec(flag, origin, channel);
     }
diff --git a/PWGHF/TableProducer/HFCandidateCreatorX.cxx b/PWGHF/TableProducer/HFCandidateCreatorX.cxx
@@ -305,7 +305,7 @@ struct HFCandidateCreatorXMC {
       // Check whether the particle is non-prompt (from a b quark).
       if (flag != 0) {
         auto particle = particlesMC.rawIteratorAt(indexRec);
-        origin = (RecoDecay::getMother(particlesMC, particle, 5, true) > -1 ? NonPrompt : Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
       }
 
       rowMCMatchRec(flag, origin, channel);
@@ -338,7 +338,7 @@ struct HFCandidateCreatorXMC {
 
       // Check whether the particle is non-prompt (from a b quark).
       if (flag != 0) {
-        origin = (RecoDecay::getMother(particlesMC, particle, 5, true) > -1 ? NonPrompt : Prompt);
+        origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
       }
 
       rowMCMatchGen(flag, origin, channel);
diff --git a/PWGHF/Tasks/HFMCValidation.cxx b/PWGHF/Tasks/HFMCValidation.cxx
@@ -157,7 +157,7 @@ struct ValidationGenLevel {
           std::size_t arrayPDGsize = arrPDGFinal[iD].size() - std::count(arrPDGFinal[iD].begin(), arrPDGFinal[iD].end(), 0);
           int origin = -1;
           if (listDaughters.size() == arrayPDGsize) {
-            origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);
+            origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);
             if (origin == OriginType::Prompt) {
               counterPrompt[iD]++;
             } else if (origin == OriginType::NonPrompt) {

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ struct HFCandidateCreator2ProngExpressions {`
`210`	`210`	`// Check whether the particle is non-prompt (from a b quark).`
`211`	`211`	`if (flag != 0) {`
`212`	`212`	`auto particle = particlesMC.rawIteratorAt(indexRec);`
`213`		`- origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);`
	`213`	`+ origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`rowMCMatchRec(flag, origin);`
`@@ -246,7 +246,7 @@ struct HFCandidateCreator2ProngExpressions {`
`246`	`246`
`247`	`247`	`// Check whether the particle is non-prompt (from a b quark).`
`248`	`248`	`if (flag != 0) {`
`249`		`- origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);`
	`249`	`+ origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`rowMCMatchGen(flag, origin);`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ struct HFCandidateCreator3ProngExpressions {`
`251`	`251`	`// Check whether the particle is non-prompt (from a b quark).`
`252`	`252`	`if (flag != 0) {`
`253`	`253`	`auto particle = particlesMC.rawIteratorAt(indexRec);`
`254`		`- origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);`
	`254`	`+ origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`rowMCMatchRec(flag, origin, swapping, channel);`
`@@ -305,7 +305,7 @@ struct HFCandidateCreator3ProngExpressions {`
`305`	`305`
`306`	`306`	`// Check whether the particle is non-prompt (from a b quark).`
`307`	`307`	`if (flag != 0) {`
`308`		`- origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? OriginType::NonPrompt : OriginType::Prompt);`
	`308`	`+ origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`rowMCMatchGen(flag, origin, channel);`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ struct HFCandidateCreatorChicMC {`
`249`	`249`	`}`
`250`	`250`	`if (flag != 0) {`
`251`	`251`	`auto particle = particlesMC.rawIteratorAt(indexRec);`
`252`		`- origin = (RecoDecay::getMother(particlesMC, particle, kBottom, true) > -1 ? NonPrompt : Prompt);`
	`252`	`+ origin = RecoDecay::checkCharmHadronOrigin(particlesMC, particle, false);`
`253`	`253`	`}`
`254`	`254`	`rowMCMatchRec(flag, origin, channel);`
`255`	`255`	`}`