Skip to content

Commit 7f2da75

Browse files
MarcellocostiMarcellocosti
authored
Merge pull request #20 from alibuild/alibot-cleanup-11418
Please consider the following formatting changes to #11418
2 parents ddc75d2 + e49fa7a commit 7f2da75

File tree

4 files changed

+72
-74
lines changed

4 files changed

+72
-74
lines changed

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,40 @@
2020
#define HomogeneousField // o2-linter: disable=name/macro (required by KFParticle)
2121
#endif
2222

23-
#include <memory>
24-
#include <string>
25-
#include <vector>
26-
27-
#include <KFParticleBase.h>
28-
#include <KFParticle.h>
29-
#include <KFPTrack.h>
30-
#include <KFPVertex.h>
31-
#include <KFVertex.h>
23+
#include "PWGHF/Core/CentralityEstimation.h"
24+
#include "PWGHF/Core/DecayChannels.h"
25+
#include "PWGHF/Core/SelectorCuts.h"
26+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
27+
#include "PWGHF/Utils/utilsBfieldCCDB.h"
28+
#include "PWGHF/Utils/utilsEvSelHf.h"
29+
#include "PWGHF/Utils/utilsMcGen.h"
30+
#include "PWGHF/Utils/utilsMcMatching.h"
31+
#include "PWGHF/Utils/utilsPid.h"
32+
#include "PWGHF/Utils/utilsTrkCandHf.h"
33+
#include "PWGLF/DataModel/mcCentrality.h"
3234

33-
#include <TPDGCode.h>
35+
#include "Common/Core/trackUtilities.h"
36+
#include "Tools/KFparticle/KFUtilities.h"
3437

3538
#include "CommonConstants/PhysicsConstants.h"
3639
#include "DCAFitter/DCAFitterN.h"
3740
#include "Framework/AnalysisTask.h"
3841
#include "Framework/HistogramRegistry.h"
39-
#include "Framework/runDataProcessing.h"
4042
#include "Framework/RunningWorkflowInfo.h"
43+
#include "Framework/runDataProcessing.h"
4144
#include "ReconstructionDataFormats/DCA.h"
4245

43-
#include "Common/Core/trackUtilities.h"
44-
#include "Tools/KFparticle/KFUtilities.h"
46+
#include <TPDGCode.h>
4547

46-
#include "PWGLF/DataModel/mcCentrality.h"
48+
#include <KFPTrack.h>
49+
#include <KFPVertex.h>
50+
#include <KFParticle.h>
51+
#include <KFParticleBase.h>
52+
#include <KFVertex.h>
4753

48-
#include "PWGHF/Core/CentralityEstimation.h"
49-
#include "PWGHF/Core/SelectorCuts.h"
50-
#include "PWGHF/Core/DecayChannels.h"
51-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
52-
#include "PWGHF/Utils/utilsBfieldCCDB.h"
53-
#include "PWGHF/Utils/utilsEvSelHf.h"
54-
#include "PWGHF/Utils/utilsMcGen.h"
55-
#include "PWGHF/Utils/utilsPid.h"
56-
#include "PWGHF/Utils/utilsTrkCandHf.h"
57-
#include "PWGHF/Utils/utilsMcMatching.h"
54+
#include <memory>
55+
#include <string>
56+
#include <vector>
5857

5958
using namespace o2;
6059
using namespace o2::analysis;

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,40 @@
1919
#define HomogeneousField // o2-linter: disable=name/macro (required by KFParticle)
2020
#endif
2121

22-
#include <memory>
23-
#include <string>
24-
#include <utility>
25-
#include <vector>
26-
27-
#include <KFParticleBase.h>
28-
#include <KFParticle.h>
29-
#include <KFPTrack.h>
30-
#include <KFPVertex.h>
31-
#include <KFVertex.h>
22+
#include "PWGHF/Core/CentralityEstimation.h"
23+
#include "PWGHF/Core/DecayChannels.h"
24+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
25+
#include "PWGHF/Utils/utilsBfieldCCDB.h"
26+
#include "PWGHF/Utils/utilsEvSelHf.h"
27+
#include "PWGHF/Utils/utilsMcGen.h"
28+
#include "PWGHF/Utils/utilsMcMatching.h"
29+
#include "PWGHF/Utils/utilsPid.h"
30+
#include "PWGHF/Utils/utilsTrkCandHf.h"
31+
#include "PWGLF/DataModel/mcCentrality.h"
3232

33-
#include <TPDGCode.h>
33+
#include "Common/Core/trackUtilities.h"
34+
#include "Tools/KFparticle/KFUtilities.h"
3435

3536
#include "CommonConstants/PhysicsConstants.h"
3637
#include "DCAFitter/DCAFitterN.h"
3738
#include "Framework/AnalysisTask.h"
3839
#include "Framework/HistogramRegistry.h"
39-
#include "Framework/runDataProcessing.h"
4040
#include "Framework/RunningWorkflowInfo.h"
41+
#include "Framework/runDataProcessing.h"
4142
#include "ReconstructionDataFormats/DCA.h"
4243

43-
#include "Common/Core/trackUtilities.h"
44-
#include "Tools/KFparticle/KFUtilities.h"
44+
#include <TPDGCode.h>
4545

46-
#include "PWGLF/DataModel/mcCentrality.h"
46+
#include <KFPTrack.h>
47+
#include <KFPVertex.h>
48+
#include <KFParticle.h>
49+
#include <KFParticleBase.h>
50+
#include <KFVertex.h>
4751

48-
#include "PWGHF/Core/CentralityEstimation.h"
49-
#include "PWGHF/Core/DecayChannels.h"
50-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
51-
#include "PWGHF/Utils/utilsBfieldCCDB.h"
52-
#include "PWGHF/Utils/utilsEvSelHf.h"
53-
#include "PWGHF/Utils/utilsMcGen.h"
54-
#include "PWGHF/Utils/utilsPid.h"
55-
#include "PWGHF/Utils/utilsTrkCandHf.h"
56-
#include "PWGHF/Utils/utilsMcMatching.h"
52+
#include <memory>
53+
#include <string>
54+
#include <utility>
55+
#include <vector>
5756

5857
using namespace o2;
5958
using namespace o2::hf_evsel;
@@ -948,14 +947,14 @@ struct HfCandidateCreator3ProngExpressions {
948947
}
949948

950949
if (matchCorrBkgs) {
951-
indexRec = -1; // Index of the matched reconstructed candidate
952-
constexpr int MaxDepth = 2; // Depth for final state matching
953-
constexpr int ResoMaxDepth = 1; // Depth for resonant decay matching
950+
indexRec = -1; // Index of the matched reconstructed candidate
951+
constexpr int MaxDepth = 2; // Depth for final state matching
952+
constexpr int ResoMaxDepth = 1; // Depth for resonant decay matching
954953

955954
for (const auto& pdg : mothersCorrBkgsPdgs.value) {
956955
int depth = MaxDepth;
957956
if (pdg == Pdg::kDStar) {
958-
depth = MaxDepth+1; // D0 resonant decays are active
957+
depth = MaxDepth + 1; // D0 resonant decays are active
959958
}
960959
auto finalStates = getDecayChannelMain(pdg);
961960
for (const auto& [chn, finalState] : finalStates) {

‎PWGHF/Utils/utilsMcGen.h‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@
1717
#ifndef PWGHF_UTILS_UTILSMCGEN_H_
1818
#define PWGHF_UTILS_UTILSMCGEN_H_
1919

20-
#include <Rtypes.h>
21-
#include <TPDGCode.h>
20+
#include "PWGHF/Core/DecayChannels.h"
21+
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
22+
#include "PWGHF/Utils/utilsMcMatching.h"
23+
24+
#include "Common/Core/RecoDecay.h"
2225

2326
#include <CommonConstants/PhysicsConstants.h>
2427

28+
#include <TPDGCode.h>
29+
30+
#include <Rtypes.h>
31+
2532
#include <array>
2633
#include <cstdint>
2734
#include <vector>
2835

29-
#include "Common/Core/RecoDecay.h"
30-
31-
#include "PWGHF/Core/DecayChannels.h"
32-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
33-
#include "PWGHF/Utils/utilsMcMatching.h"
34-
3536
namespace hf_mc_gen
3637
{
3738

@@ -54,8 +55,8 @@ void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
5455
continue;
5556
}
5657
if (matchCorrBkgs) {
57-
constexpr int MaxDepth = 2; // Depth for final state matching
58-
constexpr int ResoMaxDepth = 1; // Depth for resonant decay matching
58+
constexpr int MaxDepth = 2; // Depth for final state matching
59+
constexpr int ResoMaxDepth = 1; // Depth for resonant decay matching
5960
bool matched = false;
6061

6162
for (const auto& [chn, finalState] : o2::hf_decay::hf_cand_2prong::daughtersD0Main) {
@@ -152,13 +153,13 @@ void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
152153
continue; // Skip if the particle PDG code does not match the mother PDG code
153154
}
154155
auto finalStates = o2::hf_decay::hf_cand_3prong::getDecayChannelMain(motherPdgCode);
155-
constexpr int MaxDepth = 2; // Depth for final state matching
156-
constexpr int ResoMaxDepth = 1; // Depth for resonant decay matching
156+
constexpr int MaxDepth = 2; // Depth for final state matching
157+
constexpr int ResoMaxDepth = 1; // Depth for resonant decay matching
157158

158159
int maxDepth = MaxDepth;
159160
bool matched = false;
160161
if (motherPdgCode == Pdg::kDStar) {
161-
maxDepth = MaxDepth+1; // D0 resonant decays are switched on
162+
maxDepth = MaxDepth + 1; // D0 resonant decays are switched on
162163
}
163164

164165
std::vector<int> arrAllDaughtersIndex;
@@ -170,7 +171,7 @@ void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
170171
matched = RecoDecay::isMatchedMCGen(mcParticles, particle, motherPdgCode, finalStateParts, true, &sign, -1);
171172
} else if (finalState.size() == 4) { // Partly Reco 3-prong decays from 4-prong decays
172173
std::array<int, 4> finalStateParts = std::array{finalState[0], finalState[1], finalState[2], finalState[3]};
173-
o2::hf_decay::convertPi0ToAntiPi0(particle.pdgCode(), finalStateParts);
174+
o2::hf_decay::convertPi0ToAntiPi0(particle.pdgCode(), finalStateParts);
174175
RecoDecay::getDaughters<false>(particle, &arrAllDaughtersIndex, finalStateParts, maxDepth);
175176
matched = RecoDecay::isMatchedMCGen(mcParticles, particle, motherPdgCode, finalStateParts, true, &sign, -1);
176177
} else if (finalState.size() == 3) { // Fully Reco 3-prong decays

‎PWGHF/Utils/utilsMcMatching.h‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ namespace hf_cand_3prong
5757

5858
// D±
5959
static const std::unordered_map<DecayChannelMain, const std::vector<int>> daughtersDplusMain{
60-
{DecayChannelMain::DplusToPiKPi, {+kKMinus, +kKPlus, +kPiPlus}},
61-
{DecayChannelMain::DplusToPiKK, {+kKMinus, +kPiPlus, +kPiPlus}},
62-
{DecayChannelMain::DplusToPiKPiPi0, {+kKMinus, +kPiPlus, +kPiPlus, +kPi0}},
63-
{DecayChannelMain::DplusToPiPiPi, {+kPiMinus, +kPiPlus, +kPiPlus}},
64-
};
60+
{DecayChannelMain::DplusToPiKPi, {+kKMinus, +kKPlus, +kPiPlus}},
61+
{DecayChannelMain::DplusToPiKK, {+kKMinus, +kPiPlus, +kPiPlus}},
62+
{DecayChannelMain::DplusToPiKPiPi0, {+kKMinus, +kPiPlus, +kPiPlus, +kPi0}},
63+
{DecayChannelMain::DplusToPiPiPi, {+kPiMinus, +kPiPlus, +kPiPlus}},
64+
};
6565

6666
static const std::unordered_map<DecayChannelResonant, const std::array<int, 2>> daughtersDplusResonant{
6767
{DecayChannelResonant::DplusToPhiPi, {+o2::constants::physics::kPhi, +kPiPlus}},
@@ -120,8 +120,7 @@ static const std::unordered_map<DecayChannelMain, const std::vector<int>> daught
120120
{DecayChannelMain::LcToPKPi, {+kProton, +kKMinus, +kPiPlus}},
121121
{DecayChannelMain::LcToPKPiPi0, {+kProton, +kKMinus, +kPiPlus, +kPi0}},
122122
{DecayChannelMain::LcToPPiPi, {+kProton, +kPiMinus, +kPiPlus}},
123-
{DecayChannelMain::LcToPKK, {+kProton, +kKMinus, +kKPlus}}
124-
};
123+
{DecayChannelMain::LcToPKK, {+kProton, +kKMinus, +kKPlus}}};
125124

126125
static const std::unordered_map<DecayChannelResonant, const std::array<int, 2>> daughtersLcResonant{
127126
{DecayChannelResonant::LcToPKstar0, {+o2::constants::physics::kK0Star892, +kProton}},
@@ -257,7 +256,7 @@ template <std::size_t N>
257256
inline void convertPi0ToAntiPi0(const int partPdgCode, std::array<int, N>& arrPdgIndexes)
258257
{
259258
if (partPdgCode < 0) {
260-
for (auto& part : arrPdgIndexes) { // o2-linter: disable=const-ref-in-for-loop (int elements)
259+
for (auto& part : arrPdgIndexes) { // o2-linter: disable=const-ref-in-for-loop (int elements)
261260
if (part == kPi0) {
262261
part = -part; // The Pi0 pdg code does not change between particle and antiparticle
263262
}

0 commit comments

Comments
 (0)