Skip to content

Commit 92dcf8b

Browse files
ariedel-cernariedel-cern
committed
Feat: fix clang-tidy warnings
1 parent 48965d5 commit 92dcf8b

49 files changed

Lines changed: 1588 additions & 1527 deletions

Some content is hidden

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

‎PWGCF/Femto/Core/baseSelection.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class BaseSelection
257257

258258
/// \brief Check whether all required and optional cuts are passed.
259259
/// \return True if all minimal cuts pass and, if optional cuts are present, at least one of them passes.
260-
bool passesAllRequiredSelections() const
260+
[[nodiscard]] bool passesAllRequiredSelections() const
261261
{
262262
if (mHasMinimalSelection && !mHasOptionalSelection) {
263263
return mPassesMinimalSelections;
@@ -275,14 +275,14 @@ class BaseSelection
275275
/// \brief Check whether the optional selection for a specific observable is passed.
276276
/// \param observableIndex Index of the observable.
277277
/// \return True if at least one optional selection for this observable is fulfilled.
278-
bool passesOptionalSelection(int observableIndex) const
278+
[[nodiscard]] bool passesOptionalSelection(int observableIndex) const
279279
{
280280
return mSelectionContainers.at(observableIndex).passesAsOptionalCut();
281281
}
282282

283283
/// \brief Assemble the global selection bitmask from all individual observable selections.
284284
/// \tparam HistName Name of the histogram used to track selection statistics.
285-
template <const char* HistName>
285+
template <auto& HistName>
286286
void assembleBitmask()
287287
{
288288
mHistRegistry->fill(HIST(HistName), mNSelection);
@@ -391,7 +391,7 @@ class BaseSelection
391391
/// \brief Initialize histograms and set bitmask offsets for all configured observables.
392392
/// \tparam HistName Name of the histogram to create in the registry.
393393
/// \param registry Pointer to the histogram registry.
394-
template <const char* HistName>
394+
template <auto& HistName>
395395
void setupContainers(o2::framework::HistogramRegistry* registry)
396396
{
397397
mHistRegistry = registry;

‎PWGCF/Femto/Core/cascadeBuilder.h‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ struct ConfCascadeFilters : o2::framework::ConfigurableGroup {
5959
o2::framework::Configurable<float> massLambdaMax{"massLambdaMax", 1.2f, "Maximum Lambda mass"};
6060
};
6161

62+
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
6263
#define CASCADE_DEFAULT_BITS \
6364
o2::framework::Configurable<bool> passThrough{"passThrough", false, "If true, all Cascades are passed through. Bits for all selections are stored."}; \
6465
o2::framework::Configurable<std::vector<float>> cascadeCpaMin{"cascadeCpaMin", {0.95f}, "Minimum cosine of pointing angle"}; \
@@ -88,17 +89,18 @@ struct ConfOmegaBits : o2::framework::ConfigurableGroup {
8889

8990
#undef CASCADE_DEFAULT_BITS
9091

91-
#define CASCADE_DEFAULT_SELECTION(defaultMassMin, defaultMassMax, defaultPdgCode) \
92-
o2::framework::Configurable<int> pdgCodeAbs{"pdgCodeAbs", defaultPdgCode, "Cascade PDG code. Set sign to +1 to select antiparticle"}; \
93-
o2::framework::Configurable<int> sign{"sign", -1, "Sign of the charge of the Cascade"}; \
94-
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
95-
o2::framework::Configurable<float> ptMax{"ptMax", 999.f, "Maximum pT"}; \
96-
o2::framework::Configurable<float> etaMin{"etaMin", -10.f, "Minimum eta"}; \
97-
o2::framework::Configurable<float> etaMax{"etaMax", 10.f, "Maximum eta"}; \
98-
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum eta"}; \
99-
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
100-
o2::framework::Configurable<float> massMin{"massMin", defaultMassMin, "Minimum invariant mass for Cascade"}; \
101-
o2::framework::Configurable<float> massMax{"massMax", defaultMassMax, "Maximum invariant mass for Cascade"}; \
92+
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
93+
#define CASCADE_DEFAULT_SELECTION(defaultMassMin, defaultMassMax, defaultPdgCode) \
94+
o2::framework::Configurable<int> pdgCodeAbs{"pdgCodeAbs", (defaultPdgCode), "Cascade PDG code. Set sign to +1 to select antiparticle"}; \
95+
o2::framework::Configurable<int> sign{"sign", -1, "Sign of the charge of the Cascade"}; \
96+
o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"}; \
97+
o2::framework::Configurable<float> ptMax{"ptMax", 999.f, "Maximum pT"}; \
98+
o2::framework::Configurable<float> etaMin{"etaMin", -10.f, "Minimum eta"}; \
99+
o2::framework::Configurable<float> etaMax{"etaMax", 10.f, "Maximum eta"}; \
100+
o2::framework::Configurable<float> phiMin{"phiMin", 0.f, "Minimum eta"}; \
101+
o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"}; \
102+
o2::framework::Configurable<float> massMin{"massMin", (defaultMassMin), "Minimum invariant mass for Cascade"}; \
103+
o2::framework::Configurable<float> massMax{"massMax", (defaultMassMax), "Maximum invariant mass for Cascade"}; \
102104
o2::framework::Configurable<o2::analysis::femto::datatypes::CascadeMaskType> mask{"mask", 0x0, "Bitmask for cascade selection"};
103105

104106
struct ConfXiSelection : o2::framework::ConfigurableGroup {
@@ -111,6 +113,9 @@ struct ConfOmegaSelection : o2::framework::ConfigurableGroup {
111113
CASCADE_DEFAULT_SELECTION(1.57, 1.77, 3334)
112114
};
113115

116+
#undef CASCADE_DEFAULT_SELECTION
117+
118+
114119
/// The different selections this task is capable of doing
115120
enum CascadeSels {
116121
// selections for cascades
@@ -167,12 +172,12 @@ const std::unordered_map<CascadeSels, std::string> cascadeSelectionNames = {
167172

168173
/// \class FemtoDreamTrackCuts
169174
/// \brief Cut class to contain and execute all cuts applied to tracks
170-
template <modes::Cascade cascadeType, const char* HistName>
175+
template <modes::Cascade cascadeType, auto& HistName>
171176
class CascadeSelection : public BaseSelection<float, o2::analysis::femto::datatypes::CascadeMaskType, kCascadeSelsMax>
172177
{
173178
public:
174179
CascadeSelection() = default;
175-
~CascadeSelection() = default;
180+
~CascadeSelection() override = default;
176181

177182
template <typename T1, typename T2>
178183
void configure(o2::framework::HistogramRegistry* registry, T1 const& config, T2 const& filter)
@@ -182,8 +187,8 @@ class CascadeSelection : public BaseSelection<float, o2::analysis::femto::dataty
182187

183188
// if pass through mode is activated, each cut is neutral (i.e. neither minimal nor optional and we do
184189
// store all bits, so the most permissive bit is not skipped for minimal selections)
185-
const bool isMinimalCut = mPassThrough ? false : true;
186-
const bool skipMostPermissiveBit = mPassThrough ? false : true;
190+
const bool isMinimalCut = !mPassThrough;
191+
const bool skipMostPermissiveBit = !mPassThrough;
187192

188193
if constexpr (modes::isEqual(cascadeType, modes::Cascade::kXi)) {
189194
mXiMassLowerLimit = filter.massXiMin.value;
@@ -313,7 +318,7 @@ class CascadeSelection : public BaseSelection<float, o2::analysis::femto::dataty
313318
return false; // should never happen
314319
}
315320

316-
bool passThroughAllCascades() const { return mPassThrough; }
321+
[[nodiscard]] bool passThroughAllCascades() const { return mPassThrough; }
317322

318323
protected:
319324
float mXiMassLowerLimit = 0.f;
@@ -354,7 +359,7 @@ struct ConfCascadeTables : o2::framework::ConfigurableGroup {
354359
o2::framework::Configurable<int> produceOmegaExtras{"produceOmegaExtras", -1, "Produce OmegaExtras (-1: auto; 0 off; 1 on)"};
355360
};
356361

357-
template <modes::Cascade cascadeType, const char* HistName>
362+
template <modes::Cascade cascadeType, auto& HistName>
358363
class CascadeBuilder
359364
{
360365
public:

‎PWGCF/Femto/Core/cascadeHistManager.h‎

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ enum CascadeHist {
8888

8989
constexpr std::size_t MaxSecondary = 3;
9090

91-
template <const char* Prefix>
91+
template <auto& Prefix>
9292
struct ConfCascadeBinning : o2::framework::ConfigurableGroup {
9393
std::string prefix = Prefix;
9494
o2::framework::ConfigurableAxis pt{"pt", {{600, 0, 6}}, "Pt"};
@@ -104,7 +104,7 @@ using ConfXiBinning = ConfCascadeBinning<PrefixXiBinning>;
104104
constexpr const char PrefixOmegaBinning[] = "OmegaBinning";
105105
using ConfOmegaBinning = ConfCascadeBinning<PrefixOmegaBinning>;
106106

107-
template <const char* Prefix>
107+
template <auto& Prefix>
108108
struct ConfCascadeQaBinning : o2::framework::ConfigurableGroup {
109109
std::string prefix = Prefix;
110110
o2::framework::Configurable<bool> plot2d{"plot2d", true, "Enable 2d Qa histograms"};
@@ -170,50 +170,55 @@ 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-
#define CASCADE_HIST_ANALYSIS_MAP(conf) \
174-
{kPt, {conf.pt}}, \
175-
{kEta, {conf.eta}}, \
176-
{kPhi, {conf.phi}}, \
177-
{kMass, {conf.mass}}, \
178-
{kSign, {conf.sign}}, \
179-
{kPtVsMass, {conf.pt, conf.mass}},
180173

174+
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
175+
#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}}, \
181+
{kPtVsMass, {(conf).pt, (conf).mass}},
182+
183+
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
181184
#define CASCADE_HIST_MC_MAP(conf) \
182-
{kTruePtVsPt, {conf.pt, conf.pt}}, \
183-
{kTrueEtaVsEta, {conf.eta, conf.eta}}, \
184-
{kTruePhiVsPhi, {conf.phi, conf.phi}}, \
185-
{kPdg, {conf.pdgCodes}}, \
186-
{kPdgMother, {conf.pdgCodes}}, \
187-
{kPdgPartonicMother, {conf.pdgCodes}},
188-
185+
{kTruePtVsPt, {(conf).pt, (conf).pt}}, \
186+
{kTrueEtaVsEta, {(conf).eta, (conf).eta}}, \
187+
{kTruePhiVsPhi, {(conf).phi, (conf).phi}}, \
188+
{kPdg, {(conf).pdgCodes}}, \
189+
{kPdgMother, {(conf).pdgCodes}}, \
190+
{kPdgPartonicMother, {(conf).pdgCodes}},
191+
192+
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
189193
#define CASCADE_HIST_QA_MAP(confAnalysis, confQa) \
190-
{kCosPa, {confQa.cosPa}}, \
191-
{kDecayDauDca, {confQa.dauDcaAtDecay}}, \
192-
{kTransRadius, {confQa.transRadius}}, \
193-
{kLambdaCosPa, {confQa.lambdaCosPa}}, \
194-
{kLambdaDauDca, {confQa.lambdaDauDca}}, \
195-
{kLambdaTransRadius, {confQa.lambdaTransRadius}}, \
196-
{kLambdaDcaToPv, {confQa.lambdaDcaToPv}}, \
197-
{kPtVsEta, {confAnalysis.pt, confAnalysis.eta}}, \
198-
{kPtVsPhi, {confAnalysis.pt, confAnalysis.phi}}, \
199-
{kPhiVsEta, {confAnalysis.phi, confAnalysis.eta}}, \
200-
{kPtVsCosPa, {confAnalysis.pt, confQa.cosPa}}, \
201-
{kMassXi, {confQa.massXi}}, \
202-
{kMassOmega, {confQa.massOmega}}, \
203-
{kPtVsMassXi, {confAnalysis.pt, confQa.massXi}}, \
204-
{kPtVsMassOmega, {confAnalysis.pt, confQa.massOmega}}, \
205-
{kMassXiVsMassOmega, {confQa.massXi, confQa.massOmega}},
206-
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}}, \
201+
{kPtVsEta, {(confAnalysis).pt, (confAnalysis).eta}}, \
202+
{kPtVsPhi, {(confAnalysis).pt, (confAnalysis).phi}}, \
203+
{kPhiVsEta, {(confAnalysis).phi, (confAnalysis).eta}}, \
204+
{kPtVsCosPa, {(confAnalysis).pt, (confQa).cosPa}}, \
205+
{kMassXi, {(confQa).massXi}}, \
206+
{kMassOmega, {(confQa).massOmega}}, \
207+
{kPtVsMassXi, {(confAnalysis).pt, (confQa).massXi}}, \
208+
{kPtVsMassOmega, {(confAnalysis).pt, (confQa).massOmega}}, \
209+
{kMassXiVsMassOmega, {(confQa).massXi, (confQa).massOmega}},
210+
211+
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
207212
#define CASCADE_HIST_MC_QA_MAP(confAnalysis, confQa) \
208-
{kNoMcParticle, {confAnalysis.pt, confQa.cosPa}}, \
209-
{kPrimary, {confAnalysis.pt, confQa.cosPa}}, \
210-
{kFromWrongCollision, {confAnalysis.pt, confQa.cosPa}}, \
211-
{kFromMaterial, {confAnalysis.pt, confQa.cosPa}}, \
212-
{kMissidentified, {confAnalysis.pt, confQa.cosPa}}, \
213-
{kSecondary1, {confAnalysis.pt, confQa.cosPa}}, \
214-
{kSecondary2, {confAnalysis.pt, confQa.cosPa}}, \
215-
{kSecondary3, {confAnalysis.pt, confQa.cosPa}}, \
216-
{kSecondaryOther, {confAnalysis.pt, confQa.cosPa}},
213+
{kNoMcParticle, {(confAnalysis).pt, (confQa).cosPa}}, \
214+
{kPrimary, {(confAnalysis).pt, (confQa).cosPa}}, \
215+
{kFromWrongCollision, {(confAnalysis).pt, (confQa).cosPa}}, \
216+
{kFromMaterial, {(confAnalysis).pt, (confQa).cosPa}}, \
217+
{kMissidentified, {(confAnalysis).pt, (confQa).cosPa}}, \
218+
{kSecondary1, {(confAnalysis).pt, (confQa).cosPa}}, \
219+
{kSecondary2, {(confAnalysis).pt, (confQa).cosPa}}, \
220+
{kSecondary3, {(confAnalysis).pt, (confQa).cosPa}}, \
221+
{kSecondaryOther, {(confAnalysis).pt, (confQa).cosPa}},
217222

218223
template <typename T>
219224
auto makeCascadeHistSpecMap(const T& confBinningAnalysis)
@@ -253,6 +258,7 @@ std::map<CascadeHist, std::vector<o2::framework::AxisSpec>> makeCascadeMcQaHistS
253258
#undef CASCADE_HIST_QA_MAP
254259
#undef CASCADE_HIST_MC_QA_MAP
255260

261+
256262
constexpr char PrefixXiQa[] = "XiQA/";
257263
constexpr char PrefixXi[] = "Xi/";
258264
constexpr char PrefixOmegaQa[] = "OmegaQa/";
@@ -267,10 +273,10 @@ constexpr std::string_view McDir = "MC/";
267273
/// \class FemtoDreamEventHisto
268274
/// \brief Class for histogramming event properties
269275
// template <femtomodes::Mode mode>
270-
template <const char* cascadePrefix,
271-
const char* bachelorPrefix,
272-
const char* posDauPrefix,
273-
const char* negDauPrefix,
276+
template <auto& cascadePrefix,
277+
auto& bachelorPrefix,
278+
auto& posDauPrefix,
279+
auto& negDauPrefix,
274280
modes::Cascade cascade>
275281
class CascadeHistManager
276282
{

0 commit comments

Comments
 (0)