Skip to content

Commit f31a5c7

Browse files
vkuceravkucera
committed
Fix runtime/string
1 parent 6a4299d commit f31a5c7

11 files changed

Lines changed: 77 additions & 79 deletions

File tree

‎Common/CCDB/TriggerAliases.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <cstdint>
1717
#include <string>
1818

19-
std::string aliasLabels[kNaliases] = {
19+
const std::array<std::string, kNaliases> aliasLabels{
2020
"kINT7",
2121
"kEMC7",
2222
"kINT7inMUON",

‎Common/CCDB/TriggerAliases.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ enum triggerAliases {
5151
kNaliases
5252
};
5353

54-
extern std::string aliasLabels[kNaliases];
54+
extern const std::array<std::string, kNaliases> aliasLabels;
5555

5656
class TriggerAliases
5757
{

‎Common/Core/TrackSelection.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <Framework/DataTypes.h>
1919
#include <Framework/Logger.h>
2020

21+
#include <array>
2122
#include <cstdint>
2223
#include <functional>
2324
#include <set>
@@ -37,7 +38,7 @@ bool TrackSelection::FulfillsITSHitRequirements(uint8_t itsClusterMap) const
3738
return true;
3839
}
3940

40-
const std::string TrackSelection::mCutNames[static_cast<int>(TrackSelection::TrackCuts::kNCuts)] = {"TrackType", "PtRange", "EtaRange", "TPCNCls", "TPCCrossedRows", "TPCCrossedRowsOverNCls", "TPCChi2NDF", "TPCRefit", "ITSNCls", "ITSChi2NDF", "ITSRefit", "ITSHits", "GoldenChi2", "DCAxy", "DCAz", "TPCFracSharedCls"};
41+
const std::array<std::string, static_cast<int>(TrackSelection::TrackCuts::kNCuts)> TrackSelection::mCutNames{"TrackType", "PtRange", "EtaRange", "TPCNCls", "TPCCrossedRows", "TPCCrossedRowsOverNCls", "TPCChi2NDF", "TPCRefit", "ITSNCls", "ITSChi2NDF", "ITSRefit", "ITSHits", "GoldenChi2", "DCAxy", "DCAz", "TPCFracSharedCls"};
4142

4243
void TrackSelection::SetTrackType(o2::aod::track::TrackTypeEnum trackType)
4344
{
@@ -149,7 +150,7 @@ void TrackSelection::print() const
149150
for (int i = 0; i < static_cast<int>(TrackCuts::kNCuts); i++) {
150151
switch (static_cast<TrackCuts>(i)) {
151152
case TrackCuts::kTrackType:
152-
LOG(info) << mCutNames[i].data() << " == " << static_cast<int>(mTrackType);
153+
LOG(info) << mCutNames[i] << " == " << static_cast<int>(mTrackType);
153154
break;
154155
case TrackCuts::kPtRange:
155156
LOG(info) << mCutNames[i] << " in [" << mMinPt << ", " << mMaxPt << "]";

‎Common/Core/TrackSelection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class TrackSelection
6868
ppPass3
6969
};
7070

71-
static const std::string mCutNames[static_cast<int>(TrackCuts::kNCuts)];
71+
static const std::array<std::string, static_cast<int>(TrackCuts::kNCuts)> mCutNames;
7272

7373
// True for Run 2 track types. Hoisted out of the per-cut IsSelected() so that
7474
// the trackType() column is dereferenced once per track instead of once per cut.

‎PWGCF/MultiparticleCorrelations/Tasks/multiparticle-correlations-ar.cxx‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ enum CorEventDep {
8686
kCENDEP,
8787
kLAST_CorEventDep
8888
};
89-
const std::string CorEventDepNames[kLAST_CorEventDep] = {
89+
const std::array<std::string, kLAST_CorEventDep> CorEventDepNames{
9090
"[kINTEGRATED]",
9191
"[kMULDEP]",
9292
"[kCENDEP]"};
@@ -101,7 +101,7 @@ enum CorTrackDep {
101101
kETADEP,
102102
kLAST_CorTrackDep
103103
};
104-
const std::string CorTrackDepNames[kLAST_CorTrackDep] = {
104+
const std::array<std::string, kLAST_CorTrackDep> CorTrackDepNames{
105105
"[kPTDEP]",
106106
"[kETADEP]"};
107107
std::vector<std::vector<double>> CorTrackDepDefaultBins = {
@@ -121,7 +121,7 @@ enum EventVariable {
121121
kMULTPC,
122122
kLAST_EventVariable
123123
};
124-
static constexpr std::string_view EventVariableNames[kLAST_EventVariable] = {
124+
static constexpr std::array<std::string_view, kLAST_EventVariable> EventVariableNames{
125125
"EventVariable_VertexX",
126126
"EventVariable_VertexY",
127127
"EventVariable_VertexZ",
@@ -201,10 +201,10 @@ std::vector<std::array<float, kLAST_CUT>> TrackVariableDefaultCuts = {
201201
{0., 6., 1.}}; // kITSCLUSTERS
202202

203203
// common info string for all configurables
204-
const std::string BinningSuffix = std::string("-Binning");
205-
const std::string CutSuffix = std::string("-Cut");
206-
const std::string CorrelatorHistPrefix = std::string("CorDepBinning_");
207-
const std::vector<std::string> CutInfo = {std::string("Low"), std::string("High"), std::string("Option")};
204+
static constexpr std::string BinningSuffix{"-Binning"};
205+
static constexpr std::string CutSuffix{"-Cut"};
206+
static constexpr std::string CorrelatorHistPrefix{"CorDepBinning_"};
207+
static const std::vector<std::string> cutInfo{"Low", "High", "Option"};
208208

209209
const int MaxHarmonic = 10;
210210
const int MaxPower = 10;
@@ -259,71 +259,71 @@ struct MultiParticleCorrelationsARTask {
259259
""};
260260
Configurable<LabeledArray<float>> cfgEventCutVX{
261261
std::string(AR::EventVariableNames[AR::kVX]) + AR::CutSuffix,
262-
{AR::EventVariableDefaultCuts.at(AR::kVX).data(), 3, AR::CutInfo},
262+
{AR::EventVariableDefaultCuts.at(AR::kVX).data(), 3, AR::cutInfo},
263263
""};
264264
ConfigurableAxis cfgEventAxisVY{
265265
std::string(AR::EventVariableNames[AR::kVY]) + AR::BinningSuffix,
266266
std::move(AR::EventVariableDefaultBins.at(AR::kVY)),
267267
""};
268268
Configurable<LabeledArray<float>> cfgEventCutVY{
269269
std::string(AR::EventVariableNames[AR::kVY]) + AR::CutSuffix,
270-
{AR::EventVariableDefaultCuts.at(AR::kVY).data(), 3, AR::CutInfo},
270+
{AR::EventVariableDefaultCuts.at(AR::kVY).data(), 3, AR::cutInfo},
271271
""};
272272
ConfigurableAxis cfgEventAxisVZ{
273273
std::string(AR::EventVariableNames[AR::kVZ]) + AR::BinningSuffix,
274274
std::move(AR::EventVariableDefaultBins.at(AR::kVZ)),
275275
""};
276276
Configurable<LabeledArray<float>> cfgEventCutVZ{
277277
std::string(AR::EventVariableNames[AR::kVZ]) + AR::CutSuffix,
278-
{AR::EventVariableDefaultCuts.at(AR::kVZ).data(), 3, AR::CutInfo},
278+
{AR::EventVariableDefaultCuts.at(AR::kVZ).data(), 3, AR::cutInfo},
279279
""};
280280
ConfigurableAxis cfgEventAxisVABS{
281281
std::string(AR::EventVariableNames[AR::kVABS]) + AR::BinningSuffix,
282282
std::move(AR::EventVariableDefaultBins.at(AR::kVABS)),
283283
""};
284284
Configurable<LabeledArray<float>> cfgEventCutVABS{
285285
std::string(AR::EventVariableNames[AR::kVABS]) + AR::CutSuffix,
286-
{AR::EventVariableDefaultCuts.at(AR::kVABS).data(), 3, AR::CutInfo},
286+
{AR::EventVariableDefaultCuts.at(AR::kVABS).data(), 3, AR::cutInfo},
287287
""};
288288
ConfigurableAxis cfgEventAxisCEN{
289289
std::string(AR::EventVariableNames[AR::kCEN]) + AR::BinningSuffix,
290290
std::move(AR::EventVariableDefaultBins.at(AR::kCEN)),
291291
""};
292292
Configurable<LabeledArray<float>> cfgEventCutCEN{
293293
std::string(AR::EventVariableNames[AR::kCEN]) + AR::CutSuffix,
294-
{AR::EventVariableDefaultCuts.at(AR::kCEN).data(), 3, AR::CutInfo},
294+
{AR::EventVariableDefaultCuts.at(AR::kCEN).data(), 3, AR::cutInfo},
295295
""};
296296
ConfigurableAxis cfgEventAxisMULQ{
297297
std::string(AR::EventVariableNames[AR::kMULQ]) + AR::BinningSuffix,
298298
std::move(AR::EventVariableDefaultBins.at(AR::kMULQ)),
299299
""};
300300
Configurable<LabeledArray<float>> cfgEventCutMULQ{
301301
std::string(AR::EventVariableNames[AR::kMULQ]) + AR::CutSuffix,
302-
{AR::EventVariableDefaultCuts.at(AR::kMULQ).data(), 3, AR::CutInfo},
302+
{AR::EventVariableDefaultCuts.at(AR::kMULQ).data(), 3, AR::cutInfo},
303303
""};
304304
ConfigurableAxis cfgEventAxisMULW{
305305
std::string(AR::EventVariableNames[AR::kMULW]) + AR::BinningSuffix,
306306
std::move(AR::EventVariableDefaultBins.at(AR::kMULW)),
307307
""};
308308
Configurable<LabeledArray<float>> cfgEventCutMULW{
309309
std::string(AR::EventVariableNames[AR::kMULW]) + AR::CutSuffix,
310-
{AR::EventVariableDefaultCuts.at(AR::kMULW).data(), 3, AR::CutInfo},
310+
{AR::EventVariableDefaultCuts.at(AR::kMULW).data(), 3, AR::cutInfo},
311311
""};
312312
ConfigurableAxis cfgEventAxisMULNC{
313313
std::string(AR::EventVariableNames[AR::kMULNC]) + AR::BinningSuffix,
314314
std::move(AR::EventVariableDefaultBins.at(AR::kMULNC)),
315315
""};
316316
Configurable<LabeledArray<float>> cfgEventCutMULNC{
317317
std::string(AR::EventVariableNames[AR::kMULNC]) + AR::CutSuffix,
318-
{AR::EventVariableDefaultCuts.at(AR::kMULNC).data(), 3, AR::CutInfo},
318+
{AR::EventVariableDefaultCuts.at(AR::kMULNC).data(), 3, AR::cutInfo},
319319
""};
320320
ConfigurableAxis cfgEventAxisMULTPC{
321321
std::string(AR::EventVariableNames[AR::kMULTPC]) + AR::BinningSuffix,
322322
std::move(AR::EventVariableDefaultBins.at(AR::kMULTPC)),
323323
""};
324324
Configurable<LabeledArray<float>> cfgEventCutMULTPC{
325325
std::string(AR::EventVariableNames[AR::kMULTPC]) + AR::CutSuffix,
326-
{AR::EventVariableDefaultCuts.at(AR::kMULTPC).data(), 3, AR::CutInfo},
326+
{AR::EventVariableDefaultCuts.at(AR::kMULTPC).data(), 3, AR::cutInfo},
327327
""};
328328
std::vector<ConfigurableAxis> cfgEventBinning = {
329329
cfgEventAxisVX,
@@ -343,79 +343,79 @@ struct MultiParticleCorrelationsARTask {
343343
""};
344344
Configurable<LabeledArray<float>> cfgTrackCutPT{
345345
std::string(AR::TrackVariableNames[AR::kPT]) + AR::CutSuffix,
346-
{AR::TrackVariableDefaultCuts.at(AR::kPT).data(), 3, AR::CutInfo},
346+
{AR::TrackVariableDefaultCuts.at(AR::kPT).data(), 3, AR::cutInfo},
347347
""};
348348
ConfigurableAxis cfgTrackAxisPHI{
349349
std::string(AR::TrackVariableNames[AR::kPHI]) + AR::BinningSuffix,
350350
std::move(AR::TrackVariableDefaultBins.at(AR::kPHI)),
351351
""};
352352
Configurable<LabeledArray<float>> cfgTrackCutPHI{
353353
std::string(AR::TrackVariableNames[AR::kPHI]) + AR::CutSuffix,
354-
{AR::TrackVariableDefaultCuts.at(AR::kPHI).data(), 3, AR::CutInfo},
354+
{AR::TrackVariableDefaultCuts.at(AR::kPHI).data(), 3, AR::cutInfo},
355355
""};
356356
ConfigurableAxis cfgTrackAxisETA{
357357
std::string(AR::TrackVariableNames[AR::kETA]) + AR::BinningSuffix,
358358
std::move(AR::TrackVariableDefaultBins.at(AR::kETA)),
359359
""};
360360
Configurable<LabeledArray<float>> cfgTrackCutETA{
361361
std::string(AR::TrackVariableNames[AR::kETA]) + AR::CutSuffix,
362-
{AR::TrackVariableDefaultCuts.at(AR::kETA).data(), 3, AR::CutInfo},
362+
{AR::TrackVariableDefaultCuts.at(AR::kETA).data(), 3, AR::cutInfo},
363363
""};
364364
ConfigurableAxis cfgTrackAxisCHARGE{
365365
std::string(AR::TrackVariableNames[AR::kCHARGE]) + AR::BinningSuffix,
366366
std::move(AR::TrackVariableDefaultBins.at(AR::kCHARGE)),
367367
""};
368368
Configurable<LabeledArray<float>> cfgTrackCutCHARGE{
369369
std::string(AR::TrackVariableNames[AR::kCHARGE]) + AR::CutSuffix,
370-
{AR::TrackVariableDefaultCuts.at(AR::kCHARGE).data(), 3, AR::CutInfo},
370+
{AR::TrackVariableDefaultCuts.at(AR::kCHARGE).data(), 3, AR::cutInfo},
371371
""};
372372
ConfigurableAxis cfgTrackAxisDCAZ{
373373
std::string(AR::TrackVariableNames[AR::kDCAZ]) + AR::BinningSuffix,
374374
std::move(AR::TrackVariableDefaultBins.at(AR::kDCAZ)),
375375
""};
376376
Configurable<LabeledArray<float>> cfgTrackCutDCAZ{
377377
std::string(AR::TrackVariableNames[AR::kDCAZ]) + AR::CutSuffix,
378-
{AR::TrackVariableDefaultCuts.at(AR::kDCAZ).data(), 3, AR::CutInfo},
378+
{AR::TrackVariableDefaultCuts.at(AR::kDCAZ).data(), 3, AR::cutInfo},
379379
""};
380380
ConfigurableAxis cfgTrackAxisDCAXY{
381381
std::string(AR::TrackVariableNames[AR::kDCAXY]) + AR::BinningSuffix,
382382
std::move(AR::TrackVariableDefaultBins.at(AR::kDCAXY)),
383383
""};
384384
Configurable<LabeledArray<float>> cfgTrackCutDCAXY{
385385
std::string(AR::TrackVariableNames[AR::kDCAXY]) + AR::CutSuffix,
386-
{AR::TrackVariableDefaultCuts.at(AR::kDCAXY).data(), 3, AR::CutInfo},
386+
{AR::TrackVariableDefaultCuts.at(AR::kDCAXY).data(), 3, AR::cutInfo},
387387
""};
388388
ConfigurableAxis cfgTrackAxisTPCCLUSTERS{
389389
std::string(AR::TrackVariableNames[AR::kTPCCLUSTERS]) + AR::BinningSuffix,
390390
std::move(AR::TrackVariableDefaultBins.at(AR::kTPCCLUSTERS)),
391391
""};
392392
Configurable<LabeledArray<float>> cfgTrackCutTPCCLUSTERS{
393393
std::string(AR::TrackVariableNames[AR::kTPCCLUSTERS]) + AR::CutSuffix,
394-
{AR::TrackVariableDefaultCuts.at(AR::kTPCCLUSTERS).data(), 3, AR::CutInfo},
394+
{AR::TrackVariableDefaultCuts.at(AR::kTPCCLUSTERS).data(), 3, AR::cutInfo},
395395
""};
396396
ConfigurableAxis cfgTrackAxisTPCCROSSEDROWS{
397397
std::string(AR::TrackVariableNames[AR::kTPCCROSSEDROWS]) + AR::BinningSuffix,
398398
std::move(AR::TrackVariableDefaultBins.at(AR::kTPCCROSSEDROWS)),
399399
""};
400400
Configurable<LabeledArray<float>> cfgTrackCutTPCCROSSEDROWS{
401401
std::string(AR::TrackVariableNames[AR::kTPCCROSSEDROWS]) + AR::CutSuffix,
402-
{AR::TrackVariableDefaultCuts.at(AR::kTPCCROSSEDROWS).data(), 3, AR::CutInfo},
402+
{AR::TrackVariableDefaultCuts.at(AR::kTPCCROSSEDROWS).data(), 3, AR::cutInfo},
403403
""};
404404
ConfigurableAxis cfgTrackAxisTPCCHI2{
405405
std::string(AR::TrackVariableNames[AR::kTPCCHI2]) + AR::BinningSuffix,
406406
std::move(AR::TrackVariableDefaultBins.at(AR::kTPCCHI2)),
407407
""};
408408
Configurable<LabeledArray<float>> cfgTrackCutTPCCHI2{
409409
std::string(AR::TrackVariableNames[AR::kTPCCHI2]) + AR::CutSuffix,
410-
{AR::TrackVariableDefaultCuts.at(AR::kTPCCHI2).data(), 3, AR::CutInfo},
410+
{AR::TrackVariableDefaultCuts.at(AR::kTPCCHI2).data(), 3, AR::cutInfo},
411411
""};
412412
ConfigurableAxis cfgTrackAxisITSCLUSTERS{
413413
std::string(AR::TrackVariableNames[AR::kITSCLUSTERS]) + AR::BinningSuffix,
414414
std::move(AR::TrackVariableDefaultBins.at(AR::kITSCLUSTERS)),
415415
""};
416416
Configurable<LabeledArray<float>> cfgTrackCutITSCLUSTERS{
417417
std::string(AR::TrackVariableNames[AR::kITSCLUSTERS]) + AR::CutSuffix,
418-
{AR::TrackVariableDefaultCuts.at(AR::kITSCLUSTERS).data(), 3, AR::CutInfo},
418+
{AR::TrackVariableDefaultCuts.at(AR::kITSCLUSTERS).data(), 3, AR::cutInfo},
419419
""};
420420
std::vector<ConfigurableAxis> cfgTrackBinning = {
421421
cfgTrackAxisPT,

‎PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.cxx‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,19 +1188,18 @@ bool TrackSelectionBrick::FulfillsITSHitRequirements(uint8_t itsClusterMap)
11881188
return true;
11891189
}
11901190

1191-
const std::string TrackSelectionBrick::mCutNames[static_cast<int>(TrackSelectionBrick::TrackCuts::kNCuts)] =
1192-
{
1193-
"TrackType",
1194-
"TPCNCls",
1195-
"TPCCrossedRowsOverNCls",
1196-
"TPCRefit",
1197-
"ITSNCls",
1198-
"ITSChi2NDF",
1199-
"ITSRefit",
1200-
"ITSHits",
1201-
"GoldenChi2",
1202-
"DCAxy",
1203-
"DCAz"};
1191+
const std::array<std::string, static_cast<int>(TrackSelectionBrick::TrackCuts::kNCuts)> TrackSelectionBrick::mCutNames{
1192+
"TrackType",
1193+
"TPCNCls",
1194+
"TPCCrossedRowsOverNCls",
1195+
"TPCRefit",
1196+
"ITSNCls",
1197+
"ITSChi2NDF",
1198+
"ITSRefit",
1199+
"ITSHits",
1200+
"GoldenChi2",
1201+
"DCAxy",
1202+
"DCAz"};
12041203

12051204
/// \brief Returns wether the cut brick is incorporated in the selection chain
12061205
/// \return true if the cut brick is incorporated

‎PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ class TrackSelectionBrick : public SpecialCutBrick
530530
kNCuts
531531
};
532532

533-
static const std::string mCutNames[static_cast<int>(TrackCuts::kNCuts)];
533+
static const std::array<std::string, static_cast<int>(TrackSelectionBrick::TrackCuts::kNCuts)> mCutNames;
534534

535535
std::vector<bool> IsArmed() override;
536536
template <typename TrackToFilter>

‎PWGHF/D2H/TableProducer/mlBasedTrackSelector.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ struct HfTrackSelectorTagSelCollisions {
190190
}
191191

192192
// set numerical value of the Run 2 trigger class
193-
auto* const triggerAlias = std::find(aliasLabels, aliasLabels + kNaliases, triggerClassName.value.data());
194-
if (triggerAlias != aliasLabels + kNaliases) {
195-
hfEvSel.triggerClass.value = std::distance(aliasLabels, triggerAlias);
193+
auto* const triggerAlias = std::find(aliasLabels.begin(), aliasLabels.end(), triggerClassName.value.data());
194+
if (triggerAlias != aliasLabels.end()) {
195+
hfEvSel.triggerClass.value = std::distance(aliasLabels.begin(), triggerAlias);
196196
}
197197

198198
hfEvSel.init(registry, &zorroSummary); // collision monitoring

‎PWGHF/TableProducer/trackIndexSkimCreator.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ struct HfTrackIndexSkimCreatorTagSelCollisions {
174174
}
175175

176176
// set numerical value of the Run 2 trigger class
177-
auto* const triggerAlias = std::find(aliasLabels, aliasLabels + kNaliases, triggerClassName.value.data());
178-
if (triggerAlias != aliasLabels + kNaliases) {
179-
hfEvSel.triggerClass.value = std::distance(aliasLabels, triggerAlias);
177+
auto* const triggerAlias = std::find(aliasLabels.begin(), aliasLabels.end(), triggerClassName.value.data());
178+
if (triggerAlias != aliasLabels.end()) {
179+
hfEvSel.triggerClass.value = std::distance(aliasLabels.begin(), triggerAlias);
180180
}
181181

182182
hfEvSel.init(registry, &zorroSummary); // collision monitoring

0 commit comments

Comments
 (0)