Skip to content

Commit 834ca85

Browse files
authored
Add pVector in McParticles (#13043)
1 parent 192ccdf commit 834ca85

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Framework/Core/include/Framework/AnalysisDataModel.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(PVector, pVector, //! Momentum vector in x,y,z-direct
165165
const auto px = pt * (r * cs - snp * sn);
166166
const auto py = pt * (snp * cs + r * sn);
167167
const auto pz = pt * tgl;
168-
return std::move(std::array<float, 3>{std::move(px), std::move(py), std::move(pz)});
168+
return std::array<float, 3>{px, py, pz};
169169
});
170170
DECLARE_SOA_EXPRESSION_COLUMN(P, p, float, //! Momentum in Gev/c
171171
ifnode(nabs(aod::track::signed1Pt) <= o2::constants::math::Almost0, o2::constants::math::VeryBig, 0.5f * (ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::track::tgl)) + 1.f / ntan(o2::constants::math::PIQuarter - 0.5f * natan(aod::track::tgl))) / nabs(aod::track::signed1Pt)));
@@ -1580,6 +1580,8 @@ DECLARE_SOA_DYNAMIC_COLUMN(GetHepMCStatusCode, getHepMCStatusCode, //! The HepMC
15801580
[](uint8_t flags, int statusCode) -> int { if ((flags & o2::aod::mcparticle::enums::ProducedByTransport) == 0x0) { return o2::mcgenstatus::getHepMCStatusCode(statusCode); } else { return -1; } });
15811581
DECLARE_SOA_DYNAMIC_COLUMN(IsPhysicalPrimary, isPhysicalPrimary, //! True if particle is considered a physical primary according to the ALICE definition
15821582
[](uint8_t flags) -> bool { return (flags & o2::aod::mcparticle::enums::PhysicalPrimary) == o2::aod::mcparticle::enums::PhysicalPrimary; });
1583+
DECLARE_SOA_DYNAMIC_COLUMN(PVector, pVector, //! Momentum vector in x,y,z-directions in GeV/c
1584+
[](float px, float py, float pz) -> std::array<float, 3> { return std::array<float, 3>{px, py, pz}; });
15831585

15841586
DECLARE_SOA_EXPRESSION_COLUMN(Phi, phi, float, //! Phi in the range [0, 2pi)
15851587
o2::constants::math::PI + natan2(-1.0f * aod::mcparticle::py, -1.0f * aod::mcparticle::px));
@@ -1618,6 +1620,7 @@ DECLARE_SOA_TABLE_FULL(StoredMcParticles_000, "McParticles", "AOD", "MCPARTICLE"
16181620
mcparticle::Daughter0Id, mcparticle::Daughter1Id, mcparticle::Weight,
16191621
mcparticle::Px, mcparticle::Py, mcparticle::Pz, mcparticle::E,
16201622
mcparticle::Vx, mcparticle::Vy, mcparticle::Vz, mcparticle::Vt,
1623+
mcparticle::PVector<mcparticle::Px, mcparticle::Py, mcparticle::Pz>,
16211624
mcparticle::ProducedByGenerator<mcparticle::Flags>,
16221625
mcparticle::FromBackgroundEvent<mcparticle::Flags>,
16231626
mcparticle::GetGenStatusCode<mcparticle::Flags, mcparticle::StatusCode>,
@@ -1631,6 +1634,7 @@ DECLARE_SOA_TABLE_FULL_VERSIONED(StoredMcParticles_001, "McParticles", "AOD", "M
16311634
mcparticle::MothersIds, mcparticle::DaughtersIdSlice, mcparticle::Weight,
16321635
mcparticle::Px, mcparticle::Py, mcparticle::Pz, mcparticle::E,
16331636
mcparticle::Vx, mcparticle::Vy, mcparticle::Vz, mcparticle::Vt,
1637+
mcparticle::PVector<mcparticle::Px, mcparticle::Py, mcparticle::Pz>,
16341638
mcparticle::ProducedByGenerator<mcparticle::Flags>,
16351639
mcparticle::FromBackgroundEvent<mcparticle::Flags>,
16361640
mcparticle::GetGenStatusCode<mcparticle::Flags, mcparticle::StatusCode>,

0 commit comments

Comments
 (0)