Remove matching for generated particles

Author: Marcellocosti

PWGHF/TableProducer/candidateCreator3Prong.cxx

@@ -1053,6 +1053,7 @@ struct HfCandidateCreator3ProngExpressions {
                           McCollisions const& mcCollisions,
                           BCsInfo const&)
   {
+    LOG(info) << "Running MC matching for 3-prong candidates";
     rowCandidateProng3->bindExternalIndices(&tracks);
 
     int indexRec = -1;
@@ -1102,6 +1103,7 @@ struct HfCandidateCreator3ProngExpressions {
       }
 
       if (matchCorrelatedBackground) {
+        LOG(info) << "Matching correlated background candidates";
         indexRec = -1;                  // Index of the matched reconstructed candidate
         constexpr int DepthMainMax = 2; // Depth for final state matching
         constexpr int DepthResoMax = 1; // Depth for resonant decay matching
@@ -1357,11 +1359,13 @@ struct HfCandidateCreator3ProngExpressions {
       }
       if (origin == RecoDecay::OriginType::NonPrompt) {
         auto bHadMother = mcParticles.rawIteratorAt(idxBhadMothers[0]);
+        LOG(info) << "flagChannelMain: " << static_cast<int>(flagChannelMain) << ", origin: " << static_cast<int>(origin) << ", swapping: " << static_cast<int>(swapping) << ", resonant channel: " << static_cast<int>(flagChannelResonant);
         rowMcMatchRec(flagChannelMain, origin, swapping, flagChannelResonant, bHadMother.pt(), bHadMother.pdgCode(), nKinkedTracks, nInteractionsWithMaterial);
       } else {
         if (std::abs(flagChannelMain) == DecayChannelMain::CDeuteronToDeKPi) {
           origin = RecoDecay::OriginType::Prompt;
         }
+        LOG(info) << "flagChannelMain: " << static_cast<int>(flagChannelMain) << ", origin: " << static_cast<int>(origin) << ", swapping: " << static_cast<int>(swapping) << ", resonant channel: " << static_cast<int>(flagChannelResonant);
         rowMcMatchRec(flagChannelMain, origin, swapping, flagChannelResonant, -1.f, 0, nKinkedTracks, nInteractionsWithMaterial);
       }
     }

PWGHF/TableProducer/derivedDataCreatorD0ToKPi.cxx

@@ -107,7 +107,7 @@ struct HfDerivedDataCreatorD0ToKPi {
   using TypeMcCollisions = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
 
   Filter filterSelectCandidates = aod::hf_sel_candidate_d0::isSelD0 >= 1 || aod::hf_sel_candidate_d0::isSelD0bar >= 1;
-  Filter filterMcGenMatching = (nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK)) || (fillCorrelatedBkgs && aod::hf_cand_mc_flag::flagMcMatchGen != 0);
+  Filter filterMcGenMatching = nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK);
 
   Preslice<SelectedCandidates> candidatesPerCollision = aod::hf_cand::collisionId;
   Preslice<SelectedCandidatesKf> candidatesKfPerCollision = aod::hf_cand::collisionId;

PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx

@@ -104,7 +104,7 @@ struct HfDerivedDataCreatorDplusToPiKPi {
   using TypeMcCollisions = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
 
   Filter filterSelectCandidates = (aod::hf_sel_candidate_dplus::isSelDplusToPiKPi & static_cast<int>(BIT(aod::SelectionStep::RecoMl - 1))) != 0; // select candidates which passed all cuts at least up to RecoMl - 1
-  Filter filterMcGenMatching = (nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi)) || (fillCorrelatedBkgs && aod::hf_cand_mc_flag::flagMcMatchGen != 0);
+  Filter filterMcGenMatching = nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi);
 
   Preslice<SelectedCandidates> candidatesPerCollision = aod::hf_cand::collisionId;
   Preslice<SelectedCandidatesMc> candidatesMcPerCollision = aod::hf_cand::collisionId;
@@ -243,6 +243,8 @@ struct HfDerivedDataCreatorDplusToPiKPi {
                          TracksWPid const&,
                          aod::BCs const&)
   {
+    LOG(info) << "IsMc:" << IsMc;
+    LOG(info) << "Processing candidates for collisions with size: " << collisions.size() << " and candidates with size: " << candidates.size();
     // Fill collision properties
     if constexpr (IsMc) {
       if (confDerData.fillMcRCollId) {

PWGHF/TableProducer/derivedDataCreatorDsToKKPi.cxx

@@ -102,7 +102,7 @@ struct HfDerivedDataCreatorDsToKKPi {
   using TypeMcCollisions = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
 
   Filter filterSelectCandidates = (aod::hf_sel_candidate_ds::isSelDsToKKPi & static_cast<int>(BIT(aod::SelectionStep::RecoMl - 1))) != 0; // select candidates which passed all cuts at least up to RecoMl - 1
-  Filter filterMcGenMatching = (nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(hf_decay::hf_cand_3prong::DecayChannelMain::DsToPiKK)) || (fillCorrelatedBkgs && aod::hf_cand_mc_flag::flagMcMatchGen != 0);
+  Filter filterMcGenMatching = nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(hf_decay::hf_cand_3prong::DecayChannelMain::DsToPiKK);
 
   Preslice<SelectedCandidates> candidatesPerCollision = aod::hf_cand::collisionId;
   Preslice<SelectedCandidatesMc> candidatesMcPerCollision = aod::hf_cand::collisionId;

PWGHF/TableProducer/derivedDataCreatorDstarToD0Pi.cxx

@@ -100,7 +100,7 @@ struct HfDerivedDataCreatorDstarToD0Pi {
   using TypeMcCollisions = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
 
   Filter filterSelectCandidates = aod::hf_sel_candidate_dstar::isSelDstarToD0Pi == true;
-  Filter filterMcGenMatching = (nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(hf_decay::hf_cand_dstar::DecayChannelMain::DstarToPiKPi)) || (fillCorrelatedBkgs && aod::hf_cand_mc_flag::flagMcMatchGen != 0);
+  Filter filterMcGenMatching = nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(hf_decay::hf_cand_dstar::DecayChannelMain::DstarToPiKPi);
 
   Preslice<SelectedCandidates> candidatesPerCollision = aod::hf_cand::collisionId;
   Preslice<SelectedCandidatesMc> candidatesMcPerCollision = aod::hf_cand::collisionId;

PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx

@@ -102,7 +102,7 @@ struct HfDerivedDataCreatorLcToPKPi {
   using TypeMcCollisions = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;
 
   Filter filterSelectCandidates = aod::hf_sel_candidate_lc::isSelLcToPKPi >= 1 || aod::hf_sel_candidate_lc::isSelLcToPiKP >= 1;
-  Filter filterMcGenMatching = (nabs(aod::hf_cand_mc_flag::flagMcMatchGen)) == static_cast<int8_t>(hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi) || (fillCorrelatedBkgs && aod::hf_cand_mc_flag::flagMcMatchGen != 0);
+  Filter filterMcGenMatching = nabs(aod::hf_cand_mc_flag::flagMcMatchGen) == static_cast<int8_t>(hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi);
 
   Preslice<SelectedCandidates> candidatesPerCollision = aod::hf_cand::collisionId;
   Preslice<SelectedCandidatesMc> candidatesMcPerCollision = aod::hf_cand::collisionId;