Skip to content

Commit 7aadc8d

Browse files
mcoquet642mcoquet642
committed
Fixing MegaLinter
1 parent 7d4ed54 commit 7aadc8d

3 files changed

Lines changed: 70 additions & 77 deletions

File tree

‎PWGDQ/Tasks/dqEfficiency.cxx‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ struct AnalysisEventSelection {
103103
Configurable<std::string> fConfigEventCuts{"cfgEventCuts", "eventStandard", "Event selection"};
104104
Configurable<bool> fConfigQA{"cfgQA", false, "If true, fill QA histograms"};
105105

106-
HistogramManager* fHistMan;
107-
AnalysisCompositeCut* fEventCut;
106+
HistogramManager* fHistMan = nullptr;
107+
AnalysisCompositeCut* fEventCut = nullptr;
108108

109109
void init(o2::framework::InitContext& context)
110110
{
@@ -174,7 +174,7 @@ struct AnalysisTrackSelection {
174174
Configurable<std::string> fConfigMCSignals{"cfgTrackMCSignals", "", "Comma separated list of MC signals"};
175175
Configurable<bool> fConfigQA{"cfgQA", false, "If true, fill QA histograms"};
176176

177-
HistogramManager* fHistMan;
177+
HistogramManager* fHistMan = nullptr;
178178
std::vector<AnalysisCompositeCut> fTrackCuts;
179179
std::vector<MCSignal> fMCSignals; // list of signals to be checked
180180
std::vector<TString> fHistNamesReco;
@@ -305,13 +305,13 @@ struct AnalysisTrackSelection {
305305
}
306306

307307
// fill histograms
308-
for (unsigned int i = 0; i < fMCSignals.size(); i++) {
309-
if (!(mcDecision & (static_cast<uint32_t>(1) << i))) {
308+
for (unsigned int iMC = 0; iMC < fMCSignals.size(); iMC++) {
309+
if (!(mcDecision & (static_cast<uint32_t>(1) << iMC))) {
310310
continue;
311311
}
312312
for (unsigned int j = 0; j < fTrackCuts.size(); j++) {
313313
if (filterMap & (uint8_t(1) << j)) {
314-
fHistMan->FillHistClass(fHistNamesMCMatched[j][i].Data(), VarManager::fgValues);
314+
fHistMan->FillHistClass(fHistNamesMCMatched[j][iMC].Data(), VarManager::fgValues);
315315
}
316316
} // end loop over cuts
317317
} // end loop over MC signals
@@ -343,7 +343,7 @@ struct AnalysisMuonSelection {
343343
Configurable<std::string> fConfigMCSignals{"cfgMuonMCSignals", "", "Comma separated list of MC signals"};
344344
Configurable<bool> fConfigQA{"cfgQA", false, "If true, fill QA histograms"};
345345

346-
HistogramManager* fHistMan;
346+
HistogramManager* fHistMan = nullptr;
347347
std::vector<AnalysisCompositeCut> fTrackCuts;
348348
std::vector<MCSignal> fMCSignals; // list of signals to be checked
349349
std::vector<TString> fHistNamesReco;
@@ -478,13 +478,13 @@ struct AnalysisMuonSelection {
478478
}
479479

480480
// fill histograms
481-
for (unsigned int i = 0; i < fMCSignals.size(); i++) {
482-
if (!(mcDecision & (static_cast<uint32_t>(1) << i))) {
481+
for (unsigned int iMC = 0; iMC < fMCSignals.size(); iMC++) {
482+
if (!(mcDecision & (static_cast<uint32_t>(1) << iMC))) {
483483
continue;
484484
}
485485
for (unsigned int j = 0; j < fTrackCuts.size(); j++) {
486486
if (filterMap & (uint8_t(1) << j)) {
487-
fHistMan->FillHistClass(fHistNamesMCMatched[j][i].Data(), VarManager::fgValues);
487+
fHistMan->FillHistClass(fHistNamesMCMatched[j][iMC].Data(), VarManager::fgValues);
488488
}
489489
} // end loop over cuts
490490
} // end loop over MC signals
@@ -516,7 +516,7 @@ struct AnalysisSameEventPairing {
516516
float mMagField = 0.0;
517517
o2::parameters::GRPMagField* grpmag = nullptr;
518518
o2::base::MatLayerCylSet* lut = nullptr;
519-
int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
519+
int fCurrentRun = -1; // needed to detect if the run changed and trigger update of calibrations etc.
520520

521521
OutputObj<THashList> fOutputList{"output"};
522522
Filter filterEventSelected = aod::dqanalysisflags::isEventSelected == 1;
@@ -546,7 +546,7 @@ struct AnalysisSameEventPairing {
546546
// TODO: special AnalysisCuts to be prepared in this direction
547547
// TODO: cuts on the MC truth information to be added if needed
548548

549-
HistogramManager* fHistMan;
549+
HistogramManager* fHistMan = nullptr;
550550
std::vector<std::vector<TString>> fBarrelHistNames;
551551
std::vector<std::vector<TString>> fBarrelHistNamesMCmatched;
552552
std::vector<std::vector<TString>> fMuonHistNames;
@@ -816,7 +816,7 @@ struct AnalysisSameEventPairing {
816816

817817
dileptonFilterMap = twoTrackFilter;
818818
dileptonMcDecision = mcDecision;
819-
if (!fConfigSkimSignalOnly || (fConfigSkimSignalOnly && mcDecision > 0)) {
819+
if (!fConfigSkimSignalOnly || mcDecision > 0) {
820820
if constexpr (TPairType == VarManager::kDecayToEE) {
821821
dielectronList(event, VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi], t1.sign() + t2.sign(), dileptonFilterMap, dileptonMcDecision);
822822
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedTrackCollInfo) > 0) {
@@ -882,11 +882,11 @@ struct AnalysisSameEventPairing {
882882
if (fConfigAmbiguousHist && !(t1.isAmbiguous() || t2.isAmbiguous())) {
883883
fHistMan->FillHistClass(Form("%s_unambiguous", histNames[icut][0].Data()), VarManager::fgValues);
884884
}
885-
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) {
886-
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
887-
fHistMan->FillHistClass(histNamesMCmatched[icut][isig].Data(), VarManager::fgValues);
885+
for (unsigned int iSig = 0; iSig < fRecMCSignals.size(); iSig++) {
886+
if (mcDecision & (static_cast<uint32_t>(1) << iSig)) {
887+
fHistMan->FillHistClass(histNamesMCmatched[icut][iSig].Data(), VarManager::fgValues);
888888
if (fConfigAmbiguousHist && !(t1.isAmbiguous() || t2.isAmbiguous())) {
889-
fHistMan->FillHistClass(Form("%s_unambiguous", histNamesMCmatched[icut][isig].Data()), VarManager::fgValues);
889+
fHistMan->FillHistClass(Form("%s_unambiguous", histNamesMCmatched[icut][iSig].Data()), VarManager::fgValues);
890890
}
891891
}
892892
}
@@ -1071,12 +1071,10 @@ struct AnalysisDileptonTrack {
10711071
constexpr static uint32_t fgDileptonFillMap = VarManager::ObjTypes::ReducedTrack | VarManager::ObjTypes::Pair; // fill map
10721072

10731073
// use two values array to avoid mixing up the quantities
1074-
float* fValuesDilepton;
1075-
float* fValuesTrack;
1076-
HistogramManager* fHistMan;
1074+
float* fValuesDilepton = nullptr;
1075+
float* fValuesTrack = nullptr;
1076+
HistogramManager* fHistMan = nullptr;
10771077

1078-
std::vector<std::vector<TString>> fMuonHistNames;
1079-
std::vector<std::vector<TString>> fMuonHistNamesMCmatched;
10801078
std::vector<TString> fRecMCSignalsNames;
10811079

10821080
std::vector<MCSignal> fRecMCSignals;
@@ -1085,7 +1083,7 @@ struct AnalysisDileptonTrack {
10851083
// NOTE: the barrel track filter is shared between the filters for dilepton electron candidates (first n-bits)
10861084
// and the associated hadrons (n+1 bit) --> see the barrel track selection task
10871085
// The current condition should be replaced when bitwise operators will become available in Filter expressions
1088-
int fNHadronCutBit;
1086+
int fNHadronCutBit = 0;
10891087

10901088
void init(o2::framework::InitContext& context)
10911089
{
@@ -1242,9 +1240,9 @@ struct AnalysisDileptonTrack {
12421240
}
12431241
} // end loop over MC signals
12441242

1245-
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) {
1246-
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
1247-
fHistMan->FillHistClass(Form("DileptonsSelected_matchedMC_%s", fRecMCSignalsNames[isig].Data()), fValuesDilepton);
1243+
for (unsigned int iSig = 0; iSig < fRecMCSignals.size(); iSig++) {
1244+
if (mcDecision & (static_cast<uint32_t>(1) << iSig)) {
1245+
fHistMan->FillHistClass(Form("DileptonsSelected_matchedMC_%s", fRecMCSignalsNames[iSig].Data()), fValuesDilepton);
12481246
}
12491247
}
12501248

@@ -1267,7 +1265,7 @@ struct AnalysisDileptonTrack {
12671265
mcDecision = 0;
12681266
isig = 0;
12691267
for (auto sig = fRecMCSignals.begin(); sig != fRecMCSignals.end(); sig++, isig++) {
1270-
if constexpr (TTrackFillMap & VarManager::ObjTypes::ReducedTrack || TTrackFillMap & VarManager::ObjTypes::ReducedMuon || TTrackFillMap & VarManager::ObjTypes::ReducedMuon) { // for skimmed DQ model
1268+
if constexpr (TTrackFillMap & VarManager::ObjTypes::ReducedTrack || TTrackFillMap & VarManager::ObjTypes::ReducedMuon) { // for skimmed DQ model
12711269
if ((*sig).CheckSignal(false, lepton1MC, lepton2MC, trackMC)) {
12721270
mcDecision |= (static_cast<uint32_t>(1) << isig);
12731271
}
@@ -1278,9 +1276,9 @@ struct AnalysisDileptonTrack {
12781276
dileptontrackcandidatesList(mcDecision, fValuesTrack[VarManager::kPairMass], fValuesTrack[VarManager::kPairPt], fValuesTrack[VarManager::kPairEta], fValuesTrack[VarManager::kVertexingTauz], fValuesTrack[VarManager::kVertexingTauxy], fValuesTrack[VarManager::kVertexingLz], fValuesTrack[VarManager::kVertexingLxy]);
12791277
}
12801278

1281-
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) {
1282-
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
1283-
fHistMan->FillHistClass(Form("DileptonTrackInvMass_matchedMC_%s", fRecMCSignalsNames[isig].Data()), fValuesTrack);
1279+
for (unsigned int iSig = 0; iSig < fRecMCSignals.size(); iSig++) {
1280+
if (mcDecision & (static_cast<uint32_t>(1) << iSig)) {
1281+
fHistMan->FillHistClass(Form("DileptonTrackInvMass_matchedMC_%s", fRecMCSignalsNames[iSig].Data()), fValuesTrack);
12841282
}
12851283
}
12861284
}
@@ -1357,7 +1355,7 @@ struct AnalysisDileptonTrackTrack {
13571355
Configurable<bool> fConfigUseDCAVertexing{"cfgUseDCAVertexing", false, "Use DCA for secondary vertex reconstruction (DCAFitter is used by default)"};
13581356

13591357
Produces<aod::DileptonTrackTrackCandidates> DileptonTrackTrackTable;
1360-
HistogramManager* fHistMan;
1358+
HistogramManager* fHistMan = nullptr;
13611359

13621360
std::vector<TString> fRecMCSignalsNames;
13631361
std::vector<MCSignal> fRecMCSignals;
@@ -1368,7 +1366,7 @@ struct AnalysisDileptonTrackTrack {
13681366
Filter dileptonFilter = aod::reducedpair::sign == 0;
13691367
Filter filterBarrelTrackSelected = aod::dqanalysisflags::isBarrelSelected > 0;
13701368

1371-
float* fValuesQuadruplet;
1369+
float* fValuesQuadruplet = nullptr;
13721370

13731371
std::vector<TString> fQuadrupletCutNames;
13741372
AnalysisCompositeCut fDileptonCut;
@@ -1585,9 +1583,9 @@ struct AnalysisDileptonTrackTrack {
15851583
mcDecision |= (static_cast<uint32_t>(1) << isig);
15861584
}
15871585
}
1588-
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) {
1589-
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
1590-
fHistMan->FillHistClass(Form("MCTruthRecQuad_%s_%s", fQuadrupletCutNames[iCut].Data(), fRecMCSignalsNames[isig].Data()), fValuesQuadruplet);
1586+
for (unsigned int iSig = 0; iSig < fRecMCSignals.size(); iSig++) {
1587+
if (mcDecision & (static_cast<uint32_t>(1) << iSig)) {
1588+
fHistMan->FillHistClass(Form("MCTruthRecQuad_%s_%s", fQuadrupletCutNames[iCut].Data(), fRecMCSignalsNames[iSig].Data()), fValuesQuadruplet);
15911589
}
15921590
}
15931591
}

‎PWGDQ/Tasks/tableReader.cxx‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ struct AnalysisEventSelection {
177177

178178
HistogramManager* fHistMan = nullptr;
179179
MixingHandler* fMixHandler = nullptr;
180-
AnalysisCompositeCut* fEventCut;
181-
int fLastRun;
180+
AnalysisCompositeCut* fEventCut = nullptr;
181+
int fLastRun = -1;
182182

183183
Service<o2::ccdb::BasicCCDBManager> fCCDB;
184184

@@ -349,10 +349,10 @@ struct AnalysisTrackSelection {
349349

350350
Service<o2::ccdb::BasicCCDBManager> fCCDB;
351351

352-
HistogramManager* fHistMan;
352+
HistogramManager* fHistMan = nullptr;
353353
std::vector<AnalysisCompositeCut> fTrackCuts;
354354

355-
int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
355+
int fCurrentRun = 0; // needed to detect if the run changed and trigger update of calibrations etc.
356356

357357
int64_t reserveSize = 0;
358358

@@ -479,7 +479,7 @@ struct AnalysisMuonSelection {
479479
Configurable<bool> fConfigQA{"cfgQA", false, "If true, fill QA histograms"};
480480
Configurable<std::string> fConfigAddMuonHistogram{"cfgAddMuonHistogram", "", "Comma separated list of histograms"};
481481

482-
HistogramManager* fHistMan;
482+
HistogramManager* fHistMan = nullptr;
483483
std::vector<AnalysisCompositeCut> fMuonCuts;
484484

485485
Filter filterEventSelected = aod::dqanalysisflags::isEventSelected == 1;
@@ -602,14 +602,14 @@ struct AnalysisPrefilterSelection {
602602
Service<o2::ccdb::BasicCCDBManager> ccdb;
603603

604604
o2::parameters::GRPMagField* grpmag = nullptr;
605-
int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
605+
int fCurrentRun = 0; // needed to detect if the run changed and trigger update of calibrations etc.
606606

607607
Filter barrelTracksSelectedPrefilter = aod::dqanalysisflags::isBarrelSelectedPrefilter > 0;
608608

609609
Partition<soa::Filtered<MyBarrelTracksSelected>> barrelTracksSelected = aod::dqanalysisflags::isBarrelSelected > 0;
610610

611611
std::map<int, bool> fPrefiltermap;
612-
AnalysisCompositeCut* fPairCut;
612+
AnalysisCompositeCut* fPairCut = nullptr;
613613

614614
void init(o2::framework::InitContext& context)
615615
{
@@ -719,13 +719,13 @@ struct AnalysisEventMixing {
719719
TH2D* SingleMuv24m = nullptr; // Single muon v24, loaded from CCDB
720720
TH2D* SingleMuv22p = nullptr; // Single antimuon v22, loaded from CCDB
721721
TH2D* SingleMuv24p = nullptr; // Single antimuon v24, loaded from CCDB
722-
int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
722+
int fCurrentRun = 0; // needed to detect if the run changed and trigger update of calibrations etc.
723723

724724
Filter filterEventSelected = aod::dqanalysisflags::isEventSelected == 1;
725725
Filter filterTrackSelected = aod::dqanalysisflags::isBarrelSelected > 0;
726726
Filter filterMuonTrackSelected = aod::dqanalysisflags::isMuonSelected > 0;
727727

728-
HistogramManager* fHistMan;
728+
HistogramManager* fHistMan = nullptr;
729729
// NOTE: The bit mask is required to run pairing just based on the desired electron/muon candidate cuts
730730
uint32_t fTwoTrackFilterMask = 0;
731731
uint32_t fTwoMuonFilterMask = 0;
@@ -1046,7 +1046,7 @@ struct AnalysisSameEventPairing {
10461046
o2::base::MatLayerCylSet* lut = nullptr;
10471047
TH1D* ResoFlowSP = nullptr; // Resolution factors for flow analysis, this will be loaded from CCDB
10481048
TH1D* ResoFlowEP = nullptr; // Resolution factors for flow analysis, this will be loaded from CCDB
1049-
int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
1049+
int fCurrentRun = 0; // needed to detect if the run changed and trigger update of calibrations etc.
10501050

10511051
OutputObj<THashList> fOutputList{"output"};
10521052
Configurable<std::string> fConfigTrackCuts{"cfgTrackCuts", "jpsiO2MCdebugCuts2", "Comma separated list of barrel track cuts"};
@@ -1097,7 +1097,7 @@ struct AnalysisSameEventPairing {
10971097
Filter filterMuonTrackSelected = aod::dqanalysisflags::isMuonSelected > 0;
10981098
Filter prefilter = aod::dqanalysisflags::isPrefilterVetoed == 0;
10991099

1100-
HistogramManager* fHistMan;
1100+
HistogramManager* fHistMan = nullptr;
11011101

11021102
o2::analysis::DQMlResponse<float> fDQMlResponse;
11031103
std::vector<float> fOutputMlPsi2ee = {}; // TODO: check this is needed or not
@@ -1217,7 +1217,6 @@ struct AnalysisSameEventPairing {
12171217
histNames += Form("%s;%s;%s;", names[0].Data(), names[1].Data(), names[2].Data());
12181218
fTrackHistNames.push_back(names);
12191219

1220-
TString cutNamesStr = fConfigPairCuts.value;
12211220
if (!cutNamesStr.IsNull()) { // if pair cuts
12221221
std::unique_ptr<TObjArray> objArrayPair(cutNamesStr.Tokenize(","));
12231222
for (int iPairCut = 0; iPairCut < objArrayPair->GetEntries(); ++iPairCut) { // loop over pair cuts
@@ -1255,7 +1254,6 @@ struct AnalysisSameEventPairing {
12551254
}
12561255
fMuonHistNames.push_back(names);
12571256

1258-
TString cutNamesStr = fConfigPairCuts.value;
12591257
if (!cutNamesStr.IsNull()) { // if pair cuts
12601258
std::unique_ptr<TObjArray> objArrayPair(cutNamesStr.Tokenize(","));
12611259
for (int iPairCut = 0; iPairCut < objArrayPair->GetEntries(); ++iPairCut) { // loop over pair cuts
@@ -1288,11 +1286,10 @@ struct AnalysisSameEventPairing {
12881286
histNames += Form("%s;%s;%s;", names[0].Data(), names[1].Data(), names[2].Data());
12891287
fTrackMuonHistNames.push_back(names);
12901288

1291-
TString cutNamesStr = fConfigPairCuts.value;
12921289
if (!cutNamesStr.IsNull()) { // if pair cuts
12931290
std::unique_ptr<TObjArray> objArrayPair(cutNamesStr.Tokenize(","));
12941291
for (int iPairCut = 0; iPairCut < objArrayPair->GetEntries(); ++iPairCut) { // loop over pair cuts
1295-
std::vector<TString> names = {
1292+
names = {
12961293
Form("PairsEleMuSEPM_%s_%s_%s", objArrayBarrel->At(icut)->GetName(), objArrayMuon->At(icut)->GetName(), objArrayPair->At(iPairCut)->GetName()),
12971294
Form("PairsEleMuSEPP_%s_%s_%s", objArrayBarrel->At(icut)->GetName(), objArrayMuon->At(icut)->GetName(), objArrayPair->At(iPairCut)->GetName()),
12981295
Form("PairsEleMuSEMM_%s_%s_%s", objArrayBarrel->At(icut)->GetName(), objArrayMuon->At(icut)->GetName(), objArrayPair->At(iPairCut)->GetName())};
@@ -1876,7 +1873,7 @@ struct AnalysisDileptonHadron {
18761873
// To be modified/adapted if new requirements appear
18771874
float mMagField = 0.0;
18781875
o2::parameters::GRPMagField* grpmag = nullptr;
1879-
int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc.
1876+
int fCurrentRun = 0; // needed to detect if the run changed and trigger update of calibrations etc.
18801877

18811878
OutputObj<THashList> fOutputList{"output"};
18821879
// TODO: For now this is only used to determine the position in the filter bit map for the hadron cut
@@ -1902,14 +1899,14 @@ struct AnalysisDileptonHadron {
19021899
constexpr static uint32_t fgDileptonFillMap = VarManager::ObjTypes::ReducedTrack | VarManager::ObjTypes::Pair; // fill map
19031900

19041901
// use two values array to avoid mixing up the quantities
1905-
float* fValuesDilepton;
1906-
float* fValuesHadron;
1907-
HistogramManager* fHistMan;
1902+
float* fValuesDilepton = nullptr;
1903+
float* fValuesHadron = nullptr;
1904+
HistogramManager* fHistMan = nullptr;
19081905

19091906
// NOTE: the barrel track filter is shared between the filters for dilepton electron candidates (first n-bits)
19101907
// and the associated hadrons (n+1 bit) --> see the barrel track selection task
19111908
// The current condition should be replaced when bitwise operators will become available in Filter expressions
1912-
int fNHadronCutBit;
1909+
int fNHadronCutBit = 0;
19131910

19141911
NoBinningPolicy<aod::dqanalysisflags::MixingHash> hashBin;
19151912

@@ -2113,8 +2110,8 @@ struct AnalysisDileptonTrackTrack {
21132110
constexpr static uint32_t fgDileptonFillMap = VarManager::ObjTypes::ReducedTrack | VarManager::ObjTypes::Pair; // fill map
21142111

21152112
// use some values array to avoid mixing up the quantities
2116-
float* fValuesQuadruplet;
2117-
HistogramManager* fHistMan;
2113+
float* fValuesQuadruplet = nullptr;
2114+
HistogramManager* fHistMan = nullptr;
21182115

21192116
// cut name setting
21202117
TString fTrackCutName1;

0 commit comments

Comments
 (0)