Skip to content

Commit 972346c

Browse files
ariedel-cernariedel-cern
authored
Merge pull request #22 from alibuild/alibot-cleanup-16938
[PWGCF] Please consider the following formatting changes to #16938
2 parents 92dcf8b + c50f8ea commit 972346c

9 files changed

Lines changed: 559 additions & 561 deletions

‎PWGCF/Femto/Core/cascadeBuilder.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ struct ConfOmegaSelection : o2::framework::ConfigurableGroup {
115115

116116
#undef CASCADE_DEFAULT_SELECTION
117117

118-
119118
/// The different selections this task is capable of doing
120119
enum CascadeSels {
121120
// selections for cascades

‎PWGCF/Femto/Core/cascadeHistManager.h‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -170,46 +170,45 @@ constexpr std::array<histmanager::HistInfo<CascadeHist>, kCascadeHistLast> HistT
170170
{kSecondaryOther, o2::framework::HistType::kTH2F, "hFromSecondaryOther", "Particles from every other secondary decay; p_{T} (GeV/#it{c}); cos(#alpha)"}},
171171
};
172172

173-
174173
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
175174
#define CASCADE_HIST_ANALYSIS_MAP(conf) \
176-
{kPt, {(conf).pt}}, \
177-
{kEta, {(conf).eta}}, \
178-
{kPhi, {(conf).phi}}, \
179-
{kMass, {(conf).mass}}, \
180-
{kSign, {(conf).sign}}, \
175+
{kPt, {(conf).pt}}, \
176+
{kEta, {(conf).eta}}, \
177+
{kPhi, {(conf).phi}}, \
178+
{kMass, {(conf).mass}}, \
179+
{kSign, {(conf).sign}}, \
181180
{kPtVsMass, {(conf).pt, (conf).mass}},
182181

183182
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
184-
#define CASCADE_HIST_MC_MAP(conf) \
183+
#define CASCADE_HIST_MC_MAP(conf) \
185184
{kTruePtVsPt, {(conf).pt, (conf).pt}}, \
186185
{kTrueEtaVsEta, {(conf).eta, (conf).eta}}, \
187186
{kTruePhiVsPhi, {(conf).phi, (conf).phi}}, \
188-
{kPdg, {(conf).pdgCodes}}, \
189-
{kPdgMother, {(conf).pdgCodes}}, \
187+
{kPdg, {(conf).pdgCodes}}, \
188+
{kPdgMother, {(conf).pdgCodes}}, \
190189
{kPdgPartonicMother, {(conf).pdgCodes}},
191190

192191
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
193-
#define CASCADE_HIST_QA_MAP(confAnalysis, confQa) \
194-
{kCosPa, {(confQa).cosPa}}, \
195-
{kDecayDauDca, {(confQa).dauDcaAtDecay}}, \
196-
{kTransRadius, {(confQa).transRadius}}, \
197-
{kLambdaCosPa, {(confQa).lambdaCosPa}}, \
198-
{kLambdaDauDca, {(confQa).lambdaDauDca}}, \
199-
{kLambdaTransRadius, {(confQa).lambdaTransRadius}}, \
200-
{kLambdaDcaToPv, {(confQa).lambdaDcaToPv}}, \
192+
#define CASCADE_HIST_QA_MAP(confAnalysis, confQa) \
193+
{kCosPa, {(confQa).cosPa}}, \
194+
{kDecayDauDca, {(confQa).dauDcaAtDecay}}, \
195+
{kTransRadius, {(confQa).transRadius}}, \
196+
{kLambdaCosPa, {(confQa).lambdaCosPa}}, \
197+
{kLambdaDauDca, {(confQa).lambdaDauDca}}, \
198+
{kLambdaTransRadius, {(confQa).lambdaTransRadius}}, \
199+
{kLambdaDcaToPv, {(confQa).lambdaDcaToPv}}, \
201200
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
202201
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
203202
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
204203
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
205-
{kMassXi, {(confQa).massXi}}, \
206-
{kMassOmega, {(confQa).massOmega}}, \
204+
{kMassXi, {(confQa).massXi}}, \
205+
{kMassOmega, {(confQa).massOmega}}, \
207206
{kPtVsMassXi, {(confAnalysis).pt, (confQa).massXi}}, \
208207
{kPtVsMassOmega, {(confAnalysis).pt, (confQa).massOmega}}, \
209208
{kMassXiVsMassOmega, {(confQa).massXi, (confQa).massOmega}},
210209

211210
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
212-
#define CASCADE_HIST_MC_QA_MAP(confAnalysis, confQa) \
211+
#define CASCADE_HIST_MC_QA_MAP(confAnalysis, confQa) \
213212
{kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \
214213
{kPrimary, {(confAnalysis).pt, (confQa).cosPa}}, \
215214
{kFromWrongCollision, {(confAnalysis).pt, (confQa).cosPa}}, \
@@ -258,7 +257,6 @@ std::map<CascadeHist, std::vector<o2::framework::AxisSpec>> makeCascadeMcQaHistS
258257
#undef CASCADE_HIST_QA_MAP
259258
#undef CASCADE_HIST_MC_QA_MAP
260259

261-
262260
constexpr char PrefixXiQa[] = "XiQA/";
263261
constexpr char PrefixXi[] = "Xi/";
264262
constexpr char PrefixOmegaQa[] = "OmegaQa/";

‎PWGCF/Femto/Core/closePairRejection.h‎

Lines changed: 504 additions & 504 deletions
Large diffs are not rendered by default.

‎PWGCF/Femto/Core/collisionHistManager.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,29 +91,29 @@ constexpr std::array<histmanager::HistInfo<ColHist>, kColHistLast> HistTable = {
9191

9292
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
9393
#define COL_HIST_ANALYSIS_MAP(conf) \
94-
{kPosZ, {(conf).vtxZ}}, \
95-
{kMult, {(conf).mult}}, \
96-
{kCent, {(conf).cent}}, \
94+
{kPosZ, {(conf).vtxZ}}, \
95+
{kMult, {(conf).mult}}, \
96+
{kCent, {(conf).cent}}, \
9797
{kMagField, {(conf).magField}},
9898

9999
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
100-
#define COL_HIST_QA_MAP(confAnalysis, confQa) \
101-
{kPosX, {(confQa).vtxXY}}, \
102-
{kPosY, {(confQa).vtxXY}}, \
103-
{kPos, {(confQa).vtx}}, \
104-
{kSphericity, {(confQa).sphericity}}, \
105-
{kOccupancy, {(confQa).occupancy}}, \
100+
#define COL_HIST_QA_MAP(confAnalysis, confQa) \
101+
{kPosX, {(confQa).vtxXY}}, \
102+
{kPosY, {(confQa).vtxXY}}, \
103+
{kPos, {(confQa).vtx}}, \
104+
{kSphericity, {(confQa).sphericity}}, \
105+
{kOccupancy, {(confQa).occupancy}}, \
106106
{kPoszVsMult, {(confAnalysis).vtxZ, (confAnalysis).mult}}, \
107107
{kPoszVsCent, {(confAnalysis).vtxZ, (confAnalysis).cent}}, \
108108
{kCentVsMult, {(confAnalysis).cent, (confAnalysis).mult}}, \
109109
{kMultVsSphericity, {(confAnalysis).mult, (confQa).sphericity}}, \
110110
{kCentVsSphericity, {confBinningAnalysis.cent, (confQa).sphericity}},
111111

112112
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
113-
#define COL_HIST_MC_MAP(conf) \
114-
{kTruePosZ, {(conf).vtxZ}}, \
115-
{kTrueCent, {(conf).cent}}, \
116-
{kTrueMult, {(conf).mult}}, \
113+
#define COL_HIST_MC_MAP(conf) \
114+
{kTruePosZ, {(conf).vtxZ}}, \
115+
{kTrueCent, {(conf).cent}}, \
116+
{kTrueMult, {(conf).mult}}, \
117117
{kTruePosZVsPosZ, {(conf).vtxZ, (conf).vtxZ}}, \
118118
{kTrueCentVsCent, {(conf).cent, (conf).cent}}, \
119119
{kTrueMultVsMult, {(conf).mult, (conf).mult}},

‎PWGCF/Femto/Core/histManager.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ struct HistInfo {
3737
std::string_view n,
3838
std::string_view d)
3939
: hist(h), histtype(t), histname(n), histdesc(d)
40-
{}
40+
{
41+
}
4142

4243
Hist hist{};
4344
o2::framework::HistType histtype{o2::framework::kUndefinedHist};

‎PWGCF/Femto/Core/kinkHistManager.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@ constexpr std::array<histmanager::HistInfo<KinkHist>, kKinkHistLast> HistTable =
190190

191191
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
192192
#define KINK_HIST_QA_MAP(confAnalysis, confQa) \
193-
{kKinkAngle, {(confQa).kinkAngle}}, \
194-
{kDcaMothToPV, {(confQa).dcaMothToPV}}, \
195-
{kDcaDaugToPV, {(confQa).dcaDaugToPV}}, \
196-
{kDecayVtxX, {(confQa).decayVertex}}, \
197-
{kDecayVtxY, {(confQa).decayVertex}}, \
198-
{kDecayVtxZ, {(confQa).decayVertex}}, \
199-
{kDecayVtx, {(confQa).decayVertex}}, \
200-
{kTransRadius, {(confQa).transRadius}}, \
193+
{kKinkAngle, {(confQa).kinkAngle}}, \
194+
{kDcaMothToPV, {(confQa).dcaMothToPV}}, \
195+
{kDcaDaugToPV, {(confQa).dcaDaugToPV}}, \
196+
{kDecayVtxX, {(confQa).decayVertex}}, \
197+
{kDecayVtxY, {(confQa).decayVertex}}, \
198+
{kDecayVtxZ, {(confQa).decayVertex}}, \
199+
{kDecayVtx, {(confQa).decayVertex}}, \
200+
{kTransRadius, {(confQa).transRadius}}, \
201201
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
202202
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
203203
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \

‎PWGCF/Femto/Core/particleCleaner.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class ParticleCleaner
120120
// since that lookup now goes through the mc particle row.
121121
if (!particle.has_fMcParticle()) {
122122
return !mRejectParticleWithoutMcParticle && mRequiredPdgCodes.empty() &&
123-
!mRejectParticleWithoutMcMother && mRequiredMotherPdgCodes.empty() &&
124-
!mRejectParticleWithoutMcPartonicMother && mRequiredPartonicMotherPdgCodes.empty();
123+
!mRejectParticleWithoutMcMother && mRequiredMotherPdgCodes.empty() &&
124+
!mRejectParticleWithoutMcPartonicMother && mRequiredPartonicMotherPdgCodes.empty();
125125
}
126126

127127
auto mcParticle = particle.template fMcParticle_as<T2>();

‎PWGCF/Femto/Core/tripletCleaner.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class TrackTrackV0TripletCleaner : public paircleaner::BasePairCleaner
6060
{
6161
public:
6262
TrackTrackV0TripletCleaner() = default;
63-
~TrackTrackV0TripletCleaner() override = default;
63+
~TrackTrackV0TripletCleaner() override = default;
6464

6565
template <typename T1, typename T2, typename T3, typename T4>
6666
bool isCleanTriplet(T1 const& track1, T2 const& track2, T3 const& v0, T4 const& trackTable) const

‎PWGCF/Femto/Core/twoTrackResonanceBuilder.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ using ConfPhiFilters = ConfTwoTrackResonanceFilters<PrefixPhiFilters>;
5858
using ConfKstarFilters = ConfTwoTrackResonanceFilters<PrefixKstarFilters>;
5959

6060
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
61-
#define TWOTRACKRESONANCE_DEFAULT_SELECTION(defaultPdgCode, defaultMassMin, defaultMassMax) \
62-
o2::framework::Configurable<int> pdgCodeAbs{"pdgCodeAbs", (defaultPdgCode), "Resonance PDG code. Set sign to minus 1 for antiparticle"}; \
63-
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
64-
o2::framework::Configurable<float> ptMax{"ptMax", 6.f, "Maximum pT"}; \
65-
o2::framework::Configurable<float> etaMin{"etaMin", -0.9f, "Minimum eta"}; \
66-
o2::framework::Configurable<float> etaMax{"etaMax", 0.9f, "Maximum eta"}; \
67-
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum phi"}; \
68-
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
69-
o2::framework::Configurable<float> massMin{"massMin", (defaultMassMin), "Minimum invariant mass for Resonance"}; \
70-
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for Resonance"}; \
61+
#define TWOTRACKRESONANCE_DEFAULT_SELECTION(defaultPdgCode, defaultMassMin, defaultMassMax) \
62+
o2::framework::Configurable<int> pdgCodeAbs{"pdgCodeAbs", (defaultPdgCode), "Resonance PDG code. Set sign to minus 1 for antiparticle"}; \
63+
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
64+
o2::framework::Configurable<float> ptMax{"ptMax", 6.f, "Maximum pT"}; \
65+
o2::framework::Configurable<float> etaMin{"etaMin", -0.9f, "Minimum eta"}; \
66+
o2::framework::Configurable<float> etaMax{"etaMax", 0.9f, "Maximum eta"}; \
67+
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum phi"}; \
68+
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
69+
o2::framework::Configurable<float> massMin{"massMin", (defaultMassMin), "Minimum invariant mass for Resonance"}; \
70+
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for Resonance"}; \
7171
o2::framework::Configurable<o2::analysis::femto::datatypes::TrackMaskType> posDauMaskBelowThres{"posDauMaskBelowThres", 0x10u, "Bitmask for positive daughter below threshold"}; \
7272
o2::framework::Configurable<o2::analysis::femto::datatypes::TrackMaskType> posDauMaskAboveThres{"posDauMaskAboveThres", 0x8u, "Bitmask for positive daughter above threshold"}; \
7373
o2::framework::Configurable<o2::analysis::femto::datatypes::TrackMaskType> negDauMaskBelowThres{"negDauMaskBelowThres", 0x2u, "Bitmask for negative daughter below threshold"}; \

0 commit comments

Comments
 (0)