Skip to content

Commit 2ae2371

Browse files
romainschotterromainschotter
authored
Merge pull request #100 from alibuild/alibot-cleanup-18081
Please consider the following formatting changes to #18081
2 parents 178e4e0 + bda4926 commit 2ae2371

2 files changed

Lines changed: 53 additions & 55 deletions

File tree

‎PWGLF/DataModel/LFSigmaTables.h‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,6 @@ DECLARE_SOA_TABLE(Pi0Gens, "AOD", "PI0GENS",
13951395
DECLARE_SOA_TABLE(Pi0GenCollRef, "AOD", "PI0GENCOLLREF", //! optional table to refer back to a collision
13961396
o2::soa::Index<>, v0data::StraMCCollisionId);
13971397

1398-
13991398
// ___________________________________________________________________________
14001399
// Xi0
14011400
namespace Xi0Core
@@ -1450,11 +1449,11 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p, //! Total momentum in GeV/c
14501449

14511450
DECLARE_SOA_DYNAMIC_COLUMN(Xi0Mass, xi0Mass,
14521451
[](float photon1Px, float photon1Py, float photon1Pz, float photon2Px, float photon2Py, float photon2Pz, float lambdaPx, float lambdaPy, float lambdaPz) -> float {
1453-
std::array<float, 3> pVecPi0{photon1Px+photon2Px, photon1Py+photon2Py, photon1Pz+photon2Pz};
1452+
std::array<float, 3> pVecPi0{photon1Px + photon2Px, photon1Py + photon2Py, photon1Pz + photon2Pz};
14541453
std::array<float, 3> pVecLambda{lambdaPx, lambdaPy, lambdaPz};
14551454
auto arrMom = std::array{pVecPi0, pVecLambda};
14561455
return RecoDecay::m(arrMom, std::array{o2::constants::physics::MassPi0, o2::constants::physics::MassLambda0});
1457-
});
1456+
});
14581457

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

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

14931492
DECLARE_SOA_DYNAMIC_COLUMN(RadiusLambda, radiusLambda, //! Pi0 decay radius (2D, centered at zero)
1494-
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
1495-
1493+
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
1494+
14961495
// CosPAs
14971496
DECLARE_SOA_DYNAMIC_COLUMN(Pi0CosPA, pi0CosPA, //!
14981497
[](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 {
@@ -1511,14 +1510,14 @@ DECLARE_SOA_DYNAMIC_COLUMN(DCALambdaToPV, dcaLambdaToPV, //!
15111510
[](float X, float Y, float Z, float px, float py, float pz, float pvX, float pvY, float pvZ) -> float {
15121511
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));
15131512
});
1514-
1513+
15151514
DECLARE_SOA_DYNAMIC_COLUMN(DCAPi0ToPV, dcaPi0ToPV, //!
15161515
[](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 {
15171516
float px = pxGamma1 + pxGamma2;
15181517
float py = pyGamma1 + pyGamma2;
15191518
float pz = pzGamma1 + pzGamma2;
15201519
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));
1521-
});
1520+
});
15221521

15231522
DECLARE_SOA_DYNAMIC_COLUMN(Photon1Pt, photon1Pt, //! Transverse momentum in GeV/c
15241523
[](float photon1Px, float photon1Py) -> float {
@@ -1587,12 +1586,12 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaY, lambdaY, //! Rapidity
15871586
});
15881587

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

15921591
} // namespace Xi0Core
15931592

15941593
DECLARE_SOA_TABLE(Xi0Cores, "AOD", "XI0CORES",
1595-
Xi0Core::X, Xi0Core::Y, Xi0Core::Z,
1594+
Xi0Core::X, Xi0Core::Y, Xi0Core::Z,
15961595
Xi0Core::XPi0, Xi0Core::YPi0, Xi0Core::ZPi0,
15971596
Xi0Core::XLambda, Xi0Core::YLambda, Xi0Core::ZLambda,
15981597
Xi0Core::DCADaughters, Xi0Core::DCADaughtersPi0, Xi0Core::DCAXYCascToPV, Xi0Core::DCAZCascToPV,
@@ -1613,7 +1612,7 @@ DECLARE_SOA_TABLE(Xi0Cores, "AOD", "XI0CORES",
16131612
Xi0Core::Phi<Xi0Core::Photon1Px, Xi0Core::Photon1Py, Xi0Core::Photon2Px, Xi0Core::Photon2Py, Xi0Core::LambdaPx, Xi0Core::LambdaPy>,
16141613
Xi0Core::Eta<Xi0Core::Photon1Px, Xi0Core::Photon1Py, Xi0Core::Photon1Pz, Xi0Core::Photon2Px, Xi0Core::Photon2Py, Xi0Core::Photon2Pz, Xi0Core::LambdaPx, Xi0Core::LambdaPy, Xi0Core::LambdaPz>,
16151614
Xi0Core::Radius<Xi0Core::X, Xi0Core::Y>,
1616-
Xi0Core::CascCosPA<Xi0Core::X, Xi0Core::Y, Xi0Core::Z, Xi0Core::Photon1Px, Xi0Core::Photon2Px, Xi0Core::LambdaPx, Xi0Core::Photon1Py, Xi0Core::Photon2Py, Xi0Core::LambdaPy, Xi0Core::Photon1Pz, Xi0Core::Photon2Pz, Xi0Core::LambdaPz>,
1615+
Xi0Core::CascCosPA<Xi0Core::X, Xi0Core::Y, Xi0Core::Z, Xi0Core::Photon1Px, Xi0Core::Photon2Px, Xi0Core::LambdaPx, Xi0Core::Photon1Py, Xi0Core::Photon2Py, Xi0Core::LambdaPy, Xi0Core::Photon1Pz, Xi0Core::Photon2Pz, Xi0Core::LambdaPz>,
16171616

16181617
// Dynamic columns for pi0
16191618
Xi0Core::PxPi0<Xi0Core::Photon1Px, Xi0Core::Photon2Px>,
@@ -1652,15 +1651,14 @@ DECLARE_SOA_TABLE(Xi0CollRefs, "AOD", "XI0COLLREFS", //! optional table to refer
16521651
o2::soa::Index<>, v0data::StraCollisionId);
16531652

16541653
DECLARE_SOA_TABLE(Xi0Indices, "AOD", "XI0INDICES", //! optional table to refer back to V0Cores
1655-
o2::soa::Index<>, Xi0Core::Photon1Index, Xi0Core::Photon2Index, Xi0Core::LambdaIndex);
1656-
1657-
1654+
o2::soa::Index<>, Xi0Core::Photon1Index, Xi0Core::Photon2Index, Xi0Core::LambdaIndex);
1655+
16581656
// for MC
16591657
namespace Xi0MCCore
16601658
{
16611659
DECLARE_SOA_COLUMN(Photon1Index, photon1Index, int);
16621660
DECLARE_SOA_COLUMN(Photon2Index, photon2Index, int);
1663-
DECLARE_SOA_COLUMN(LambdaIndex, lambdaIndex, int);
1661+
DECLARE_SOA_COLUMN(LambdaIndex, lambdaIndex, int);
16641662

16651663
DECLARE_SOA_COLUMN(Photon1MCPx, photon1mcpx, float);
16661664
DECLARE_SOA_COLUMN(Photon1MCPy, photon1mcpy, float);
@@ -1733,13 +1731,13 @@ DECLARE_SOA_DYNAMIC_COLUMN(MCPhi, mcPhi, //! Phi in the range [0, 2pi)
17331731
DECLARE_SOA_DYNAMIC_COLUMN(MCEta, mcEta, //! Pseudorapidity
17341732
[](float photon1MCPx, float photon1MCPy, float photon1MCPz, float photon2MCPx, float photon2MCPy, float photon2MCPz, float lambdaMCPx, float lambdaMCPy, float lambdaMCPz) -> float {
17351733
return RecoDecay::eta(std::array{photon1MCPx + photon2MCPx + lambdaMCPx, photon1MCPy + photon2MCPy + lambdaMCPy, photon1MCPz + photon2MCPz + lambdaMCPz});
1736-
});
1737-
1734+
});
1735+
17381736
DECLARE_SOA_DYNAMIC_COLUMN(MCRadius, mcRadius, //! Xi0 decay radius (2D, centered at zero)
17391737
[](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
17401738

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

17441742
DECLARE_SOA_DYNAMIC_COLUMN(Pi0MCPx, pi0mcpx, //! Pi0 MC px
17451743
[](float photon1MCPx, float photon2MCPx) -> float { return photon1MCPx + photon2MCPx; });
@@ -1853,7 +1851,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaMCY, lambdaMCY, //! Rapidity
18531851
});
18541852

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

18581856
} // namespace Xi0MCCore
18591857

@@ -1872,7 +1870,7 @@ DECLARE_SOA_TABLE(Xi0MCCores, "AOD", "XI0MCCORES",
18721870
Xi0MCCore::IsPi0Primary, Xi0MCCore::Pi0MCprocess, Xi0MCCore::Pi0PDGCode,
18731871

18741872
Xi0MCCore::MCx, Xi0MCCore::MCy, Xi0MCCore::MCz,
1875-
Xi0MCCore::IsPhysicalPrimary, Xi0MCCore::MCprocess, Xi0MCCore::PDGCode, Xi0MCCore::PDGCodeMother,
1873+
Xi0MCCore::IsPhysicalPrimary, Xi0MCCore::MCprocess, Xi0MCCore::PDGCode, Xi0MCCore::PDGCodeMother,
18761874

18771875
// Dynamic columns
18781876
Xi0MCCore::MCPx<Xi0MCCore::Photon1MCPx, Xi0MCCore::Photon2MCPx, Xi0MCCore::LambdaMCPx>,
@@ -1909,7 +1907,7 @@ DECLARE_SOA_TABLE(Xi0MCCores, "AOD", "XI0MCCORES",
19091907
Xi0MCCore::Photon2MCEta<Xi0MCCore::Photon2MCPx, Xi0MCCore::Photon2MCPy, Xi0MCCore::Photon2MCPz>,
19101908
Xi0MCCore::Photon2MCY<Xi0MCCore::Photon2MCPx, Xi0MCCore::Photon2MCPy, Xi0MCCore::Photon2MCPz>,
19111909
Xi0MCCore::Photon2MCPhi<Xi0MCCore::Photon2MCPx, Xi0MCCore::Photon2MCPy>,
1912-
1910+
19131911
Xi0MCCore::LambdaMCPt<Xi0MCCore::LambdaMCPx, Xi0MCCore::LambdaMCPy>,
19141912
Xi0MCCore::LambdaMCP<Xi0MCCore::LambdaMCPx, Xi0MCCore::LambdaMCPy, Xi0MCCore::LambdaMCPz>,
19151913
Xi0MCCore::LambdaMCEta<Xi0MCCore::LambdaMCPx, Xi0MCCore::LambdaMCPy, Xi0MCCore::LambdaMCPz>,
@@ -1920,7 +1918,7 @@ DECLARE_SOA_TABLE(Xi0MCCollRefs, "AOD", "XI0MCCOLLREFS", //! optional table to r
19201918
o2::soa::Index<>, v0data::StraMCCollisionId);
19211919

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

19251923
} // namespace o2::aod
19261924

0 commit comments

Comments
 (0)