Skip to content

Commit fad8470

Browse files
axti98axti98
committed
Fix MegaLinter errors
1 parent 83c811b commit fad8470

2 files changed

Lines changed: 37 additions & 38 deletions

File tree

‎ALICE3/TableProducer/alice3-dq-table-maker.cxx‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct Alice3DQTableMaker {
9494
OutputObj<THashList> fOutputList{"output"};
9595
OutputObj<TList> fStatsList{"Statistics"}; //! skimming statistics
9696

97-
HistogramManager* fHistMan;
97+
HistogramManager* fHistMan = nullptr;
9898

9999
// Event and track AnalysisCut configurables
100100
struct : ConfigurableGroup {
@@ -118,9 +118,8 @@ struct Alice3DQTableMaker {
118118
Configurable<std::string> fConfigAddJSONHistograms{"cfgAddJSONHistograms", "", "Histograms in JSON format"};
119119
} fConfigHistOutput;
120120

121-
AnalysisCompositeCut* fEventCut; //! Event selection cut
121+
AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
122122
std::vector<AnalysisCompositeCut*> fTrackCuts; //! Barrel track cuts
123-
std::vector<AnalysisCompositeCut*> fMuonCuts; //! Muon track cuts
124123

125124
bool fDoDetailedQA = false;
126125

@@ -288,38 +287,38 @@ struct Alice3DQTableMaker {
288287
}
289288
}
290289

291-
// create statistics histograms (event, tracks, muons, MCsignals)
290+
// create statistics histograms (event, tracks, MCsignals)
292291
fStatsList.setObject(new TList());
293292
fStatsList->SetOwner(true);
294293
std::vector<TString> eventLabels{"Collisions before filtering", "Before cuts", "After cuts"};
295294
TH2I* histEvents = new TH2I("EventStats", "Event statistics", eventLabels.size(), -0.5, eventLabels.size() - 0.5, o2::aod::evsel::kNsel + 1, -0.5, (float)o2::aod::evsel::kNsel + 0.5);
296-
int ib = 1;
297-
for (auto label = eventLabels.begin(); label != eventLabels.end(); label++, ib++) {
298-
histEvents->GetXaxis()->SetBinLabel(ib, (*label).Data());
295+
int ibX = 1;
296+
for (auto label = eventLabels.begin(); label != eventLabels.end(); label++, ibX++) {
297+
histEvents->GetXaxis()->SetBinLabel(ibX, (*label).Data());
299298
}
300-
for (int ib = 1; ib <= o2::aod::evsel::kNsel; ib++) {
301-
histEvents->GetYaxis()->SetBinLabel(ib, o2::aod::evsel::selectionLabels[ib - 1]);
299+
for (int ibY = 1; ibY <= o2::aod::evsel::kNsel; ibY++) {
300+
histEvents->GetYaxis()->SetBinLabel(ibY, o2::aod::evsel::selectionLabels[ibY - 1]);
302301
}
303302
histEvents->GetYaxis()->SetBinLabel(o2::aod::evsel::kNsel + 1, "Total");
304303
fStatsList->Add(histEvents);
305304

306305
// Track statistics: one bin for each track selection and 5 bins for V0 tags (gamma, K0s, Lambda, anti-Lambda, Omega)
307306
TH1I* histTracks = new TH1I("TrackStats", "Track statistics", fTrackCuts.size() + 5.0, -0.5, fTrackCuts.size() - 0.5 + 5.0);
308-
ib = 1;
309-
for (auto cut = fTrackCuts.begin(); cut != fTrackCuts.end(); cut++, ib++) {
310-
histTracks->GetXaxis()->SetBinLabel(ib, (*cut)->GetName());
307+
ibX = 1;
308+
for (auto cut = fTrackCuts.begin(); cut != fTrackCuts.end(); cut++, ibX++) {
309+
histTracks->GetXaxis()->SetBinLabel(ibX, (*cut)->GetName());
311310
}
312311
constexpr int nV0Tags = 5;
313312
const char* v0TagNames[nV0Tags] = {"Photon conversion", "K^{0}_{s}", "#Lambda", "#bar{#Lambda}", "#Omega"};
314-
for (int ib = 0; ib < nV0Tags; ib++) {
315-
histTracks->GetXaxis()->SetBinLabel(fTrackCuts.size() + 1 + ib, v0TagNames[ib]);
313+
for (int ibY = 0; ibY < nV0Tags; ibY++) {
314+
histTracks->GetXaxis()->SetBinLabel(fTrackCuts.size() + 1 + ibY, v0TagNames[ibY]);
316315
}
317316
fStatsList->Add(histTracks);
318317

319318
TH1I* histMCsignals = new TH1I("MCsignals", "MC signals", fMCSignals.size() + 1, -0.5, fMCSignals.size() - 0.5 + 1.0);
320-
ib = 1;
321-
for (auto signal = fMCSignals.begin(); signal != fMCSignals.end(); signal++, ib++) {
322-
histMCsignals->GetXaxis()->SetBinLabel(ib, (*signal)->GetName());
319+
ibX = 1;
320+
for (auto signal = fMCSignals.begin(); signal != fMCSignals.end(); signal++, ibX++) {
321+
histMCsignals->GetXaxis()->SetBinLabel(ibX, (*signal)->GetName());
323322
}
324323
histMCsignals->GetXaxis()->SetBinLabel(fMCSignals.size() + 1, "Others (matched to reco tracks)");
325324
fStatsList->Add(histMCsignals);
@@ -481,14 +480,14 @@ struct Alice3DQTableMaker {
481480
fHistMan->FillHistClass("TrackBarrel_BeforeCuts", VarManager::fgValues);
482481
}
483482

484-
int i = 0;
485-
for (auto cut = fTrackCuts.begin(); cut != fTrackCuts.end(); cut++, i++) {
483+
int n = 0;
484+
for (auto cut = fTrackCuts.begin(); cut != fTrackCuts.end(); cut++, n++) {
486485
if ((*cut)->IsSelected(VarManager::fgValues)) {
487-
trackTempFilterMap |= (static_cast<uint32_t>(1) << i);
486+
trackTempFilterMap |= (static_cast<uint32_t>(1) << n);
488487
if (fConfigHistOutput.fConfigQA) {
489488
fHistMan->FillHistClass(Form("TrackBarrel_%s", (*cut)->GetName()), VarManager::fgValues);
490489
}
491-
(reinterpret_cast<TH1I*>(fStatsList->At(1)))->Fill(static_cast<float>(i));
490+
(reinterpret_cast<TH1I*>(fStatsList->At(1)))->Fill(static_cast<float>(n));
492491
}
493492
}
494493
if (!trackTempFilterMap) {

‎ALICE3/Tasks/alice3-dq-efficiency.cxx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,9 @@ struct AnalysisSameEventPairing {
809809

810810
// Keep track of all the histogram class names to avoid composing strings in the pairing loop
811811
TString histNames = "";
812-
TString cutNamesStr = fConfigCuts.pair.value;
813-
if (!cutNamesStr.IsNull()) {
814-
std::unique_ptr<TObjArray> objArray(cutNamesStr.Tokenize(","));
812+
TString pairCutNamesStr = fConfigCuts.pair.value;
813+
if (!pairCutNamesStr.IsNull()) {
814+
std::unique_ptr<TObjArray> objArray(pairCutNamesStr.Tokenize(","));
815815
for (int icut = 0; icut < objArray->GetEntries(); ++icut) {
816816
fPairCuts.push_back(*dqcuts::GetCompositeCut(objArray->At(icut)->GetName()));
817817
}
@@ -1598,9 +1598,9 @@ struct AnalysisAsymmetricPairing {
15981598
fLegCFilterMask = fConfigLegCFilterMask.value;
15991599

16001600
// Get the pair cuts
1601-
TString cutNamesStr = fConfigPairCuts.value;
1602-
if (!cutNamesStr.IsNull()) {
1603-
std::unique_ptr<TObjArray> objArray(cutNamesStr.Tokenize(","));
1601+
TString pairCutNamesStr = fConfigPairCuts.value;
1602+
if (!pairCutNamesStr.IsNull()) {
1603+
std::unique_ptr<TObjArray> objArray(pairCutNamesStr.Tokenize(","));
16041604
for (int icut = 0; icut < objArray->GetEntries(); ++icut) {
16051605
fPairCuts.push_back(dqcuts::GetCompositeCut(objArray->At(icut)->GetName()));
16061606
}
@@ -1611,10 +1611,10 @@ struct AnalysisAsymmetricPairing {
16111611
std::vector<AnalysisCut*> addPairCuts = dqcuts::GetCutsFromJSON(addPairCutsStr.Data());
16121612
for (const auto& t : addPairCuts) {
16131613
fPairCuts.push_back(static_cast<AnalysisCompositeCut*>(t));
1614-
cutNamesStr += Form(",%s", t->GetName());
1614+
pairCutNamesStr += Form(",%s", t->GetName());
16151615
}
16161616
}
1617-
std::unique_ptr<TObjArray> objArrayPairCuts(cutNamesStr.Tokenize(","));
1617+
std::unique_ptr<TObjArray> objArrayPairCuts(pairCutNamesStr.Tokenize(","));
16181618
fNPairCuts = objArrayPairCuts->GetEntries();
16191619
for (int j = 0; j < fNPairCuts; j++) {
16201620
fPairCutNames.push_back(objArrayPairCuts->At(j)->GetName());
@@ -1757,9 +1757,9 @@ struct AnalysisAsymmetricPairing {
17571757
DefineHistograms(fHistMan, Form("TripletsBarrelSE_%s_%s", legsStr.Data(), objArrayCommon->At(iCommonCut)->GetName()), fConfigHistogramSubgroups.value.data());
17581758
}
17591759

1760-
TString cutNamesStr = fConfigPairCuts.value;
1761-
if (!cutNamesStr.IsNull()) { // if pair cuts
1762-
std::unique_ptr<TObjArray> objArrayPair(cutNamesStr.Tokenize(","));
1760+
TString pairCutNamesStr = fConfigPairCuts.value;
1761+
if (!pairCutNamesStr.IsNull()) { // if pair cuts
1762+
std::unique_ptr<TObjArray> objArrayPair(pairCutNamesStr.Tokenize(","));
17631763
fNPairCuts = objArrayPair->GetEntries();
17641764
for (int iPairCut = 0; iPairCut < fNPairCuts; ++iPairCut) { // loop over pair cuts
17651765
DefineHistograms(fHistMan, Form("TripletsBarrelSE_%s_%s", legsStr.Data(), objArrayPair->At(iPairCut)->GetName()), fConfigHistogramSubgroups.value.data());
@@ -1779,8 +1779,8 @@ struct AnalysisAsymmetricPairing {
17791779
DefineHistograms(fHistMan, Form("TripletsBarrelSE_%s_%s_%s", legsStr.Data(), objArrayCommon->At(iCommonCut)->GetName(), sig->GetName()), fConfigHistogramSubgroups.value.data());
17801780
}
17811781

1782-
if (!cutNamesStr.IsNull()) { // if pair cuts
1783-
std::unique_ptr<TObjArray> objArrayPair(cutNamesStr.Tokenize(","));
1782+
if (!pairCutNamesStr.IsNull()) { // if pair cuts
1783+
std::unique_ptr<TObjArray> objArrayPair(pairCutNamesStr.Tokenize(","));
17841784
for (int iPairCut = 0; iPairCut < fNPairCuts; ++iPairCut) { // loop over pair cuts
17851785
DefineHistograms(fHistMan, Form("TripletsBarrelSE_%s_%s_%s", legsStr.Data(), objArrayPair->At(iPairCut)->GetName(), sig->GetName()), fConfigHistogramSubgroups.value.data());
17861786
for (int iCommonCut = 0; iCommonCut < fNCommonTrackCuts; ++iCommonCut) {
@@ -1819,8 +1819,8 @@ struct AnalysisAsymmetricPairing {
18191819
}
18201820
}
18211821

1822-
if (!cutNamesStr.IsNull()) { // if pair cuts
1823-
std::unique_ptr<TObjArray> objArrayPair(cutNamesStr.Tokenize(","));
1822+
if (!pairCutNamesStr.IsNull()) { // if pair cuts
1823+
std::unique_ptr<TObjArray> objArrayPair(pairCutNamesStr.Tokenize(","));
18241824
fNPairCuts = objArrayPair->GetEntries();
18251825
for (int iPairCut = 0; iPairCut < fNPairCuts; ++iPairCut) { // loop over pair cuts
18261826
for (int iPrefix = 0; iPrefix < fNPairHistPrefixes; ++iPrefix) {
@@ -1853,8 +1853,8 @@ struct AnalysisAsymmetricPairing {
18531853
}
18541854
}
18551855

1856-
if (!cutNamesStr.IsNull()) { // if pair cuts
1857-
std::unique_ptr<TObjArray> objArrayPair(cutNamesStr.Tokenize(","));
1856+
if (!pairCutNamesStr.IsNull()) { // if pair cuts
1857+
std::unique_ptr<TObjArray> objArrayPair(pairCutNamesStr.Tokenize(","));
18581858
for (int iPairCut = 0; iPairCut < fNPairCuts; ++iPairCut) { // loop over pair cuts
18591859
for (int iPrefix = 0; iPrefix < fNPairHistPrefixes; ++iPrefix) {
18601860
DefineHistograms(fHistMan, Form("%s_%s_%s_%s", pairHistPrefixes[iPrefix].Data(), legsStr.Data(), objArrayPair->At(iPairCut)->GetName(), sig->GetName()), fConfigHistogramSubgroups.value.data());

0 commit comments

Comments
 (0)