Implement Mattia and Vit comments

Author: Marcellocosti

PWGHF/TableProducer/candidateCreator2Prong.cxx

@@ -779,7 +779,7 @@ struct HfCandidateCreator2ProngExpressions {
       if (matchCorrBkgs) {
         indexRec = -1; // Index of the matched reconstructed candidate
         int depth = 2;
-        for (const auto& [chn, finalState] : finalStates2Prongs) {
+        for (const auto& [chn, finalState] : hf_chns_2prong::finalStates2Prongs) {
           std::array<int, 2> finalStateParts2Prong = std::array{finalState[0], finalState[1]};
           if (finalState.size() == 3) { // Partly Reco 2-prong decays
             if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {

PWGHF/TableProducer/candidateCreator3Prong.cxx

@@ -59,14 +59,14 @@ using namespace o2;
 using namespace o2::hf_evsel;
 using namespace o2::hf_trkcandsel;
 using namespace o2::aod::hf_cand_3prong;
-using namespace o2::hf_decay;
+using namespace o2::hf_decay::hf_cand_3prong;
+using namespace o2::hf_corrbkg;
 using namespace o2::hf_centrality;
 using namespace o2::hf_occupancy;
 using namespace o2::constants::physics;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 using namespace o2::aod::pid_tpc_tof_utils;
-using namespace o2::hf_corrbkg;
 
 /// Reconstruction of heavy-flavour 3-prong decay candidates
 struct HfCandidateCreator3Prong {
@@ -853,6 +853,7 @@ struct HfCandidateCreator3ProngExpressions {
   Configurable<bool> matchKinkedDecayTopology{"matchKinkedDecayTopology", false, "Match also candidates with tracks that decay with kinked topology"};
   Configurable<bool> matchInteractionsWithMaterial{"matchInteractionsWithMaterial", false, "Match also candidates with tracks that interact with material"};
   Configurable<bool> matchCorrBkgs{"matchCorrBkgs", false, "Match correlated background candidates"};
+  Configurable<std::vector<int>> mothersCorrBkgsPdgs{"mothersCorrBkgsPdgs", {411, 413, 431, 4122, 4232}, "PDG codes of the mother particles of correlated background candidates"};
 
   constexpr static std::size_t NDaughtersResonant{2u};
 
@@ -947,10 +948,9 @@ struct HfCandidateCreator3ProngExpressions {
       }
 
       if (matchCorrBkgs) {
-        std::array<int, 5> mothersPdgCodes = {Pdg::kDPlus, Pdg::kDS, Pdg::kDStar, Pdg::kLambdaCPlus, Pdg::kXiCPlus};
         indexRec = -1; // Index of the matched reconstructed candidate
 
-        for (const auto& pdg : mothersPdgCodes) {
+        for (const auto& pdg : mothersCorrBkgsPdgs.value) {
           int depth = 2;
           if (pdg == Pdg::kDStar) {
             depth = 3; // D0 resonant decays are active
@@ -1206,7 +1206,7 @@ struct HfCandidateCreator3ProngExpressions {
         continue;
       }
       if (matchCorrBkgs) {
-        hf_mc_gen::fillMcMatchGen3Prong<true>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground);
+        hf_mc_gen::fillMcMatchGen3Prong<true>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground, mothersCorrBkgsPdgs.value);
       } else {
         hf_mc_gen::fillMcMatchGen3Prong(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground);
       }

PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx

@@ -31,7 +31,6 @@ using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 using namespace o2::hf_centrality;
-using namespace o2::hf_corrbkg;
 
 namespace o2::aod
 {

PWGHF/Utils/utilsMcGen.h

@@ -32,13 +32,11 @@
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/Utils/utilsMcMatching.h"
 
-using namespace o2::hf_decay::hf_cand_2prong;
-using namespace o2::hf_decay::hf_cand_3prong;
-using namespace o2::hf_corrbkg;
-
 namespace hf_mc_gen
 {
 
+using namespace o2::hf_corrbkg;
+
 template <bool matchCorrBkgs = false, typename T, typename U, typename V>
 void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V& rowMcMatchGen, bool rejectBackground)
 {
@@ -61,7 +59,7 @@ void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
     if (matchCorrBkgs) {
       bool matched = false;
 
-      for (const auto& [chn, finalState] : finalStates2Prongs) {
+      for (const auto& [chn, finalState] : o2::hf_corrbkg::hf_chns_2prong::finalStates2Prongs) {
         if (finalState.size() == 3) { // Partly Reco 3-prong decays
           std::array<int, 3> finalStateParts = std::array{finalState[0], finalState[1], finalState[2]};
           if (particle.pdgCode() < 0) {
@@ -131,7 +129,7 @@ void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
 }
 
 template <bool matchCorrBkgs = false, typename T, typename U, typename V>
-void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V& rowMcMatchGen, bool rejectBackground)
+void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V& rowMcMatchGen, bool rejectBackground, std::vector<int> const& corrBkgMothersPdgs = {})
 {
   using namespace o2::constants::physics;
   constexpr std::size_t NDaughtersResonant{2u};
@@ -157,8 +155,7 @@ void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
     }
 
     if (matchCorrBkgs) {
-      std::array<int, 5> mothersPdgCodes = {Pdg::kDPlus, Pdg::kDS, Pdg::kDStar, Pdg::kLambdaCPlus, Pdg::kXiCPlus};
-      for (const auto& motherPdgCode : mothersPdgCodes) {
+      for (const auto& motherPdgCode : corrBkgMothersPdgs) {
         if (std::abs(particle.pdgCode()) != motherPdgCode) {
           continue; // Skip if the particle PDG code does not match the mother PDG code
         }