Skip to content

Commit 9629741

Browse files
romainschotterromainschotter
authored
Merge pull request #98 from alibuild/alibot-cleanup-18048
Please consider the following formatting changes to #18048
2 parents a78dd28 + 51d49d0 commit 9629741

1 file changed

Lines changed: 21 additions & 22 deletions

File tree

‎PWGLF/DataModel/LFSigmaTables.h‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,11 +1449,11 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p, //! Total momentum in GeV/c
14491449

14501450
DECLARE_SOA_DYNAMIC_COLUMN(Xi0Mass, xi0Mass,
14511451
[](float photon1Px, float photon1Py, float photon1Pz, float photon2Px, float photon2Py, float photon2Pz, float lambdaPx, float lambdaPy, float lambdaPz) -> float {
1452-
std::array<float, 3> pVecPi0{photon1Px+photon2Px, photon1Py+photon2Py, photon1Pz+photon2Pz};
1452+
std::array<float, 3> pVecPi0{photon1Px + photon2Px, photon1Py + photon2Py, photon1Pz + photon2Pz};
14531453
std::array<float, 3> pVecLambda{lambdaPx, lambdaPy, lambdaPz};
14541454
auto arrMom = std::array{pVecPi0, pVecLambda};
14551455
return RecoDecay::m(arrMom, std::array{o2::constants::physics::MassPi0, o2::constants::physics::MassXi0});
1456-
});
1456+
});
14571457

14581458
DECLARE_SOA_DYNAMIC_COLUMN(PxPi0, pxPi0, //! Pi0 px
14591459
[](float photon1Px, float photon2Px) -> float { return photon1Px + photon2Px; });
@@ -1487,11 +1487,11 @@ DECLARE_SOA_DYNAMIC_COLUMN(Radius, radius, //! Xi0 decay radius (2D, centered at
14871487
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
14881488

14891489
DECLARE_SOA_DYNAMIC_COLUMN(RadiusPi0, radiusPi0, //! Pi0 decay radius (2D, centered at zero)
1490-
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
1490+
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
14911491

14921492
DECLARE_SOA_DYNAMIC_COLUMN(RadiusLambda, radiusLambda, //! Pi0 decay radius (2D, centered at zero)
1493-
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
1494-
1493+
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
1494+
14951495
// CosPAs
14961496
DECLARE_SOA_DYNAMIC_COLUMN(Pi0CosPA, pi0CosPA, //!
14971497
[](float xPi0, float yPi0, float zPi0, float pxGamma1, float pyGamma1, float pzGamma1, float pxGamma2, float pyGamma2, float pzGamma2, float pvX, float pvY, float pvZ) -> float {
@@ -1510,14 +1510,14 @@ DECLARE_SOA_DYNAMIC_COLUMN(DCALambdaToPV, dcaLambdaToPV, //!
15101510
[](float X, float Y, float Z, float px, float py, float pz, float pvX, float pvY, float pvZ) -> float {
15111511
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));
15121512
});
1513-
1513+
15141514
DECLARE_SOA_DYNAMIC_COLUMN(DCAPi0ToPV, dcaPi0ToPV, //!
15151515
[](float X, float Y, float Z, float pxGamma1, float pyGamma1, float pzGamma1, float pxGamma2, float pyGamma2, float pzGamma2, float pvX, float pvY, float pvZ) -> float {
15161516
float px = pxGamma1 + pxGamma2;
15171517
float py = pyGamma1 + pyGamma2;
15181518
float pz = pzGamma1 + pzGamma2;
15191519
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));
1520-
});
1520+
});
15211521

15221522
DECLARE_SOA_DYNAMIC_COLUMN(Photon1Pt, photon1Pt, //! Transverse momentum in GeV/c
15231523
[](float photon1Px, float photon1Py) -> float {
@@ -1586,12 +1586,12 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaY, lambdaY, //! Rapidity
15861586
});
15871587

15881588
DECLARE_SOA_DYNAMIC_COLUMN(LambdaPhi, lambdaPhi, //! Phi in the range [0, 2pi)
1589-
[](float lambdaPx, float lambdaPy) -> float { return RecoDecay::phi(lambdaPx, lambdaPy); });
1589+
[](float lambdaPx, float lambdaPy) -> float { return RecoDecay::phi(lambdaPx, lambdaPy); });
15901590

1591-
} // namespace Pi0Core
1591+
} // namespace Xi0Core
15921592

15931593
DECLARE_SOA_TABLE(Xi0Cores, "AOD", "XI0CORES",
1594-
Xi0Core::X, Xi0Core::Y, Xi0Core::Z,
1594+
Xi0Core::X, Xi0Core::Y, Xi0Core::Z,
15951595
Xi0Core::XPi0, Xi0Core::YPi0, Xi0Core::ZPi0,
15961596
Xi0Core::XLambda, Xi0Core::YLambda, Xi0Core::ZLambda,
15971597
Xi0Core::DCADaughters, Xi0Core::DCADaughtersPi0, Xi0Core::DCAXYCascToPV, Xi0Core::DCAZCascToPV,
@@ -1650,15 +1650,14 @@ DECLARE_SOA_TABLE(Xi0CollRefs, "AOD", "XI0COLLREFS", //! optional table to refer
16501650
o2::soa::Index<>, v0data::StraCollisionId);
16511651

16521652
DECLARE_SOA_TABLE(Xi0Indices, "AOD", "XI0INDICES", //! optional table to refer back to V0Cores
1653-
o2::soa::Index<>, Xi0Core::Photon1Index, Xi0Core::Photon2Index, Xi0Core::LambdaIndex);
1654-
1655-
1653+
o2::soa::Index<>, Xi0Core::Photon1Index, Xi0Core::Photon2Index, Xi0Core::LambdaIndex);
1654+
16561655
// for MC
16571656
namespace Xi0MCCore
16581657
{
16591658
DECLARE_SOA_COLUMN(Photon1Index, photon1Index, int);
16601659
DECLARE_SOA_COLUMN(Photon2Index, photon2Index, int);
1661-
DECLARE_SOA_COLUMN(LambdaIndex, lambdaIndex, int);
1660+
DECLARE_SOA_COLUMN(LambdaIndex, lambdaIndex, int);
16621661

16631662
DECLARE_SOA_COLUMN(Photon1MCPx, photon1mcpx, float);
16641663
DECLARE_SOA_COLUMN(Photon1MCPy, photon1mcpy, float);
@@ -1731,13 +1730,13 @@ DECLARE_SOA_DYNAMIC_COLUMN(MCPhi, mcPhi, //! Phi in the range [0, 2pi)
17311730
DECLARE_SOA_DYNAMIC_COLUMN(MCEta, mcEta, //! Pseudorapidity
17321731
[](float photon1MCPx, float photon1MCPy, float photon1MCPz, float photon2MCPx, float photon2MCPy, float photon2MCPz, float lambdaMCPx, float lambdaMCPy, float lambdaMCPz) -> float {
17331732
return RecoDecay::eta(std::array{photon1MCPx + photon2MCPx + lambdaMCPx, photon1MCPy + photon2MCPy + lambdaMCPy, photon1MCPz + photon2MCPz + lambdaMCPz});
1734-
});
1735-
1733+
});
1734+
17361735
DECLARE_SOA_DYNAMIC_COLUMN(MCRadius, mcRadius, //! Xi0 decay radius (2D, centered at zero)
17371736
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
17381737

17391738
DECLARE_SOA_DYNAMIC_COLUMN(MCRadiusPi0, mcRadiusPi0, //! Pi0 decay radius (2D, centered at zero)
1740-
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
1739+
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
17411740

17421741
DECLARE_SOA_DYNAMIC_COLUMN(Pi0MCPx, pi0mcpx, //! Pi0 MC px
17431742
[](float photon1MCPx, float photon2MCPx) -> float { return photon1MCPx + photon2MCPx; });
@@ -1851,9 +1850,9 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaMCY, lambdaMCY, //! Rapidity
18511850
});
18521851

18531852
DECLARE_SOA_DYNAMIC_COLUMN(LambdaMCPhi, lambdaMCPhi, //! Phi in the range [0, 2pi)
1854-
[](float lambdaMCPx, float lambdaMCPy) -> float { return RecoDecay::phi(lambdaMCPx, lambdaMCPy); });
1853+
[](float lambdaMCPx, float lambdaMCPy) -> float { return RecoDecay::phi(lambdaMCPx, lambdaMCPy); });
18551854

1856-
} // namespace Xi0CoreMC
1855+
} // namespace Xi0MCCore
18571856

18581857
DECLARE_SOA_TABLE(Xi0MCCores, "AOD", "XI0MCCORES",
18591858
// Basic properties
@@ -1870,7 +1869,7 @@ DECLARE_SOA_TABLE(Xi0MCCores, "AOD", "XI0MCCORES",
18701869
Xi0MCCore::IsPi0Primary, Xi0MCCore::Pi0MCprocess, Xi0MCCore::Pi0PDGCode,
18711870

18721871
Xi0MCCore::MCx, Xi0MCCore::MCy, Xi0MCCore::MCz,
1873-
Xi0MCCore::IsPhysicalPrimary, Xi0MCCore::MCprocess, Xi0MCCore::PDGCode, Xi0MCCore::PDGCodeMother,
1872+
Xi0MCCore::IsPhysicalPrimary, Xi0MCCore::MCprocess, Xi0MCCore::PDGCode, Xi0MCCore::PDGCodeMother,
18741873

18751874
// Dynamic columns
18761875
Xi0MCCore::MCPx<Xi0MCCore::Photon1MCPx, Xi0MCCore::Photon2MCPx, Xi0MCCore::LambdaMCPx>,
@@ -1907,7 +1906,7 @@ DECLARE_SOA_TABLE(Xi0MCCores, "AOD", "XI0MCCORES",
19071906
Xi0MCCore::Photon2MCEta<Xi0MCCore::Photon2MCPx, Xi0MCCore::Photon2MCPy, Xi0MCCore::Photon2MCPz>,
19081907
Xi0MCCore::Photon2MCY<Xi0MCCore::Photon2MCPx, Xi0MCCore::Photon2MCPy, Xi0MCCore::Photon2MCPz>,
19091908
Xi0MCCore::Photon2MCPhi<Xi0MCCore::Photon2MCPx, Xi0MCCore::Photon2MCPy>,
1910-
1909+
19111910
Xi0MCCore::LambdaMCPt<Xi0MCCore::LambdaMCPx, Xi0MCCore::LambdaMCPy>,
19121911
Xi0MCCore::LambdaMCP<Xi0MCCore::LambdaMCPx, Xi0MCCore::LambdaMCPy, Xi0MCCore::LambdaMCPz>,
19131912
Xi0MCCore::LambdaMCEta<Xi0MCCore::LambdaMCPx, Xi0MCCore::LambdaMCPy, Xi0MCCore::LambdaMCPz>,
@@ -1918,7 +1917,7 @@ DECLARE_SOA_TABLE(Xi0MCCollRefs, "AOD", "XI0MCCOLLREFS", //! optional table to r
19181917
o2::soa::Index<>, v0data::StraMCCollisionId);
19191918

19201919
DECLARE_SOA_TABLE(Xi0MCIndices, "AOD", "XI0MCINDICES", //! optional table to refer back to V0MCCores
1921-
o2::soa::Index<>, Xi0MCCore::Photon1Index, Xi0MCCore::Photon2Index, Xi0MCCore::LambdaIndex);
1920+
o2::soa::Index<>, Xi0MCCore::Photon1Index, Xi0MCCore::Photon2Index, Xi0MCCore::LambdaIndex);
19221921

19231922
} // namespace o2::aod
19241923

0 commit comments

Comments
 (0)