@@ -618,7 +618,6 @@ DECLARE_SOA_COLUMN(GeneratedK0Short, generatedK0Short, std::vector<uint32_t>);
618618DECLARE_SOA_COLUMN (GeneratedLambda, generatedLambda, std::vector<uint32_t >); // ! Lambda binned generated data
619619DECLARE_SOA_COLUMN (GeneratedAntiLambda, generatedAntiLambda, std::vector<uint32_t >); // ! AntiLambda binned generated data
620620
621-
622621// ______________________________________________________
623622// DYNAMIC COLUMNS
624623DECLARE_SOA_DYNAMIC_COLUMN (Px, px, // ! V0 px
@@ -628,18 +627,18 @@ DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //! V0 py
628627DECLARE_SOA_DYNAMIC_COLUMN (Pz, pz, // ! V0 pz
629628 [](float pzPos, float pzNeg) -> float { return pzPos + pzNeg; });
630629DECLARE_SOA_DYNAMIC_COLUMN (Pt, pt, // ! Transverse momentum in GeV/c
631- [](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float {
632- return RecoDecay::sqrtSumOfSquares (pxPos+ pxNeg, pyPos+ pyNeg);
630+ [](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float {
631+ return RecoDecay::sqrtSumOfSquares (pxPos + pxNeg, pyPos + pyNeg);
633632 });
634633DECLARE_SOA_DYNAMIC_COLUMN (P, p, // ! Total momentum in GeV/c
635- [](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
636- return RecoDecay::sqrtSumOfSquares (pxPos+ pxNeg, pyPos+ pyNeg, pzPos+ pzNeg);
634+ [](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
635+ return RecoDecay::sqrtSumOfSquares (pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg);
637636 });
638637DECLARE_SOA_DYNAMIC_COLUMN (Phi, phi, // ! Phi in the range [0, 2pi)
639- [](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float { return RecoDecay::phi (pxPos+ pxNeg, pyPos+ pyNeg); });
638+ [](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float { return RecoDecay::phi (pxPos + pxNeg, pyPos + pyNeg); });
640639DECLARE_SOA_DYNAMIC_COLUMN (Eta, eta, // ! Pseudorapidity, conditionally defined to avoid FPEs
641- [](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
642- return RecoDecay::eta (std::array{pxPos+ pxNeg, pyPos+ pyNeg, pzPos+ pzNeg});
640+ [](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
641+ return RecoDecay::eta (std::array{pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg});
643642 });
644643// Account for rigidity in case of hypertriton
645644DECLARE_SOA_DYNAMIC_COLUMN (PtHypertriton, ptHypertriton, // ! V0 pT
@@ -654,7 +653,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(V0Radius, v0radius, //! V0 decay radius (2D, centered
654653// Distance Over To Mom
655654DECLARE_SOA_DYNAMIC_COLUMN (DistOverTotMom, distovertotmom, // ! PV to V0decay distance over total momentum
656655 [](float X, float Y, float Z, float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg, float pvX, float pvY, float pvZ) {
657- float P = RecoDecay::sqrtSumOfSquares (pxPos+ pxNeg, pyPos+ pyNeg, pzPos+ pzNeg);
656+ float P = RecoDecay::sqrtSumOfSquares (pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg);
658657 return std::sqrt (std::pow (X - pvX, 2 ) + std::pow (Y - pvY, 2 ) + std::pow (Z - pvZ, 2 )) / (P + 1E-10 );
659658 });
660659
@@ -733,12 +732,12 @@ DECLARE_SOA_DYNAMIC_COLUMN(M, m, //! mass under a certain hypothesis (0:K0, 1:L,
733732 });
734733
735734DECLARE_SOA_DYNAMIC_COLUMN (YK0Short, yK0Short, // ! V0 y with K0short hypothesis
736- [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
737- return RecoDecay::y (std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassKaonNeutral);
735+ [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
736+ return RecoDecay::y (std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassKaonNeutral);
738737 });
739738DECLARE_SOA_DYNAMIC_COLUMN (YLambda, yLambda, // ! V0 y with lambda or antilambda hypothesis
740- [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
741- return RecoDecay::y (std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassLambda);
739+ [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
740+ return RecoDecay::y (std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassLambda);
742741 });
743742DECLARE_SOA_DYNAMIC_COLUMN (YHypertriton, yHypertriton, // ! V0 y with hypertriton hypothesis
744743 [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float { return RecoDecay::y (std::array{2 .0f * pxpos + pxneg, 2 .0f * pypos + pyneg, 2 .0f * pzpos + pzneg}, o2::constants::physics::MassHyperTriton); });
@@ -854,7 +853,7 @@ DECLARE_SOA_TABLE_STAGED(V0CoresBase, "V0CORE", //! core information about decay
854853
855854// extended table with expression columns that can be used as arguments of dynamic columns
856855// DECLARE_SOA_EXTENDED_TABLE_USER(V0Cores, V0CoresBase, "V0COREEXT", //!
857- // v0data::Px, v0data::Py, v0data::Pz, v0data::Pt, v0data::P, v0data::Phi, v0data::Eta); // the table name has here to be the one with EXT which is not nice and under study
856+ // v0data::Px, v0data::Py, v0data::Pz, v0data::Pt, v0data::P, v0data::Phi, v0data::Eta); // the table name has here to be the one with EXT which is not nice and under study
858857
859858// // extended table with expression columns that can be used as arguments of dynamic columns
860859// DECLARE_SOA_EXTENDED_TABLE_USER(StoredV0Cores, StoredV0CoresBase, "V0COREEXT", //!
@@ -1272,18 +1271,18 @@ DECLARE_SOA_DYNAMIC_COLUMN(CascRadius, cascradius, //!
12721271// CosPAs
12731272DECLARE_SOA_DYNAMIC_COLUMN (V0CosPA, v0cosPA, // !
12741273 [](float Xlambda, float Ylambda, float Zlambda, float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg, float pvX, float pvY, float pvZ) -> float {
1275- return RecoDecay::cpa (std::array{pvX, pvY, pvZ}, std::array{Xlambda, Ylambda, Zlambda}, std::array{pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg});
1274+ return RecoDecay::cpa (std::array{pvX, pvY, pvZ}, std::array{Xlambda, Ylambda, Zlambda}, std::array{pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg});
12761275 });
12771276// DECLARE_SOA_DYNAMIC_COLUMN(CascCosPA, casccosPA, //!
12781277// [](float X, float Y, float Z, float Px, float Py, float Pz, float pvX, float pvY, float pvZ) -> float { return RecoDecay::cpa(std::array{pvX, pvY, pvZ}, std::array{X, Y, Z}, std::array{Px, Py, Pz}); });
12791278DECLARE_SOA_DYNAMIC_COLUMN (CascCosPA, casccosPA, // !
12801279 [](float X, float Y, float Z, float PxBach, float PxPos, float PxNeg, float PyBach, float PyPos, float PyNeg, float PzBach, float PzPos, float PzNeg, float pvX, float pvY, float pvZ) -> float { return RecoDecay::cpa (std::array{pvX, pvY, pvZ}, std::array{X, Y, Z}, std::array{PxBach + PxPos + PxNeg, PyBach + PyPos + PyNeg, PzBach + PzPos + PzNeg}); });
12811280DECLARE_SOA_DYNAMIC_COLUMN (DCAV0ToPV, dcav0topv, // !
12821281 [](float X, float Y, float Z, float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg, float pvX, float pvY, float pvZ) -> float {
1283- float px = pxpos + pxneg;
1284- float py = pypos + pyneg;
1285- float pz = pzpos + pzneg;
1286- return std::sqrt ((std::pow ((pvY - Y) * pz - (pvZ - Z) * py, 2 ) + std::pow ((pvX - X) * pz - (pvZ - Z) * px, 2 ) + std::pow ((pvX - X) * py - (pvY - Y) * px, 2 )) / (px * px + py * py + pz * pz));
1282+ float px = pxpos + pxneg;
1283+ float py = pypos + pyneg;
1284+ float pz = pzpos + pzneg;
1285+ return std::sqrt ((std::pow ((pvY - Y) * pz - (pvZ - Z) * py, 2 ) + std::pow ((pvX - X) * pz - (pvZ - Z) * px, 2 ) + std::pow ((pvX - X) * py - (pvY - Y) * px, 2 )) / (px * px + py * py + pz * pz));
12871286 });
12881287
12891288// Calculated on the fly with mass assumption + dynamic tables
0 commit comments