Skip to content

Commit f22de23

Browse files
authored
Merge pull request #41 from alibuild/alibot-cleanup-15609
Please consider the following formatting changes to #15609
2 parents 6ff6862 + 3a0a37a commit f22de23

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

Framework/Core/include/Framework/AnalysisDataModel.h

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,8 +1918,6 @@ DECLARE_SOA_TABLE_VERSIONED(McCollisions_001, "AOD", "MCCOLLISION", 1, //! MC co
19181918
using McCollisions = McCollisions_001;
19191919
using McCollision = McCollisions::iterator;
19201920

1921-
1922-
19231921
namespace mcparticle
19241922
{
19251923
DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! MC collision of this particle
@@ -1987,24 +1985,24 @@ DECLARE_SOA_EXPRESSION_COLUMN(Y, y, float, //! Particle rapidity, conditionally
19871985
} // namespace mcparticle
19881986

19891987
namespace mcparticle_v2
1990-
{
1988+
{
19911989
// for improved getters with protection against incorrect physical primary tagging
1992-
// note: this has to be declared in a separate namespace so it does not conflict with existing
1993-
// derived data table declarations in O2Physics
1990+
// note: this has to be declared in a separate namespace so it does not conflict with existing
1991+
// derived data table declarations in O2Physics
19941992
DECLARE_SOA_DYNAMIC_COLUMN(IsPhysicalPrimary, isPhysicalPrimary, //! True if particle is considered a physical primary according to the ALICE definition
1995-
[](uint8_t flags, float vx, float vy) -> bool {
1993+
[](uint8_t flags, float vx, float vy) -> bool {
19961994
if(std::hypot(vx, vy) > o2::aod::mcparticle::maxRadiusForPhysicalPrimary) return o2::aod::mcparticle::enums::FromBackgroundEvent;
19971995
return (flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary; });
19981996

1999-
// avoid that the stored flags are provided unprotected via
1997+
// avoid that the stored flags are provided unprotected via
20001998
// the getter '.flags': analysers will get the correct bit map transparently
2001-
DECLARE_SOA_COLUMN(Flags, storedFlags, uint8_t); //! ALICE specific flags, see MCParticleFlags. Do not use directly. Use the dynamic columns, e.g. producedByGenerator()
1999+
DECLARE_SOA_COLUMN(Flags, storedFlags, uint8_t); //! ALICE specific flags, see MCParticleFlags. Do not use directly. Use the dynamic columns, e.g. producedByGenerator()
20022000
DECLARE_SOA_DYNAMIC_COLUMN(McParticleFlags, flags, //! protected against
20032001
[](uint8_t input_flags, float vx, float vy) -> uint8_t {
20042002
if(std::hypot(vx, vy) > o2::aod::mcparticle::maxRadiusForPhysicalPrimary) return o2::aod::mcparticle::enums::FromBackgroundEvent;
20052003
return input_flags; });
20062004

2007-
}
2005+
} // namespace mcparticle_v2
20082006

20092007
DECLARE_SOA_TABLE_FULL(StoredMcParticles_000, "McParticles", "AOD", "MCPARTICLE", //! MC particle table, version 000
20102008
o2::soa::Index<>, mcparticle::McCollisionId,

Framework/Core/include/Framework/DataTypes.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ enum ForwardTrackTypeEnum : uint8_t {
148148
};
149149
} // namespace o2::aod::fwdtrack
150150

151-
namespace o2::aod::mcparticle{
151+
namespace o2::aod::mcparticle
152+
{
152153
constexpr float maxRadiusForPhysicalPrimary{5.f};
153154
}
154155

0 commit comments

Comments
 (0)