Skip to content

Commit 9cadd28

Browse files
glegrasglegras
committed
fix megalinter
1 parent f30bca7 commit 9cadd28

4 files changed

Lines changed: 106 additions & 120 deletions

File tree

‎PWGDQ/Core/CutsLibrary.cxx‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -541,13 +541,6 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
541541
return cut;
542542
}
543543

544-
if (nameStr == "JpsiPWGSkimmedCuts1") { // please do not remove or modify, this is used for the common Skimmed tree production, (Xiaozhi Bai)
545-
cut->AddCut(GetAnalysisCut("jpsiKineSkimmed"));
546-
cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed"));
547-
cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed"));
548-
return cut;
549-
}
550-
551544
if (nameStr == "JpsiPWGSkimmedCuts2") {
552545
cut->AddCut(GetAnalysisCut("jpsiKineSkimmed"));
553546
cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed"));
@@ -4278,7 +4271,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
42784271
return cut;
42794272
}
42804273

4281-
if (nameStr == "eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime") {
4274+
if (nameStr == "eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime2") {
42824275
cut->AddCut(VarManager::kVtxZ, -10.0, 10.0);
42834276
cut->AddCut(VarManager::kIsSel8, 0.5, 1.5);
42844277
cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5);
@@ -4672,12 +4665,6 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
46724665
return cut;
46734666
}
46744667

4675-
if (nameStr == "jpsiKineSkimmed") {
4676-
cut->AddCut(VarManager::kPt, 0.7, 1000.0);
4677-
cut->AddCut(VarManager::kEta, -0.9, 0.9);
4678-
return cut;
4679-
}
4680-
46814668
if (nameStr == "lmeePrefilterKine") {
46824669
cut->AddCut(VarManager::kPt, 0., 20.0);
46834670
cut->AddCut(VarManager::kEta, -1.2, 1.2);
@@ -7937,9 +7924,7 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro
79377924
}
79387925
}
79397926

7940-
if (!cutDirsFilled) {
7941-
cutDirsFilled = true;
7942-
}
7927+
cutDirsFilled = true;
79437928

79447929
centBins.emplace_back(centMin, centMax);
79457930
ptBins.emplace_back(ptMin, ptMax);

‎PWGDQ/Core/MCSignalLibrary.cxx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
18111811
signal = new MCSignal(name, "Jpsi from Chic2 decays", {prong}, {1});
18121812
return signal;
18131813
}
1814-
if (nameStr == "JpsiFromChic2") {
1814+
if (nameStr == "JpsiFromChic") {
18151815
MCProng prong(2, {443, 904}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
18161816
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
18171817
signal = new MCSignal(name, "Jpsi from Chic0, Chic1 or Chic2 decays", {prong}, {1});
@@ -2165,7 +2165,7 @@ std::vector<MCSignal*> o2::aod::dqmcsignals::GetMCSignalsFromJSON(const char* js
21652165
// Get the common ancestors array
21662166
std::vector<int8_t> commonAncestors;
21672167
if (signal.HasMember("commonAncestors")) {
2168-
for (auto& v : signal.FindMember("commonAncestors")->value.GetArray()) {
2168+
for (const auto& v : signal.FindMember("commonAncestors")->value.GetArray()) {
21692169
commonAncestors.push_back(v.GetInt());
21702170
LOG(debug) << "common ancestor " << v.GetInt();
21712171
}
@@ -2240,13 +2240,13 @@ bool o2::aod::dqmcsignals::ValidateJSONMCProng(T prongJSON, const char* prongNam
22402240
return false;
22412241
}
22422242
std::vector<uint32_t> nSourceBits;
2243-
for (auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
2243+
for (const auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
22442244
if (!ii.IsArray()) {
22452245
LOG(fatal) << "The sourceBits field should be an array of arrays of MCProng::Source";
22462246
return false;
22472247
}
22482248
nSourceBits.push_back(ii.GetArray().Size());
2249-
for (auto& iii : ii.GetArray()) {
2249+
for (const auto& iii : ii.GetArray()) {
22502250
if (MCProng::fgSourceNames.find(iii.GetString()) == MCProng::fgSourceNames.end()) {
22512251
LOG(fatal) << "Source " << iii.GetString() << " not implemented in MCProng";
22522252
return false;
@@ -2259,7 +2259,7 @@ bool o2::aod::dqmcsignals::ValidateJSONMCProng(T prongJSON, const char* prongNam
22592259
return false;
22602260
}
22612261
int iElem = 0;
2262-
for (auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
2262+
for (const auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
22632263
if (!ii.IsArray()) {
22642264
LOG(fatal) << "The excludeSource field should be an array of arrays of bool";
22652265
return false;
@@ -2337,21 +2337,21 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
23372337
LOG(debug) << "n: " << n;
23382338
// Get the array of PDG codes
23392339
std::vector<int> pdgs;
2340-
for (auto& pdg : prongJSON->FindMember("pdgs")->value.GetArray()) {
2340+
for (const auto& pdg : prongJSON->FindMember("pdgs")->value.GetArray()) {
23412341
pdgs.push_back(pdg.GetInt());
23422342
LOG(debug) << "pdgs: " << pdg.GetInt();
23432343
}
23442344
// get the array of booleans for check both charges option
23452345
std::vector<bool> checkBothCharges;
2346-
for (auto& ii : prongJSON->FindMember("checkBothCharges")->value.GetArray()) {
2346+
for (const auto& ii : prongJSON->FindMember("checkBothCharges")->value.GetArray()) {
23472347
checkBothCharges.push_back(ii.GetBool());
23482348
LOG(debug) << "check both charges " << ii.GetBool();
23492349
}
23502350

23512351
// get the array of booleans for the excludePDG option, defaults to false
23522352
std::vector<bool> excludePDG;
23532353
if (prongJSON->HasMember("excludePDG")) {
2354-
for (auto& ii : prongJSON->FindMember("excludePDG")->value.GetArray()) {
2354+
for (const auto& ii : prongJSON->FindMember("excludePDG")->value.GetArray()) {
23552355
excludePDG.push_back(ii.GetBool());
23562356
LOG(debug) << "exclude pdg " << ii.GetBool();
23572357
}
@@ -2364,9 +2364,9 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
23642364
// get the source bits, and transform from string to int
23652365
std::vector<std::vector<int>> sourceBitsVec;
23662366
if (prongJSON->HasMember("sourceBits")) {
2367-
for (auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
2367+
for (const auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
23682368
std::vector<int> sourceBits;
2369-
for (auto& iii : ii.GetArray()) {
2369+
for (const auto& iii : ii.GetArray()) {
23702370
sourceBits.push_back(MCProng::fgSourceNames[iii.GetString()]);
23712371
LOG(debug) << "source bit " << iii.GetString();
23722372
}
@@ -2376,9 +2376,9 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
23762376
// prepare the exclusion source options if specified
23772377
std::vector<std::vector<bool>> excludeSourceVec;
23782378
if (prongJSON->HasMember("excludeSource")) {
2379-
for (auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
2379+
for (const auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
23802380
std::vector<bool> excludeSource;
2381-
for (auto& iii : ii.GetArray()) {
2381+
for (const auto& iii : ii.GetArray()) {
23822382
excludeSource.push_back(iii.GetBool());
23832383
LOG(debug) << "exclude source bit " << iii.GetBool();
23842384
}
@@ -2389,7 +2389,7 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
23892389
// prepare the useANDonSourceBitMap vector, defaults to true for each generation
23902390
std::vector<bool> useANDonSourceBitMap;
23912391
if (prongJSON->HasMember("useANDonSourceBitMap")) {
2392-
for (auto& ii : prongJSON->FindMember("useANDonSourceBitMap")->value.GetArray()) {
2392+
for (const auto& ii : prongJSON->FindMember("useANDonSourceBitMap")->value.GetArray()) {
23932393
useANDonSourceBitMap.push_back(ii.GetBool());
23942394
LOG(debug) << "use AND on source map " << ii.GetBool();
23952395
}
@@ -2404,12 +2404,12 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
24042404
int igen = 0;
24052405
std::vector<uint64_t> sBitsVec;
24062406
std::vector<uint64_t> sBitsExcludeVec;
2407-
for (auto& itgen : sourceBitsVec) {
2407+
for (const auto& itgen : sourceBitsVec) {
24082408
int is = 0;
24092409
uint64_t sBits = 0;
24102410
uint64_t sBitsExclude = 0;
24112411
auto excludeVec = (hasExclude ? excludeSourceVec[igen] : std::vector<bool>{});
2412-
for (auto& s : itgen) {
2412+
for (const auto& s : itgen) {
24132413
bool exclude = (hasExclude ? excludeVec[is] : false);
24142414
if (s != MCProng::kNothing) {
24152415
sBits |= (static_cast<uint64_t>(1) << s);
@@ -2458,15 +2458,15 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
24582458

24592459
std::vector<int> checkIfPDGInHistory = {};
24602460
if (prongJSON->HasMember("checkIfPDGInHistory")) {
2461-
for (auto& ii : prongJSON->FindMember("checkIfPDGInHistory")->value.GetArray()) {
2461+
for (const auto& ii : prongJSON->FindMember("checkIfPDGInHistory")->value.GetArray()) {
24622462
checkIfPDGInHistory.push_back(ii.GetInt());
24632463
LOG(debug) << "checkIfPDGInHistory: " << ii.GetInt();
24642464
}
24652465
}
24662466

24672467
std::vector<bool> excludePDGInHistory = {};
24682468
if (prongJSON->HasMember("excludePDGInHistory")) {
2469-
for (auto& ii : prongJSON->FindMember("excludePDGInHistory")->value.GetArray()) {
2469+
for (const auto& ii : prongJSON->FindMember("excludePDGInHistory")->value.GetArray()) {
24702470
excludePDGInHistory.push_back(ii.GetBool());
24712471
LOG(debug) << "excludePDGInHistory: " << ii.GetBool();
24722472
}

‎PWGDQ/Tasks/DalitzSelection.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,8 +594,8 @@ struct DalitzSelection {
594594
// Fill Hists
595595
if (fConfigOptions.fQA && !fSkipEvent) {
596596
for (const auto& track : tracks1) {
597-
uint8_t filterMap;
598-
uint8_t filterMapProbe;
597+
auto filterMap = uint8_t(0);
598+
auto filterMapProbe = uint8_t(0);
599599
if constexpr (isReassoc) {
600600
auto const& fullTrack = track.template track_as<TFullTracks>();
601601
filterMap = fDalitzmap[fullTrack.globalIndex()]; // cppcheck-suppress redundantInitialization
@@ -679,7 +679,7 @@ struct DalitzSelection {
679679
uint32_t bitMask = (static_cast<uint32_t>(1) << 8);
680680
fMixingEvent->ClearFilteringMask(bitMask);
681681

682-
for (auto& poolEvent : pool.events) {
682+
for (auto& poolEvent : pool.events) { // o2-linter disable=const-ref-in-for-loop (false positive, it cannot be made const since it is modified within the loop)
683683
if ((poolEvent.filteringMask & static_cast<uint32_t>(255)) == 0) {
684684
// all other bits have been erased, so we can also mark bit 8 for deletion
685685
poolEvent.filteringMask |= bitMask;

0 commit comments

Comments
 (0)