Skip to content

Data model fix: avoid classifying TPC loopers as physical primary #15609

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

Draft
ddobrigk wants to merge 9 commits into
base: dev
Choose a base branch
from
+49 −14
Draft

Data model fix: avoid classifying TPC loopers as physical primary #15609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ff6862
Transparent fix proposal draft 1
ddobrigk Jul 17, 2026
3a0a37a
Please consider the following formatting changes
alibuild Jul 17, 2026
f22de23
Merge pull request #41 from alibuild/alibot-cleanup-15609
ddobrigk Jul 17, 2026
0eb94bd
Fix whitespace
ddobrigk Jul 17, 2026
afb61fa
Address only the bug
ddobrigk Jul 18, 2026
22a43b5
Adjustments: fix bugs, tuning
ddobrigk Jul 21, 2026
b466e9b
Improve name of ProtectedFlags
ddobrigk Jul 21, 2026
523908e
Please consider the following formatting changes
alibuild Jul 21, 2026
e5c7115
Merge pull request #42 from alibuild/alibot-cleanup-15609
ddobrigk Jul 21, 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
46 changes: 32 additions & 14 deletions Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1984,34 +1984,52 @@ DECLARE_SOA_EXPRESSION_COLUMN(Y, y, float, //! Particle rapidity, conditionally
(aod::mcparticle::e - aod::mcparticle::pz))));
} // namespace mcparticle

namespace mcparticle_v2
{
// for improved getters with protection against incorrect physical primary tagging
// note: this has to be declared in a separate namespace so it does not conflict with existing
// derived data table declarations in O2Physics
DECLARE_SOA_DYNAMIC_COLUMN(IsPhysicalPrimary, isPhysicalPrimary, //! True if particle is considered a physical primary according to the ALICE definition
[](uint8_t input_flags, float vx, float vy) -> bool { return (o2::aod::mcparticle::Tools::removeIsPhysicalPrimaryBit(input_flags, vx, vy) & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary; });

// avoid that the stored flags are provided unprotected via
// the getter '.flags': analysers will get the correct bit map transparently
DECLARE_SOA_COLUMN(Flags, storedFlags, uint8_t); //! ALICE specific flags, see MCParticleFlags. Do not use directly. Use the dynamic columns, e.g. producedByGenerator()
DECLARE_SOA_DYNAMIC_COLUMN(ProtectedFlags, flags, //! protected against
[](uint8_t input_flags, float vx, float vy) -> uint8_t { return o2::aod::mcparticle::Tools::removeIsPhysicalPrimaryBit(input_flags, vx, vy); });

} // namespace mcparticle_v2

DECLARE_SOA_TABLE_FULL(StoredMcParticles_000, "McParticles", "AOD", "MCPARTICLE", //! MC particle table, version 000
o2::soa::Index<>, mcparticle::McCollisionId,
mcparticle::PdgCode, mcparticle::StatusCode, mcparticle::Flags,
mcparticle::PdgCode, mcparticle::StatusCode, mcparticle_v2::Flags,
mcparticle::Mother0Id, mcparticle::Mother1Id,
mcparticle::Daughter0Id, mcparticle::Daughter1Id, mcparticle::Weight,
mcparticle::Px, mcparticle::Py, mcparticle::Pz, mcparticle::E,
mcparticle::Vx, mcparticle::Vy, mcparticle::Vz, mcparticle::Vt,
mcparticle::PVector<mcparticle::Px, mcparticle::Py, mcparticle::Pz>,
mcparticle::ProducedByGenerator<mcparticle::Flags>,
mcparticle::FromBackgroundEvent<mcparticle::Flags>,
mcparticle::GetGenStatusCode<mcparticle::Flags, mcparticle::StatusCode>,
mcparticle::GetHepMCStatusCode<mcparticle::Flags, mcparticle::StatusCode>,
mcparticle::GetProcess<mcparticle::Flags, mcparticle::StatusCode>,
mcparticle::IsPhysicalPrimary<mcparticle::Flags>);
mcparticle::ProducedByGenerator<mcparticle_v2::Flags>,
mcparticle::FromBackgroundEvent<mcparticle_v2::Flags>,
mcparticle::GetGenStatusCode<mcparticle_v2::Flags, mcparticle::StatusCode>,
mcparticle::GetHepMCStatusCode<mcparticle_v2::Flags, mcparticle::StatusCode>,
mcparticle::GetProcess<mcparticle_v2::Flags, mcparticle::StatusCode>,
mcparticle_v2::ProtectedFlags<mcparticle_v2::Flags, mcparticle::Vx, mcparticle::Vy>,
mcparticle_v2::IsPhysicalPrimary<mcparticle_v2::Flags, mcparticle::Vx, mcparticle::Vy>);

DECLARE_SOA_TABLE_FULL_VERSIONED(StoredMcParticles_001, "McParticles", "AOD", "MCPARTICLE", 1, //! MC particle table, version 001
o2::soa::Index<>, mcparticle::McCollisionId,
mcparticle::PdgCode, mcparticle::StatusCode, mcparticle::Flags,
mcparticle::PdgCode, mcparticle::StatusCode, mcparticle_v2::Flags,
mcparticle::MothersIds, mcparticle::DaughtersIdSlice, mcparticle::Weight,
mcparticle::Px, mcparticle::Py, mcparticle::Pz, mcparticle::E,
mcparticle::Vx, mcparticle::Vy, mcparticle::Vz, mcparticle::Vt,
mcparticle::PVector<mcparticle::Px, mcparticle::Py, mcparticle::Pz>,
mcparticle::ProducedByGenerator<mcparticle::Flags>,
mcparticle::FromBackgroundEvent<mcparticle::Flags>,
mcparticle::GetGenStatusCode<mcparticle::Flags, mcparticle::StatusCode>,
mcparticle::GetHepMCStatusCode<mcparticle::Flags, mcparticle::StatusCode>,
mcparticle::GetProcess<mcparticle::Flags, mcparticle::StatusCode>,
mcparticle::IsPhysicalPrimary<mcparticle::Flags>);
mcparticle::ProducedByGenerator<mcparticle_v2::Flags>,
mcparticle::FromBackgroundEvent<mcparticle_v2::Flags>,
mcparticle::GetGenStatusCode<mcparticle_v2::Flags, mcparticle::StatusCode>,
mcparticle::GetHepMCStatusCode<mcparticle_v2::Flags, mcparticle::StatusCode>,
mcparticle::GetProcess<mcparticle_v2::Flags, mcparticle::StatusCode>,
mcparticle_v2::ProtectedFlags<mcparticle_v2::Flags, mcparticle::Vx, mcparticle::Vy>,
mcparticle_v2::IsPhysicalPrimary<mcparticle_v2::Flags, mcparticle::Vx, mcparticle::Vy>);
Comment thread
jackal1-66 marked this conversation as resolved.

DECLARE_SOA_EXTENDED_TABLE(McParticles_000, StoredMcParticles_000, "EXMCPARTICLE", 0, //! Basic MC particle properties
mcparticle::Phi,
Expand Down
17 changes: 17 additions & 0 deletions Framework/Core/include/Framework/DataTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include "CommonConstants/LHCConstants.h"

#include <cmath>
#include <cstdint>
#include <limits>
#include <array>
Expand Down Expand Up @@ -158,6 +159,22 @@ enum MCParticleFlags : uint8_t {
};
} // namespace o2::aod::mcparticle::enums

namespace o2::aod::mcparticle
{
constexpr float maxRadiusForPhysicalPrimary{5.f};

struct Tools {
// trivial helper to remove Physical Primary bit
static uint8_t removeIsPhysicalPrimaryBit(uint8_t input_flags, float vx, float vy)
{
if ((std::hypot(vx, vy) > o2::aod::mcparticle::maxRadiusForPhysicalPrimary) && ((input_flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary)) {
input_flags = input_flags & ~enums::PhysicalPrimary; // remove physical primary bit, keep others
}
return input_flags;
}
};
} // namespace o2::aod::mcparticle

namespace o2::aod::run2
{
enum Run2EventSelectionCut {
Expand Down