Skip to content

Commit 77cc59c

Browse files
Oussama3030Oussama3030
authored
Merge pull request #1 from alibuild/alibot-cleanup-14411
Please consider the following formatting changes to #14411
2 parents ec917af + b7b817e commit 77cc59c

File tree

3 files changed

+55
-94
lines changed

3 files changed

+55
-94
lines changed

‎PWGLF/DataModel/LFSigmaTables.h‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ DECLARE_SOA_COLUMN(KShortMass, kshortMass, float);
213213

214214
// Dynamic Columns
215215

216-
//KStar
216+
// KStar
217217
DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //! KStar px
218218
[](float photonPx, float kshortPx) -> float { return photonPx + kshortPx; });
219219
DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //! KStar py
@@ -286,8 +286,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(PhotonY, photonY, //! Rapidity
286286
DECLARE_SOA_DYNAMIC_COLUMN(PhotonPhi, photonPhi, //! Phi in the range [0, 2pi)
287287
[](float photonPx, float photonPy) -> float { return RecoDecay::phi(photonPx, photonPy); });
288288

289-
290-
// KShort
289+
// KShort
291290
DECLARE_SOA_DYNAMIC_COLUMN(KShortPt, kshortPt, //! Transverse momentum in GeV/c
292291
[](float kshortPx, float kshortPy) -> float {
293292
return RecoDecay::sqrtSumOfSquares(kshortPx, kshortPy);
@@ -311,14 +310,14 @@ DECLARE_SOA_DYNAMIC_COLUMN(KShortY, kshortY, //! Rapidity
311310
DECLARE_SOA_DYNAMIC_COLUMN(KShortPhi, kshortPhi, //! Phi in the range [0, 2pi)
312311
[](float kshortPx, float kshortPy) -> float { return RecoDecay::phi(kshortPx, kshortPy); });
313312

314-
}
313+
} // namespace kstarCore
315314

316315
DECLARE_SOA_TABLE(KStarCores, "AOD", "KSTARCORES",
317316
kstarCore::X, kstarCore::Y, kstarCore::Z, kstarCore::DCADaughters,
318317
kstarCore::PhotonPx, kstarCore::PhotonPy, kstarCore::PhotonPz, kstarCore::PhotonMass,
319318
kstarCore::KShortPx, kstarCore::KShortPy, kstarCore::KShortPz, kstarCore::KShortMass,
320319

321-
//Dynamic columns
320+
// Dynamic columns
322321
kstarCore::Px<kstarCore::PhotonPx, kstarCore::KShortPx>,
323322
kstarCore::Py<kstarCore::PhotonPy, kstarCore::KShortPy>,
324323
kstarCore::Pz<kstarCore::PhotonPz, kstarCore::KShortPz>,
@@ -343,7 +342,6 @@ DECLARE_SOA_TABLE(KStarCores, "AOD", "KSTARCORES",
343342
kstarCore::KShortY<kstarCore::KShortPx, kstarCore::KShortPy, kstarCore::KShortPz>,
344343
kstarCore::KShortPhi<kstarCore::KShortPx, kstarCore::KShortPy>);
345344

346-
347345
// For KStar extra info
348346
namespace kshortExtra
349347
{
@@ -371,7 +369,7 @@ DECLARE_SOA_COLUMN(KShortNegITSChi2PerNcl, kshortNegChi2PerNcl, float);
371369
DECLARE_SOA_COLUMN(KShortPosTrackCode, kshortPosTrackCode, uint8_t);
372370
DECLARE_SOA_COLUMN(KShortNegTrackCode, kshortNegTrackCode, uint8_t);
373371
DECLARE_SOA_COLUMN(KShortV0Type, kshortV0Type, uint8_t);
374-
}
372+
} // namespace kshortExtra
375373

376374
DECLARE_SOA_TABLE(KShortExtras, "AOD", "KSHORT",
377375
kshortExtra::KShortQt,
@@ -397,8 +395,7 @@ DECLARE_SOA_TABLE(KShortExtras, "AOD", "KSHORT",
397395
kshortExtra::KShortNegITSChi2PerNcl,
398396
kshortExtra::KShortPosTrackCode,
399397
kshortExtra::KShortNegTrackCode,
400-
kshortExtra::KShortV0Type
401-
);
398+
kshortExtra::KShortV0Type);
402399

403400
// For KStar extra info
404401
namespace kstarPhotonExtra
@@ -425,7 +422,7 @@ DECLARE_SOA_COLUMN(PhotonNegITSChi2PerNcl, photonNegITSChi2PerNcl, float);
425422
DECLARE_SOA_COLUMN(PhotonPosTrackCode, photonPosTrackCode, uint8_t);
426423
DECLARE_SOA_COLUMN(PhotonNegTrackCode, photonNegTrackCode, uint8_t);
427424
DECLARE_SOA_COLUMN(PhotonV0Type, photonV0Type, uint8_t);
428-
}
425+
} // namespace kstarPhotonExtra
429426

430427
DECLARE_SOA_TABLE(KStarPhotonExtras, "AOD", "KSTARPHOTON",
431428
kstarPhotonExtra::PhotonQt,
@@ -451,7 +448,6 @@ DECLARE_SOA_TABLE(KStarPhotonExtras, "AOD", "KSTARPHOTON",
451448
kstarPhotonExtra::PhotonNegTrackCode,
452449
kstarPhotonExtra::PhotonV0Type);
453450

454-
455451
// For Photon extra info
456452
namespace sigma0PhotonExtra
457453
{
@@ -858,7 +854,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(KShortMCY, kshortMCY, //! Rapidity
858854
DECLARE_SOA_DYNAMIC_COLUMN(KShortMCPhi, kshortMCPhi, //! Phi in the range [0, 2pi)
859855
[](float kshortMCPx, float kshortMCPy) -> float { return RecoDecay::phi(kshortMCPx, kshortMCPy); });
860856

861-
} // namespace sigma0MCCore
857+
} // namespace kstarMCCore
862858

863859
DECLARE_SOA_TABLE(KStarMCCores, "AOD", "KSTARMCCORES",
864860
// Basic properties
@@ -891,13 +887,11 @@ DECLARE_SOA_TABLE(KStarMCCores, "AOD", "KSTARMCCORES",
891887
kstarMCCore::PhotonMCPhi<kstarMCCore::PhotonMCPx, kstarMCCore::PhotonMCPy>,
892888

893889
kstarMCCore::KShortMCPt<kstarMCCore::KShortMCPx, kstarMCCore::KShortMCPy>,
894-
kstarMCCore::KShortMCP<kstarMCCore::KShortMCPx, kstarMCCore::KShortMCPy, kstarMCCore::KShortMCPz>,
890+
kstarMCCore::KShortMCP<kstarMCCore::KShortMCPx, kstarMCCore::KShortMCPy, kstarMCCore::KShortMCPz>,
895891
kstarMCCore::KShortMCEta<kstarMCCore::KShortMCPx, kstarMCCore::KShortMCPy, kstarMCCore::KShortMCPz>,
896892
kstarMCCore::KShortMCY<kstarMCCore::KShortMCPx, kstarMCCore::KShortMCPy, kstarMCCore::KShortMCPz>,
897893
kstarMCCore::KShortMCPhi<kstarMCCore::KShortMCPx, kstarMCCore::KShortMCPy>);
898894

899-
900-
901895
namespace sigma0Gen
902896
{
903897
DECLARE_SOA_COLUMN(IsSigma0, isSigma0, bool); // true: sigma0, false: antisigma0
@@ -919,7 +913,7 @@ DECLARE_SOA_COLUMN(IsKStar, isKStar, bool); // true: sigma0, false: antisigma0
919913
DECLARE_SOA_COLUMN(ProducedByGenerator, producedByGenerator, bool);
920914
DECLARE_SOA_COLUMN(KStarMCPt, kstarMCPt, float); // MC pT
921915

922-
} // namespace sigma0Gen
916+
} // namespace kstarGen
923917

924918
DECLARE_SOA_TABLE(KStarGens, "AOD", "KSTARGENS",
925919
kstarGen::IsKStar,
@@ -929,7 +923,6 @@ DECLARE_SOA_TABLE(KStarGens, "AOD", "KSTARGENS",
929923
DECLARE_SOA_TABLE(SigmaCollRef, "AOD", "SIGMACOLLREF", //! optional table to refer back to a collision
930924
o2::soa::Index<>, v0data::StraCollisionId);
931925

932-
933926
DECLARE_SOA_TABLE(SigmaIndices, "AOD", "SIGMAINDEX", //! index table when using AO2Ds
934927
o2::soa::Index<>, sigma0Core::PhotonV0Id, sigma0Core::LambdaV0Id, o2::soa::Marker<1>);
935928

@@ -939,12 +932,11 @@ DECLARE_SOA_TABLE(SigmaMCLabels, "AOD", "SIGMAMCLABEL", //! optional table to re
939932
DECLARE_SOA_TABLE(SigmaGenCollRef, "AOD", "SIGMAGENCOLLREF", //! optional table to refer back to a collision
940933
o2::soa::Index<>, v0data::StraMCCollisionId);
941934

935+
DECLARE_SOA_TABLE(KStarCollRef, "AOD", "KSTARCOLLREF",
936+
o2::soa::Index<>, v0data::StraCollisionId);
942937

943-
DECLARE_SOA_TABLE(KStarCollRef, "AOD", "KSTARCOLLREF",
944-
o2::soa::Index<>, v0data::StraCollisionId);
945-
946-
DECLARE_SOA_TABLE(KStarGenCollRef, "AOD", "KSTARGENCOLLREF",
947-
o2::soa::Index<>, v0data::StraMCCollisionId);
938+
DECLARE_SOA_TABLE(KStarGenCollRef, "AOD", "KSTARGENCOLLREF",
939+
o2::soa::Index<>, v0data::StraMCCollisionId);
948940

949941
// ___________________________________________________________________________
950942
// pi0 QA

0 commit comments

Comments
 (0)