Skip to content

Commit 988bd8e

Browse files
romainschotterromainschotter
authored
Merge pull request #47 from alibuild/alibot-cleanup-11420
Please consider the following formatting changes to #11420
2 parents 50930e9 + b823047 commit 988bd8e

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎PWGEM/PhotonMeson/TableProducer/createPCM.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,5 +564,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
564564
{
565565
return WorkflowSpec{
566566
adaptAnalysisTask<createPCM>(cfgc, TaskName{"v0-finder"})};
567-
// adaptAnalysisTask<v0Initializer>(cfgc, TaskName{"v0-initializer"})};
567+
// adaptAnalysisTask<v0Initializer>(cfgc, TaskName{"v0-initializer"})};
568568
}

‎PWGLF/DataModel/LFStrangenessTables.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -661,18 +661,18 @@ DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //! V0 py
661661
DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, //! V0 pz
662662
[](float pzPos, float pzNeg) -> float { return pzPos + pzNeg; });
663663
DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, //! Transverse momentum in GeV/c
664-
[](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float {
665-
return RecoDecay::sqrtSumOfSquares(pxPos+pxNeg, pyPos+pyNeg);
664+
[](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float {
665+
return RecoDecay::sqrtSumOfSquares(pxPos + pxNeg, pyPos + pyNeg);
666666
});
667667
DECLARE_SOA_DYNAMIC_COLUMN(P, p, //! Total momentum in GeV/c
668-
[](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
669-
return RecoDecay::sqrtSumOfSquares(pxPos+pxNeg, pyPos+pyNeg, pzPos+pzNeg);
668+
[](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
669+
return RecoDecay::sqrtSumOfSquares(pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg);
670670
});
671671
DECLARE_SOA_DYNAMIC_COLUMN(Phi, phi, //! Phi in the range [0, 2pi)
672-
[](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float { return RecoDecay::phi(pxPos+pxNeg, pyPos+pyNeg); });
672+
[](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float { return RecoDecay::phi(pxPos + pxNeg, pyPos + pyNeg); });
673673
DECLARE_SOA_DYNAMIC_COLUMN(Eta, eta, //! Pseudorapidity, conditionally defined to avoid FPEs
674-
[](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
675-
return RecoDecay::eta(std::array{pxPos+pxNeg, pyPos+pyNeg, pzPos+pzNeg});
674+
[](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
675+
return RecoDecay::eta(std::array{pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg});
676676
});
677677
// Account for rigidity in case of hypertriton
678678
DECLARE_SOA_DYNAMIC_COLUMN(PtHypertriton, ptHypertriton, //! V0 pT
@@ -687,7 +687,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(V0Radius, v0radius, //! V0 decay radius (2D, centered
687687
// Distance Over To Mom
688688
DECLARE_SOA_DYNAMIC_COLUMN(DistOverTotMom, distovertotmom, //! PV to V0decay distance over total momentum
689689
[](float X, float Y, float Z, float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg, float pvX, float pvY, float pvZ) {
690-
float P = RecoDecay::sqrtSumOfSquares(pxPos+pxNeg, pyPos+pyNeg, pzPos+pzNeg);
690+
float P = RecoDecay::sqrtSumOfSquares(pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg);
691691
return std::sqrt(std::pow(X - pvX, 2) + std::pow(Y - pvY, 2) + std::pow(Z - pvZ, 2)) / (P + 1E-10);
692692
});
693693

@@ -766,12 +766,12 @@ DECLARE_SOA_DYNAMIC_COLUMN(M, m, //! mass under a certain hypothesis (0:K0, 1:L,
766766
});
767767

768768
DECLARE_SOA_DYNAMIC_COLUMN(YK0Short, yK0Short, //! V0 y with K0short hypothesis
769-
[](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
770-
return RecoDecay::y(std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassKaonNeutral);
769+
[](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
770+
return RecoDecay::y(std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassKaonNeutral);
771771
});
772772
DECLARE_SOA_DYNAMIC_COLUMN(YLambda, yLambda, //! V0 y with lambda or antilambda hypothesis
773-
[](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
774-
return RecoDecay::y(std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassLambda);
773+
[](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
774+
return RecoDecay::y(std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassLambda);
775775
});
776776
DECLARE_SOA_DYNAMIC_COLUMN(YHypertriton, yHypertriton, //! V0 y with hypertriton hypothesis
777777
[](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); });
@@ -887,7 +887,7 @@ DECLARE_SOA_TABLE_STAGED(V0CoresBase, "V0CORE", //! core information about decay
887887

888888
// extended table with expression columns that can be used as arguments of dynamic columns
889889
// DECLARE_SOA_EXTENDED_TABLE_USER(V0Cores, V0CoresBase, "V0COREEXT", //!
890-
// 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
890+
// 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
891891

892892
// // extended table with expression columns that can be used as arguments of dynamic columns
893893
// DECLARE_SOA_EXTENDED_TABLE_USER(StoredV0Cores, StoredV0CoresBase, "V0COREEXT", //!
@@ -1305,18 +1305,18 @@ DECLARE_SOA_DYNAMIC_COLUMN(CascRadius, cascradius, //!
13051305
// CosPAs
13061306
DECLARE_SOA_DYNAMIC_COLUMN(V0CosPA, v0cosPA, //!
13071307
[](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 {
1308-
return RecoDecay::cpa(std::array{pvX, pvY, pvZ}, std::array{Xlambda, Ylambda, Zlambda}, std::array{pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg});
1308+
return RecoDecay::cpa(std::array{pvX, pvY, pvZ}, std::array{Xlambda, Ylambda, Zlambda}, std::array{pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg});
13091309
});
13101310
// DECLARE_SOA_DYNAMIC_COLUMN(CascCosPA, casccosPA, //!
13111311
// [](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}); });
13121312
DECLARE_SOA_DYNAMIC_COLUMN(CascCosPA, casccosPA, //!
13131313
[](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}); });
13141314
DECLARE_SOA_DYNAMIC_COLUMN(DCAV0ToPV, dcav0topv, //!
13151315
[](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 {
1316-
float px = pxpos + pxneg;
1317-
float py = pypos + pyneg;
1318-
float pz = pzpos + pzneg;
1319-
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));
1316+
float px = pxpos + pxneg;
1317+
float py = pypos + pyneg;
1318+
float pz = pzpos + pzneg;
1319+
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));
13201320
});
13211321

13221322
// Calculated on the fly with mass assumption + dynamic tables

‎PWGLF/TableProducer/Strangeness/cascadefinder.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,5 +442,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
442442
adaptAnalysisTask<cascadeprefilter>(cfgc, TaskName{"lf-cascadeprefilter"}),
443443
adaptAnalysisTask<cascadefinder>(cfgc, TaskName{"lf-cascadefinder"}),
444444
adaptAnalysisTask<cascadefinderQA>(cfgc, TaskName{"lf-cascadefinderQA"})};
445-
// adaptAnalysisTask<cascadeinitializer>(cfgc, TaskName{"lf-cascadeinitializer"})};
445+
// adaptAnalysisTask<cascadeinitializer>(cfgc, TaskName{"lf-cascadeinitializer"})};
446446
}

‎PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,5 +1821,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
18211821
adaptAnalysisTask<lambdakzeroBuilder>(cfgc),
18221822
adaptAnalysisTask<lambdakzeroPreselector>(cfgc),
18231823
adaptAnalysisTask<lambdakzeroV0DataLinkBuilder>(cfgc)};
1824-
// adaptAnalysisTask<lambdakzeroInitializer>(cfgc)};
1824+
// adaptAnalysisTask<lambdakzeroInitializer>(cfgc)};
18251825
}

‎PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,5 +441,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
441441
adaptAnalysisTask<lambdakzeroprefilter>(cfgc, TaskName{"lf-lambdakzeroprefilter"}),
442442
adaptAnalysisTask<lambdakzerofinder>(cfgc, TaskName{"lf-lambdakzerofinder"}),
443443
adaptAnalysisTask<lambdakzerofinderQa>(cfgc, TaskName{"lf-lambdakzerofinderQA"})};
444-
// adaptAnalysisTask<lambdakzeroinitializer>(cfgc, TaskName{"lf-lambdakzeroinitializer"})};
444+
// adaptAnalysisTask<lambdakzeroinitializer>(cfgc, TaskName{"lf-lambdakzeroinitializer"})};
445445
}

‎PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2508,5 +2508,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
25082508
{
25092509
return WorkflowSpec{
25102510
adaptAnalysisTask<StrangenessBuilder>(cfgc)};
2511-
// adaptAnalysisTask<strangenessbuilderInitializer>(cfgc)};
2511+
// adaptAnalysisTask<strangenessbuilderInitializer>(cfgc)};
25122512
}

0 commit comments

Comments
 (0)