Skip to content

Commit 2ad6d6b

Browse files
vkuceravkucera
committed
Fix names
1 parent b5abdc6 commit 2ad6d6b

File tree

104 files changed

+2104
-2104
lines changed

Some content is hidden

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

104 files changed

+2104
-2104
lines changed

‎PWGHF/Core/CentralityEstimation.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,34 @@ enum CentralityEstimator {
3232
};
3333

3434
template <typename T>
35-
concept hasFT0ACent = requires(T collision) {
35+
concept HasFT0ACent = requires(T collision) {
3636
collision.centFT0A();
3737
};
3838

3939
template <typename T>
40-
concept hasFT0CCent = requires(T collision) {
40+
concept HasFT0CCent = requires(T collision) {
4141
collision.centFT0C();
4242
};
4343

4444
template <typename T>
45-
concept hasFT0MCent = requires(T collision) {
45+
concept HasFT0MCent = requires(T collision) {
4646
collision.centFT0M();
4747
};
4848

4949
template <typename T>
50-
concept hasFV0ACent = requires(T collision) {
50+
concept HasFV0ACent = requires(T collision) {
5151
collision.centFV0A();
5252
};
5353

5454
template <typename T>
55-
concept hasNTracksPVCent = requires(T collision) {
55+
concept HasNTracksPvCent = requires(T collision) {
5656
collision.centNTPV();
5757
};
5858

5959
/// Evaluate centrality/multiplicity percentile using FT0A estimator
6060
/// \param candidate is candidate
6161
/// \return centrality/multiplicity percentile of the collision
62-
template <hasFT0ACent TCollision>
62+
template <HasFT0ACent TCollision>
6363
float getCentralityColl(const TCollision& collision)
6464
{
6565
return collision.centFT0A();
@@ -68,7 +68,7 @@ float getCentralityColl(const TCollision& collision)
6868
/// Evaluate centrality/multiplicity percentile using FT0C estimator
6969
/// \param candidate is candidate
7070
/// \return centrality/multiplicity percentile of the collision
71-
template <hasFT0CCent TCollision>
71+
template <HasFT0CCent TCollision>
7272
float getCentralityColl(const TCollision& collision)
7373
{
7474
return collision.centFT0C();
@@ -77,7 +77,7 @@ float getCentralityColl(const TCollision& collision)
7777
/// Evaluate centrality/multiplicity percentile using FT0M estimator
7878
/// \param candidate is candidate
7979
/// \return centrality/multiplicity percentile of the collision
80-
template <hasFT0MCent TCollision>
80+
template <HasFT0MCent TCollision>
8181
float getCentralityColl(const TCollision& collision)
8282
{
8383
return collision.centFT0M();
@@ -86,7 +86,7 @@ float getCentralityColl(const TCollision& collision)
8686
/// Evaluate centrality/multiplicity percentile using FV0A estimator
8787
/// \param candidate is candidate
8888
/// \return centrality/multiplicity percentile of the collision
89-
template <hasFV0ACent TCollision>
89+
template <HasFV0ACent TCollision>
9090
float getCentralityColl(const TCollision& collision)
9191
{
9292
return collision.centFV0A();
@@ -95,7 +95,7 @@ float getCentralityColl(const TCollision& collision)
9595
/// Evaluate centrality/multiplicity percentile using NTracksPV estimator
9696
/// \param candidate is candidate
9797
/// \return centrality/multiplicity percentile of the collision
98-
template <hasNTracksPVCent TCollision>
98+
template <HasNTracksPvCent TCollision>
9999
float getCentralityColl(const TCollision& collision)
100100
{
101101
return collision.centNTPV();
@@ -119,25 +119,25 @@ float getCentralityColl(const TCollision& collision, const int centEstimator)
119119
{
120120
switch (centEstimator) {
121121
case CentralityEstimator::FT0A:
122-
if constexpr (hasFT0ACent<TCollision>) {
122+
if constexpr (HasFT0ACent<TCollision>) {
123123
return collision.centFT0A();
124124
}
125125
LOG(fatal) << "Collision does not have centFT0A().";
126126
break;
127127
case CentralityEstimator::FT0C:
128-
if constexpr (hasFT0CCent<TCollision>) {
128+
if constexpr (HasFT0CCent<TCollision>) {
129129
return collision.centFT0C();
130130
}
131131
LOG(fatal) << "Collision does not have centFT0C().";
132132
break;
133133
case CentralityEstimator::FT0M:
134-
if constexpr (hasFT0MCent<TCollision>) {
134+
if constexpr (HasFT0MCent<TCollision>) {
135135
return collision.centFT0M();
136136
}
137137
LOG(fatal) << "Collision does not have centFT0M().";
138138
break;
139139
case CentralityEstimator::FV0A:
140-
if constexpr (hasFV0ACent<TCollision>) {
140+
if constexpr (HasFV0ACent<TCollision>) {
141141
return collision.centFV0A();
142142
}
143143
LOG(fatal) << "Collision does not have centFV0A().";

‎PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ struct HfCandidateCreatorB0Reduced {
132132
/// \param tracksPionThisCollision pion tracks in this collision
133133
/// \param invMass2DPiMin minimum B0 invariant-mass
134134
/// \param invMass2DPiMax maximum B0 invariant-mass
135-
template <bool withDmesMl, typename Cands, typename Pions, typename SoftPions, typename Coll>
135+
template <bool WithDmesMl, typename Cands, typename Pions, typename SoftPions, typename Coll>
136136
void runCandidateCreationDStar(Coll const& collision,
137137
Cands const& candsDThisColl,
138138
SoftPions const& softPions,
@@ -230,7 +230,7 @@ struct HfCandidateCreatorB0Reduced {
230230

231231
rowCandidateProngsDStar(candD.globalIndex(), trackBachPion.globalIndex(), trackSoftPion.globalIndex());
232232

233-
if constexpr (withDmesMl) {
233+
if constexpr (WithDmesMl) {
234234
rowCandidateDmesMlScores(candD.mlScoreBkgMassHypo0(), candD.mlScorePromptMassHypo0(), candD.mlScoreNonpromptMassHypo0());
235235
}
236236
} // pi loop
@@ -244,7 +244,7 @@ struct HfCandidateCreatorB0Reduced {
244244
/// \param tracksPionThisCollision pion tracks in this collision
245245
/// \param invMass2DPiMin minimum B0 invariant-mass
246246
/// \param invMass2DPiMax maximum B0 invariant-mass
247-
template <bool withDmesMl, typename Cands, typename Pions, typename Coll>
247+
template <bool WithDmesMl, typename Cands, typename Pions, typename Coll>
248248
void runCandidateCreation(Coll const& collision,
249249
Cands const& candsDThisColl,
250250
Pions const& tracksPionThisCollision,
@@ -333,7 +333,7 @@ struct HfCandidateCreatorB0Reduced {
333333

334334
rowCandidateProngs(candD.globalIndex(), trackPion.globalIndex());
335335

336-
if constexpr (withDmesMl) {
336+
if constexpr (WithDmesMl) {
337337
rowCandidateDmesMlScores(candD.mlScoreBkgMassHypo0(), candD.mlScorePromptMassHypo0(), candD.mlScoreNonpromptMassHypo0());
338338
}
339339
} // pi loop
@@ -492,7 +492,7 @@ struct HfCandidateCreatorB0ReducedExpressions {
492492
/// \param checkDecayTypeMc
493493
/// \param rowsDPiMcRec MC reco information on DPi pairs
494494
/// \param candsB0 prong global indices of B0 candidates
495-
template <bool checkDecayTypeMc, typename McRec, typename B0Prongs>
495+
template <bool CheckDecayTypeMc, typename McRec, typename B0Prongs>
496496
void fillB0McRec(McRec const& rowsDPiMcRec, B0Prongs const& candsB0)
497497
{
498498
for (const auto& candB0 : candsB0) {
@@ -509,7 +509,7 @@ struct HfCandidateCreatorB0ReducedExpressions {
509509
}
510510
rowB0McRec(rowDPiMcRec.flagMcMatchRec(), -1 /*channel*/, rowDPiMcRec.flagWrongCollision(), rowDPiMcRec.debugMcRec(), rowDPiMcRec.ptMother());
511511
filledMcInfo = true;
512-
if constexpr (checkDecayTypeMc) {
512+
if constexpr (CheckDecayTypeMc) {
513513
rowB0McCheck(rowDPiMcRec.pdgCodeBeautyMother(),
514514
rowDPiMcRec.pdgCodeCharmMother(),
515515
rowDPiMcRec.pdgCodeProng0(),
@@ -521,7 +521,7 @@ struct HfCandidateCreatorB0ReducedExpressions {
521521
}
522522
if (!filledMcInfo) { // protection to get same size tables in case something went wrong: we created a candidate that was not preselected in the D-Pi creator
523523
rowB0McRec(0, -1, -1, -1, -1.f);
524-
if constexpr (checkDecayTypeMc) {
524+
if constexpr (CheckDecayTypeMc) {
525525
rowB0McCheck(-1, -1, -1, -1, -1, -1);
526526
}
527527
}

‎PWGHF/D2H/TableProducer/candidateCreatorBToJpsiReduced.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ struct HfCandidateCreatorBToJpsiReduced {
150150
/// \param tracksLfThisCollisionArr LF tracks in this collision
151151
/// \param invMass2JpsiHadMin minimum B invariant-mass
152152
/// \param invMass2JpsiHadMax maximum B invariant-mass
153-
template <uint8_t decChannel, typename Cands, typename TTracks0, typename TTracks1, typename Coll>
153+
template <uint8_t DecChannel, typename Cands, typename TTracks0, typename TTracks1, typename Coll>
154154
void runCandidateCreation(Coll const& collision,
155155
Cands const& candsJpsiThisColl,
156156
TTracks0 const& tracksLfDau0ThisCollision,
@@ -215,7 +215,7 @@ struct HfCandidateCreatorBToJpsiReduced {
215215
}
216216
auto trackParCovLf0 = getTrackParCov(trackLf0);
217217
std::array<float, 3> pVecTrackLf0{};
218-
if constexpr (decChannel == DecayChannel::BplusToJpsiK) {
218+
if constexpr (DecChannel == DecayChannel::BplusToJpsiK) {
219219
// ---------------------------------
220220
// reconstruct the 3-prong B+ vertex
221221
hCandidatesB->Fill(SVFitting::BeforeFit);
@@ -278,7 +278,7 @@ struct HfCandidateCreatorBToJpsiReduced {
278278
std::sqrt(dcaDauPos.getSigmaY2()), std::sqrt(dcaDauNeg.getSigmaY2()), std::sqrt(dcaKaon.getSigmaY2()));
279279

280280
rowCandidateBpProngs(candJpsi.globalIndex(), trackLf0.globalIndex());
281-
} else if constexpr (decChannel == DecayChannel::BsToJpsiPhi) {
281+
} else if constexpr (DecChannel == DecayChannel::BsToJpsiPhi) {
282282
for (const auto& trackLf1 : tracksLfDau1ThisCollision) {
283283
// this track is among daughters
284284
if (trackLf1.trackId() == candJpsi.prongPosId() || trackLf1.trackId() == candJpsi.prongNegId()) {
@@ -426,12 +426,12 @@ struct HfCandidateCreatorBToJpsiReducedExpressions {
426426
/// Fill candidate information at MC reconstruction level
427427
/// \param rowsJpsiHadMcRec MC reco information on Jpsi hadron pairs
428428
/// \param candsBIds prong global indices of B candidates
429-
template <uint8_t decChannel, typename McRec, typename CCands>
429+
template <uint8_t DecChannel, typename McRec, typename CCands>
430430
void fillMcRec(McRec const& rowsJpsiHadMcRec, CCands const& candsBIds)
431431
{
432432
for (const auto& candB : candsBIds) {
433433
bool filledMcInfo{false};
434-
if constexpr (decChannel == DecayChannel::BplusToJpsiK) {
434+
if constexpr (DecChannel == DecayChannel::BplusToJpsiK) {
435435
for (const auto& rowJpsiHadMcRec : rowsJpsiHadMcRec) {
436436
if ((rowJpsiHadMcRec.jpsiId() != candB.jpsiId()) || (rowJpsiHadMcRec.bachKaId() != candB.bachKaId())) {
437437
continue;
@@ -443,7 +443,7 @@ struct HfCandidateCreatorBToJpsiReducedExpressions {
443443
if (!filledMcInfo) { // protection to get same size tables in case something went wrong: we created a candidate that was not preselected in the Jpsi-K creator
444444
rowBplusMcRec(0, -1, -1, -1, -1.f);
445445
}
446-
} else if constexpr (decChannel == DecayChannel::BsToJpsiPhi) {
446+
} else if constexpr (DecChannel == DecayChannel::BsToJpsiPhi) {
447447
for (const auto& rowJpsiHadMcRec : rowsJpsiHadMcRec) {
448448
if ((rowJpsiHadMcRec.jpsiId() != candB.jpsiId()) || (rowJpsiHadMcRec.prong0PhiId() != candB.prong0PhiId()) || (rowJpsiHadMcRec.prong1PhiId() != candB.prong1PhiId())) {
449449
continue;
@@ -465,9 +465,9 @@ struct HfCandidateCreatorBToJpsiReducedExpressions {
465465
}
466466
PROCESS_SWITCH(HfCandidateCreatorBToJpsiReducedExpressions, processMcBPlus, "Process MC", false);
467467

468-
void processMcBs(HfMcRecRedJPPhis const& rowsJpsiPhiMcRec, HfRedBs2JpsiDaus const& Bs)
468+
void processMcBs(HfMcRecRedJPPhis const& rowsJpsiPhiMcRec, HfRedBs2JpsiDaus const& bs)
469469
{
470-
fillMcRec<DecayChannel::BsToJpsiPhi>(rowsJpsiPhiMcRec, Bs);
470+
fillMcRec<DecayChannel::BsToJpsiPhi>(rowsJpsiPhiMcRec, bs);
471471
}
472472
PROCESS_SWITCH(HfCandidateCreatorBToJpsiReducedExpressions, processMcBs, "Process MC", false);
473473
};

‎PWGHF/D2H/TableProducer/candidateCreatorBplusReduced.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ struct HfCandidateCreatorBplusReduced {
120120
/// \param tracksPionThisCollision pion tracks in this collision
121121
/// \param invMass2D0PiMin minimum B+ invariant-mass
122122
/// \param invMass2D0PiMax maximum B+ invariant-mass
123-
template <bool withDmesMl, typename Cands, typename Pions, typename Coll>
123+
template <bool WithDmesMl, typename Cands, typename Pions, typename Coll>
124124
void runCandidateCreation(Coll const& collision,
125125
Cands const& candsDThisColl,
126126
Pions const& tracksPionThisCollision,
@@ -203,7 +203,7 @@ struct HfCandidateCreatorBplusReduced {
203203

204204
rowCandidateProngs(candD0.globalIndex(), trackPion.globalIndex());
205205

206-
if constexpr (withDmesMl) {
206+
if constexpr (WithDmesMl) {
207207
if (trackPion.signed1Pt() < 0) {
208208
rowCandidateDmesMlScores(candD0.mlScoreBkgMassHypo0(), candD0.mlScorePromptMassHypo0(), candD0.mlScoreNonpromptMassHypo0());
209209
} else {
@@ -295,7 +295,7 @@ struct HfCandidateCreatorBplusReducedExpressions {
295295
/// \param checkDecayTypeMc
296296
/// \param rowsD0PiMcRec MC reco information on D0Pi pairs
297297
/// \param candsBplus prong global indices of B+ candidates
298-
template <bool checkDecayTypeMc, typename McRec>
298+
template <bool CheckDecayTypeMc, typename McRec>
299299
void fillBplusMcRec(McRec const& rowsD0PiMcRec, HfRedBplusProngs const& candsBplus)
300300
{
301301
for (const auto& candBplus : candsBplus) {
@@ -306,7 +306,7 @@ struct HfCandidateCreatorBplusReducedExpressions {
306306
}
307307
rowBplusMcRec(rowD0PiMcRec.flagMcMatchRec(), -1 /*channel*/, rowD0PiMcRec.flagWrongCollision(), rowD0PiMcRec.debugMcRec(), rowD0PiMcRec.ptMother());
308308
filledMcInfo = true;
309-
if constexpr (checkDecayTypeMc) {
309+
if constexpr (CheckDecayTypeMc) {
310310
rowBplusMcCheck(rowD0PiMcRec.pdgCodeBeautyMother(),
311311
rowD0PiMcRec.pdgCodeCharmMother(),
312312
rowD0PiMcRec.pdgCodeProng0(),
@@ -317,7 +317,7 @@ struct HfCandidateCreatorBplusReducedExpressions {
317317
}
318318
if (!filledMcInfo) { // protection to get same size tables in case something went wrong: we created a candidate that was not preselected in the D0-Pi creator
319319
rowBplusMcRec(0, -1, -1, -1, -1.f);
320-
if constexpr (checkDecayTypeMc) {
320+
if constexpr (CheckDecayTypeMc) {
321321
rowBplusMcCheck(-1, -1, -1, -1, -1);
322322
}
323323
}

‎PWGHF/D2H/TableProducer/candidateCreatorBsReduced.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ struct HfCandidateCreatorBsReduced {
116116
/// \param tracksPionThisCollision pion tracks in this collision
117117
/// \param invMass2DPiMin minimum Bs invariant-mass
118118
/// \param invMass2DPiMax maximum Bs invariant-mass
119-
template <bool withDmesMl, typename Cands, typename Pions, typename Coll>
119+
template <bool WithDmesMl, typename Cands, typename Pions, typename Coll>
120120
void runCandidateCreation(Coll const& collision,
121121
Cands const& candsDThisColl,
122122
Pions const& tracksPionThisCollision,
@@ -203,7 +203,7 @@ struct HfCandidateCreatorBsReduced {
203203

204204
rowCandidateProngs(candD.globalIndex(), trackPion.globalIndex());
205205

206-
if constexpr (withDmesMl) {
206+
if constexpr (WithDmesMl) {
207207
if (candD.invMassHypo0() > 0) {
208208
rowCandidateDmesMlScores(candD.mlScoreBkgMassHypo0(), candD.mlScorePromptMassHypo0(), candD.mlScoreNonpromptMassHypo0());
209209
} else {
@@ -295,7 +295,7 @@ struct HfCandidateCreatorBsReducedExpressions {
295295
/// \param checkDecayTypeMc
296296
/// \param rowsDPiMcRec MC reco information on DsPi pairs
297297
/// \param candsB prong global indices of Bs candidates
298-
template <bool checkDecayTypeMc, typename McRec>
298+
template <bool CheckDecayTypeMc, typename McRec>
299299
void fillBsMcRec(McRec const& rowsDPiMcRec, HfRedBsProngs const& candsB)
300300
{
301301
for (const auto& candB : candsB) {
@@ -306,7 +306,7 @@ struct HfCandidateCreatorBsReducedExpressions {
306306
}
307307
rowBsMcRec(rowDPiMcRec.flagMcMatchRec(), -1 /*channel*/, rowDPiMcRec.flagWrongCollision(), rowDPiMcRec.debugMcRec(), rowDPiMcRec.ptMother());
308308
filledMcInfo = true;
309-
if constexpr (checkDecayTypeMc) {
309+
if constexpr (CheckDecayTypeMc) {
310310
rowBsMcCheck(rowDPiMcRec.pdgCodeBeautyMother(),
311311
rowDPiMcRec.pdgCodeCharmMother(),
312312
rowDPiMcRec.pdgCodeProng0(),
@@ -318,7 +318,7 @@ struct HfCandidateCreatorBsReducedExpressions {
318318
}
319319
if (!filledMcInfo) { // protection to get same size tables in case something went wrong: we created a candidate that was not preselected in the DsPi creator
320320
rowBsMcRec(0, -1, -1, -1, -1.f);
321-
if constexpr (checkDecayTypeMc) {
321+
if constexpr (CheckDecayTypeMc) {
322322
rowBsMcCheck(-1, -1, -1, -1, -1, -1);
323323
}
324324
}

0 commit comments

Comments
 (0)