Skip to content

[PWGJE] fixes to charm hadronisation task #15534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nzardosh merged 9 commits into from
Mar 27, 2026
+18 −18
Merged

[PWGJE] fixes to charm hadronisation task #15534

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5bbb220
Converted data process function to templated version. It allows the p…
christianreckziegel Jan 6, 2026
f6d7879
Changed name convention to hf instead of D0, removed chosenHadron not…
christianreckziegel Jan 26, 2026
1aece1a
Templatization of matched MC process function so that it can be calle…
christianreckziegel Jan 26, 2026
d6a3964
Fix: clang-formatting done manually
christianreckziegel Jan 27, 2026
b5e0471
Fix: formatting with automatic git-clang-format feature
christianreckziegel Jan 27, 2026
790959e
Fix: included HF hadron in the jet constituents counting.
christianreckziegel Mar 26, 2026
d8cef62
Added collision selection from jetderiveddatautilities for MC collisi…
christianreckziegel Mar 26, 2026
faa1978
Please consider the following formatting changes
alibuild Mar 26, 2026
7e7477c
Merge pull request #5 from alibuild/alibot-cleanup-15534
christianreckziegel Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions PWGJE/Tasks/hfFragmentationFunction.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ struct HfFragmentationFunction {

// filling table
distJetTable(axisDistance,
jet.pt(), jet.eta(), jet.phi(), jet.template tracks_as<aod::JetTracks>().size(),
jet.pt(), jet.eta(), jet.phi(), jet.template tracks_as<aod::JetTracks>().size() + jet.template candidates_as<TCandidates>().size(),
candidate.pt(), candidate.eta(), candidate.phi(), candidate.m(), candidate.y(), candidate.mlScores()[0], candidate.mlScores()[1], candidate.mlScores()[2]);

break; // get out of candidates' loop after first HF particle is found in jet
Expand Down Expand Up @@ -319,7 +319,7 @@ struct HfFragmentationFunction {

registry.fill(HIST("h_collision_counter"), 0.0);
// skip collisions outside of |z| < vertexZCut
if (std::abs(mccollision.posZ()) > vertexZCut) {
if (!jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits) || !(std::abs(mccollision.posZ()) < vertexZCut)) {
continue;
}
registry.fill(HIST("h_collision_counter"), 1.0);
Expand Down Expand Up @@ -366,7 +366,7 @@ struct HfFragmentationFunction {

// store data in MC detector level table
mcddistJetTable(jetutilities::deltaR(mcdjet, mcdd0cand),
mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.tracks_as<aod::JetTracks>().size(), // detector level jet
mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.tracks_as<aod::JetTracks>().size() + mcdjet.candidates_as<aod::CandidatesD0MCD>().size(), // detector level jet
mcdd0cand.pt(), mcdd0cand.eta(), mcdd0cand.phi(), mcdd0cand.m(), mcdd0cand.y(), (mcdd0cand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level D0 candidate
mcdjet.has_matchedJetCand(), mcdd0cand.mlScores()[0], mcdd0cand.mlScores()[1], mcdd0cand.mlScores()[2], // // Machine Learning PID scores: background, prompt, non-prompt
matchedFrom, selectedAs); // D0 = +1, D0bar = -1, neither = 0
Expand All @@ -388,8 +388,8 @@ struct HfFragmentationFunction {

// store data in MC detector level table (calculate angular distance in eta-phi plane on the fly)
mcpdistJetTable(jetutilities::deltaR(mcpjet, mcpd0cand),
mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.tracks_as<aod::JetParticles>().size(), // particle level jet
mcpd0cand.pt(), mcpd0cand.eta(), mcpd0cand.phi(), mcpd0cand.y(), (mcpd0cand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level D0
mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.tracks_as<aod::JetParticles>().size() + mcpjet.candidates_as<aod::CandidatesD0MCP>().size(), // particle level jet
mcpd0cand.pt(), mcpd0cand.eta(), mcpd0cand.phi(), mcpd0cand.y(), (mcpd0cand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level D0
mcpjet.has_matchedJetCand());
}
}
Expand All @@ -410,7 +410,7 @@ struct HfFragmentationFunction {
for (const auto& mccollision : mccollisions) {
registry.fill(HIST("h_collision_counter"), 0.0);
// skip collisions outside of |z| < vertexZCut
if (std::abs(mccollision.posZ()) > vertexZCut) {
if (!jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits) || !(std::abs(mccollision.posZ()) < vertexZCut)) {
continue;
}
registry.fill(HIST("h_collision_counter"), 1.0);
Expand Down Expand Up @@ -465,21 +465,21 @@ struct HfFragmentationFunction {
}

// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size(), // particle level jet
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
jetutilities::deltaR(mcdjet, mcdcand), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.template tracks_as<aod::JetTracks>().size(), // detector level jet
mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level HF
mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2], // Machine Learning PID scores: background, prompt, non-prompt
matchedFrom, selectedAs); // HF = +1, HFbar = -1, neither = 0
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + mcpjet.template candidates_as<TCandidatesMCP>().size(), // particle level jet
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
jetutilities::deltaR(mcdjet, mcdcand), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.template tracks_as<aod::JetTracks>().size() + +mcdjet.template candidates_as<TCandidatesMCD>().size(), // detector level jet
mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level HF
mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2], // Machine Learning PID scores: background, prompt, non-prompt
matchedFrom, selectedAs); // HF = +1, HFbar = -1, neither = 0
}
} else {
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size(), // particle level jet
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
-2, -2, -2, -2, -2, // detector level jet
-2, -2, -2, -2, -2, -2, // detector level HF
-2, -2, -2, // Machine Learning PID scores: background, prompt, non-prompt
-2, -2); // HF = +1, HFbar = -1, neither = 0
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + +mcpjet.template candidates_as<TCandidatesMCP>().size(), // particle level jet
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
-2, -2, -2, -2, -2, // detector level jet
-2, -2, -2, -2, -2, -2, // detector level HF
-2, -2, -2, // Machine Learning PID scores: background, prompt, non-prompt
-2, -2); // HF = +1, HFbar = -1, neither = 0
}
} // end of mcpjets loop
} // end of mccollisions loop
Expand Down
Loading