Skip to content

Commit 14f4f07

Browse files
vkuceraalibuild
andauthored
[PWGHF] Cleanup, optimisation, bug fixes using clang-tidy (#13206)
Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>
1 parent 5c55b06 commit 14f4f07

File tree

172 files changed

+5740
-5625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+5740
-5625
lines changed

PWGHF/Core/CentralityEstimation.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
#include <Framework/Logger.h>
2020

21+
#include <cstdint>
22+
2123
namespace o2::hf_centrality
2224
{
2325
// centrality selection estimators
@@ -32,34 +34,34 @@ enum CentralityEstimator {
3234
};
3335

3436
template <typename T>
35-
concept hasFT0ACent = requires(T collision) {
37+
concept HasFT0ACent = requires(T collision) {
3638
collision.centFT0A();
3739
};
3840

3941
template <typename T>
40-
concept hasFT0CCent = requires(T collision) {
42+
concept HasFT0CCent = requires(T collision) {
4143
collision.centFT0C();
4244
};
4345

4446
template <typename T>
45-
concept hasFT0MCent = requires(T collision) {
47+
concept HasFT0MCent = requires(T collision) {
4648
collision.centFT0M();
4749
};
4850

4951
template <typename T>
50-
concept hasFV0ACent = requires(T collision) {
52+
concept HasFV0ACent = requires(T collision) {
5153
collision.centFV0A();
5254
};
5355

5456
template <typename T>
55-
concept hasNTracksPVCent = requires(T collision) {
57+
concept HasNTracksPvCent = requires(T collision) {
5658
collision.centNTPV();
5759
};
5860

5961
/// Evaluate centrality/multiplicity percentile using FT0A estimator
6062
/// \param candidate is candidate
6163
/// \return centrality/multiplicity percentile of the collision
62-
template <hasFT0ACent TCollision>
64+
template <HasFT0ACent TCollision>
6365
float getCentralityColl(const TCollision& collision)
6466
{
6567
return collision.centFT0A();
@@ -68,7 +70,7 @@ float getCentralityColl(const TCollision& collision)
6870
/// Evaluate centrality/multiplicity percentile using FT0C estimator
6971
/// \param candidate is candidate
7072
/// \return centrality/multiplicity percentile of the collision
71-
template <hasFT0CCent TCollision>
73+
template <HasFT0CCent TCollision>
7274
float getCentralityColl(const TCollision& collision)
7375
{
7476
return collision.centFT0C();
@@ -77,7 +79,7 @@ float getCentralityColl(const TCollision& collision)
7779
/// Evaluate centrality/multiplicity percentile using FT0M estimator
7880
/// \param candidate is candidate
7981
/// \return centrality/multiplicity percentile of the collision
80-
template <hasFT0MCent TCollision>
82+
template <HasFT0MCent TCollision>
8183
float getCentralityColl(const TCollision& collision)
8284
{
8385
return collision.centFT0M();
@@ -86,7 +88,7 @@ float getCentralityColl(const TCollision& collision)
8688
/// Evaluate centrality/multiplicity percentile using FV0A estimator
8789
/// \param candidate is candidate
8890
/// \return centrality/multiplicity percentile of the collision
89-
template <hasFV0ACent TCollision>
91+
template <HasFV0ACent TCollision>
9092
float getCentralityColl(const TCollision& collision)
9193
{
9294
return collision.centFV0A();
@@ -95,7 +97,7 @@ float getCentralityColl(const TCollision& collision)
9597
/// Evaluate centrality/multiplicity percentile using NTracksPV estimator
9698
/// \param candidate is candidate
9799
/// \return centrality/multiplicity percentile of the collision
98-
template <hasNTracksPVCent TCollision>
100+
template <HasNTracksPvCent TCollision>
99101
float getCentralityColl(const TCollision& collision)
100102
{
101103
return collision.centNTPV();
@@ -119,25 +121,25 @@ float getCentralityColl(const TCollision& collision, const int centEstimator)
119121
{
120122
switch (centEstimator) {
121123
case CentralityEstimator::FT0A:
122-
if constexpr (hasFT0ACent<TCollision>) {
124+
if constexpr (HasFT0ACent<TCollision>) {
123125
return collision.centFT0A();
124126
}
125127
LOG(fatal) << "Collision does not have centFT0A().";
126128
break;
127129
case CentralityEstimator::FT0C:
128-
if constexpr (hasFT0CCent<TCollision>) {
130+
if constexpr (HasFT0CCent<TCollision>) {
129131
return collision.centFT0C();
130132
}
131133
LOG(fatal) << "Collision does not have centFT0C().";
132134
break;
133135
case CentralityEstimator::FT0M:
134-
if constexpr (hasFT0MCent<TCollision>) {
136+
if constexpr (HasFT0MCent<TCollision>) {
135137
return collision.centFT0M();
136138
}
137139
LOG(fatal) << "Collision does not have centFT0M().";
138140
break;
139141
case CentralityEstimator::FV0A:
140-
if constexpr (hasFV0ACent<TCollision>) {
142+
if constexpr (HasFV0ACent<TCollision>) {
141143
return collision.centFV0A();
142144
}
143145
LOG(fatal) << "Collision does not have centFV0A().";

PWGHF/Core/HfHelper.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ class HfHelper
290290
auto cosPiKPhiRestFrame(const T& candidate, int option)
291291
{
292292
// Ported from AliAODRecoDecayHF3Prong::CosPiKPhiRFrame
293-
std::array<float, 3> momPi;
294-
std::array<float, 3> momK1;
295-
std::array<float, 3> momK2;
293+
std::array<float, 3> momPi{};
294+
std::array<float, 3> momK1{};
295+
std::array<float, 3> momK2{};
296296

297297
if (option == 0) { // KKPi
298298
momPi = candidate.pVectorProng2();
@@ -304,12 +304,12 @@ class HfHelper
304304
momK2 = candidate.pVectorProng2();
305305
}
306306

307-
ROOT::Math::PxPyPzMVector vecPi(momPi[0], momPi[1], momPi[2], o2::constants::physics::MassPiPlus);
308-
ROOT::Math::PxPyPzMVector vecK1(momK1[0], momK1[1], momK1[2], o2::constants::physics::MassKPlus);
309-
ROOT::Math::PxPyPzMVector vecK2(momK2[0], momK2[1], momK2[2], o2::constants::physics::MassKPlus);
310-
ROOT::Math::PxPyPzMVector vecPhi = vecK1 + vecK2;
307+
ROOT::Math::PxPyPzMVector const vecPi(momPi[0], momPi[1], momPi[2], o2::constants::physics::MassPiPlus);
308+
ROOT::Math::PxPyPzMVector const vecK1(momK1[0], momK1[1], momK1[2], o2::constants::physics::MassKPlus);
309+
ROOT::Math::PxPyPzMVector const vecK2(momK2[0], momK2[1], momK2[2], o2::constants::physics::MassKPlus);
310+
ROOT::Math::PxPyPzMVector const vecPhi = vecK1 + vecK2;
311311

312-
ROOT::Math::Boost boostToPhiRestFrame(vecPhi.BoostToCM());
312+
ROOT::Math::Boost const boostToPhiRestFrame(vecPhi.BoostToCM());
313313
auto momPiPhiRestFrame = boostToPhiRestFrame(vecPi).Vect();
314314
auto momK1PhiRestFrame = boostToPhiRestFrame(vecK1).Vect();
315315

@@ -522,8 +522,8 @@ class HfHelper
522522
phiPi = RecoDecay::phi(candidate.pxProng2(), candidate.pyProng2());
523523
}
524524

525-
double deltaEta = etaJpsi - etaPi;
526-
double deltaPhi = RecoDecay::constrainAngle(phiJpsi - phiPi, -o2::constants::math::PI);
525+
double const deltaEta = etaJpsi - etaPi;
526+
double const deltaPhi = RecoDecay::constrainAngle(phiJpsi - phiPi, -o2::constants::math::PI);
527527

528528
return RecoDecay::sqrtSumOfSquares(deltaEta, deltaPhi);
529529
}

PWGHF/Core/HfMlResponseBplusToD0Pi.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "Tools/ML/MlResponse.h"
2323

24+
#include <CommonConstants/PhysicsConstants.h>
25+
2426
#include <cstdint>
2527
#include <vector>
2628

@@ -63,7 +65,7 @@
6365
// where OBJECT is named candidateD , FEATURE = GETTER and INDEX is the index of the vector
6466
#define CHECK_AND_FILL_VEC_D0_INDEX(FEATURE, GETTER1, GETTER2, INDEX) \
6567
case static_cast<uint8_t>(InputFeaturesBplusToD0Pi::FEATURE): { \
66-
if (pdgCode == o2::constants::physics::kD0) { \
68+
if (pdgCode == o2::constants::physics::Pdg::kD0) { \
6769
inputFeatures.emplace_back((candidateD0.GETTER1())[INDEX]); \
6870
} else { \
6971
inputFeatures.emplace_back((candidateD0.GETTER2())[INDEX]); \

PWGHF/Core/HfMlResponseBplusToJpsiKReduced.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "Tools/ML/MlResponse.h"
2323

24+
#include <CommonConstants/PhysicsConstants.h>
25+
2426
#include <cstdint>
2527
#include <vector>
2628

PWGHF/Core/HfMlResponseBsToJpsiPhiReduced.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "Tools/ML/MlResponse.h"
2323

24+
#include <CommonConstants/PhysicsConstants.h>
25+
2426
#include <cstdint>
2527
#include <vector>
2628

0 commit comments

Comments
 (0)