From 6e3fe8ef957cd686624302aba0051a385aa0b8d3 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Tue, 1 Jul 2025 11:31:46 +0200 Subject: [PATCH 1/3] Remove duplicated consuming of McParticles. --- .../candidateCreatorSigmac0plusplus.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx index e66702055d8..a236487a442 100644 --- a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx +++ b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx @@ -466,9 +466,9 @@ struct HfCandidateSigmac0plusplusMc { /// @brief process function for MC matching of Σc0,++ → Λc+(→pK-π+) π- reconstructed candidates and counting of generated ones /// @param candidatesSigmac reconstructed Σc0,++ candidates /// @param mcParticles table of generated particles - void processMc(aod::McParticles const& mcParticles, + void processMc(McParticlesLcGenMatch const& mcParticles, // aod::McParticles const& mcParticles, aod::TracksWMc const& tracks, - LambdacMc const& candsLc, McParticlesLcGenMatch const& mcParticlesLcGenMatch, + LambdacMc const& candsLc, // McParticlesLcGenMatch const& mcParticles, McCollisionsNoCents const& collInfos, aod::McCollisions const&, BCsInfo const&) @@ -576,7 +576,7 @@ struct HfCandidateSigmac0plusplusMc { } /// end loop over reconstructed Σc0,++ candidates /// Match generated Σc0,++ candidates - for (const auto& particle : mcParticlesLcGenMatch) { + for (const auto& particle : mcParticles) { flag = 0; origin = 0; std::vector idxBhadMothers{}; @@ -602,7 +602,7 @@ struct HfCandidateSigmac0plusplusMc { /// → here we check level 1. first, and then levels 2. and 3. are inherited by the Λc+ → pK-π+ MC matching in candidateCreator3Prong.cxx /// look for Σc0,++(2455) - if (RecoDecay::isMatchedMCGen(mcParticlesLcGenMatch, particle, Pdg::kSigmaC0, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiMinus)}, true, &sign, 1)) { + if (RecoDecay::isMatchedMCGen(mcParticles, particle, Pdg::kSigmaC0, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiMinus)}, true, &sign, 1)) { // generated Σc0(2455) for (const auto& daughter : particle.daughters_as()) { // look for Λc+ daughter decaying in pK-π+ @@ -615,7 +615,7 @@ struct HfCandidateSigmac0plusplusMc { break; } } - } else if (RecoDecay::isMatchedMCGen(mcParticlesLcGenMatch, particle, Pdg::kSigmaCPlusPlus, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiPlus)}, true, &sign, 1)) { + } else if (RecoDecay::isMatchedMCGen(mcParticles, particle, Pdg::kSigmaCPlusPlus, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiPlus)}, true, &sign, 1)) { // generated Σc++(2455) for (const auto& daughter : particle.daughters_as()) { // look for Λc+ daughter decaying in pK-π+ @@ -632,7 +632,7 @@ struct HfCandidateSigmac0plusplusMc { /// look for Σc0,++(2520) if (flag == 0) { - if (RecoDecay::isMatchedMCGen(mcParticlesLcGenMatch, particle, Pdg::kSigmaCStar0, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiMinus)}, true, &sign, 1)) { + if (RecoDecay::isMatchedMCGen(mcParticles, particle, Pdg::kSigmaCStar0, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiMinus)}, true, &sign, 1)) { // generated Σc0(2520) for (const auto& daughter : particle.daughters_as()) { // look for Λc+ daughter decaying in pK-π+ @@ -645,7 +645,7 @@ struct HfCandidateSigmac0plusplusMc { break; } } - } else if (RecoDecay::isMatchedMCGen(mcParticlesLcGenMatch, particle, Pdg::kSigmaCStarPlusPlus, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiPlus)}, true, &sign, 1)) { + } else if (RecoDecay::isMatchedMCGen(mcParticles, particle, Pdg::kSigmaCStarPlusPlus, std::array{static_cast(Pdg::kLambdaCPlus), static_cast(kPiPlus)}, true, &sign, 1)) { // generated Σc++(2520) for (const auto& daughter : particle.daughters_as()) { // look for Λc+ daughter decaying in pK-π+ @@ -663,7 +663,7 @@ struct HfCandidateSigmac0plusplusMc { /// check the origin (prompt vs. non-prompt) if (flag != 0) { - origin = RecoDecay::getCharmHadronOrigin(mcParticlesLcGenMatch, particle, false, &idxBhadMothers); + origin = RecoDecay::getCharmHadronOrigin(mcParticles, particle, false, &idxBhadMothers); } /// fill the table with results of generation level MC matching if (origin == RecoDecay::OriginType::NonPrompt) { From d8a1da7578b8fe6f971095a2dacc1bb620a69bc9 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Tue, 1 Jul 2025 11:34:54 +0200 Subject: [PATCH 2/3] Remove unneccessary comments. --- PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx index a236487a442..42869537a1a 100644 --- a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx +++ b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx @@ -466,9 +466,9 @@ struct HfCandidateSigmac0plusplusMc { /// @brief process function for MC matching of Σc0,++ → Λc+(→pK-π+) π- reconstructed candidates and counting of generated ones /// @param candidatesSigmac reconstructed Σc0,++ candidates /// @param mcParticles table of generated particles - void processMc(McParticlesLcGenMatch const& mcParticles, // aod::McParticles const& mcParticles, + void processMc(McParticlesLcGenMatch const& mcParticles, aod::TracksWMc const& tracks, - LambdacMc const& candsLc, // McParticlesLcGenMatch const& mcParticles, + LambdacMc const& candsLc, McCollisionsNoCents const& collInfos, aod::McCollisions const&, BCsInfo const&) From 557164fd038569f95402d3854c7cdedd4c81a576 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Wed, 2 Jul 2025 16:39:39 +0200 Subject: [PATCH 3/3] Add comment about new data type. --- PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx index 42869537a1a..9a59c28cf9c 100644 --- a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx +++ b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx @@ -417,7 +417,7 @@ struct HfCandidateSigmac0plusplusMc { using BCsInfo = soa::Join; using LambdacMc = soa::Join; - using McParticlesLcGenMatch = soa::Join; + using McParticlesLcGenMatch = soa::Join; // including response of particle matching to MC from candidate-creator-3-prong using McCollisionsNoCents = soa::Join; PresliceUnsorted colPerMcCollision = aod::mccollisionlabel::mcCollisionId;