Skip to content

[PWGJE] Change MiniCollision index column declaration for jetLundPlane.cxx #15633

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 5 commits into from
Apr 2, 2026
+10 −5
Merged

[PWGJE] Change MiniCollision index column declaration for jetLundPlane.cxx #15633

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1cb5cf
Change MiniCollision index column declaration
zovarga Apr 2, 2026
5acb1fe
Refactor collision key calculations with constants to fix O2 linter i…
zovarga Apr 2, 2026
5dc155d
Fixing O2 linter: Define minimum constituents for jet in jetLundPlane
zovarga Apr 2, 2026
f6a0bc3
Please consider the following formatting changes
alibuild Apr 2, 2026
d58d05c
Merge pull request #4 from alibuild/alibot-cleanup-15633
zovarga Apr 2, 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
15 changes: 10 additions & 5 deletions PWGJE/Tasks/jetLundPlane.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DECLARE_SOA_TABLE(MiniCollisions, "AOD", "MINICOLL",
MiniCollTag);

// MiniJets -> MiniCollisions
DECLARE_SOA_INDEX_COLUMN(MiniCollision, miniCollision);
DECLARE_SOA_INDEX_COLUMN_CUSTOM(MiniCollision, miniCollision, "MINICOLLS");

// Jet payload
DECLARE_SOA_COLUMN(Level, level, uint8_t); // JetLevel::Det=reco(det), JetLevel::Part=truth(part)
Expand Down Expand Up @@ -96,6 +96,9 @@ DECLARE_SOA_TABLE(MiniJetMatches, "AOD", "MINIMCH",
namespace
{
constexpr float kTiny = 1e-12f;
constexpr uint64_t collisionKeyShift = 1ULL;
constexpr uint64_t partCollisionKeyTag = 1ULL;
constexpr size_t MinConstituentsForJet = 2;

struct JetLevel {
enum Type : uint8_t {
Expand Down Expand Up @@ -416,7 +419,7 @@ struct JetLundPlaneUnfolding {
std::vector<SplittingObs> getPrimarySplittings(JetRowT const& jet, ConstituentTableT const&)
{
auto fjInputs = buildFastJetInputs(jet.template tracks_as<ConstituentTableT>(), trackPtMin.value);
if (fjInputs.size() < 2) {
if (fjInputs.size() < MinConstituentsForJet) {
return {};
}

Expand Down Expand Up @@ -583,7 +586,8 @@ struct JetLundPlaneUnfolding {
fillSplittingQAHists(spl, /*isTruth*/ true, partJet.pt());

if (writeMiniAOD.value) {
const uint64_t partCollKey = (static_cast<uint64_t>(partJet.mcCollisionId()) << 1U) | 1ULL;
const uint64_t partCollKey =
(static_cast<uint64_t>(partJet.mcCollisionId()) << collisionKeyShift) | partCollisionKeyTag;
int partMiniCollIdx = -1;
auto collIt = partMiniCollByKey.find(partCollKey);
if (collIt == partMiniCollByKey.end()) {
Expand Down Expand Up @@ -650,7 +654,8 @@ struct JetLundPlaneUnfolding {
fillSplittingQAHists(detSpl, /*isTruth*/ false, detJet.pt());

if (writeMiniAOD.value) {
const uint64_t detCollKey = (static_cast<uint64_t>(detJet.collisionId()) << 1U);
const uint64_t detCollKey =
(static_cast<uint64_t>(detJet.collisionId()) << collisionKeyShift);
int detMiniCollIdx = -1;
auto collIt = detMiniCollByKey.find(detCollKey);
if (collIt == detMiniCollByKey.end()) {
Expand Down Expand Up @@ -795,5 +800,5 @@ struct JetLundPlaneUnfolding {
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<JetLundPlaneUnfolding>(cfgc, TaskName{"jet-lund-plane"})};
adaptAnalysisTask<JetLundPlaneUnfolding>(cfgc)};
}
Loading