Skip to content

Commit a6dce7e

Browse files
committed
O2 linter fixes 3
1 parent 24a5d10 commit a6dce7e

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

Common/CCDB/EventSelectionParams.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ EventSelectionParams::EventSelectionParams(int system, int run)
174174
}
175175
}
176176

177-
void EventSelectionParams::DisableOutOfBunchPileupCuts()
177+
void EventSelectionParams::disableOutOfBunchPileupCuts()
178178
{
179179
selectionBarrel[kNoV0MOnVsOfPileup] = 0;
180180
selectionBarrel[kNoSPDOnVsOfPileup] = 0;
@@ -192,15 +192,15 @@ void EventSelectionParams::DisableOutOfBunchPileupCuts()
192192
selectionMuonWithoutPileupCuts[kNoV0PFPileup] = 0;
193193
}
194194

195-
void EventSelectionParams::SetOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB)
195+
void EventSelectionParams::setOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB)
196196
{
197197
fV0MOnVsOfA = newV0MOnVsOfA;
198198
fV0MOnVsOfB = newV0MOnVsOfB;
199199
fSPDOnVsOfA = newSPDOnVsOfA;
200200
fSPDOnVsOfB = newSPDOnVsOfB;
201201
}
202202

203-
bool* EventSelectionParams::GetSelection(int iSelection)
203+
bool* EventSelectionParams::getSelection(int iSelection)
204204
{
205205
if (iSelection == 0) {
206206
return selectionBarrel;

Common/CCDB/EventSelectionParams.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11+
1112
/// \file EventSelectionParams.h
1213
/// \brief Event selection parameters
1314
///
@@ -85,9 +86,9 @@ class EventSelectionParams
8586
{
8687
public:
8788
explicit EventSelectionParams(int system = 0, int run = 2);
88-
void DisableOutOfBunchPileupCuts();
89-
void SetOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB);
90-
bool* GetSelection(int iSelection);
89+
void disableOutOfBunchPileupCuts();
90+
void setOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB);
91+
bool* getSelection(int iSelection);
9192

9293
bool selectionBarrel[o2::aod::evsel::kNsel];
9394
bool selectionMuonWithPileupCuts[o2::aod::evsel::kNsel];

Common/TableProducer/eventSelection.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ struct BcSelectionTask {
328328
}
329329

330330
// bc loop
331-
for (const auto bc : bcs) {
331+
for (const auto& bc : bcs) {
332332
uint32_t alias{0};
333333
// workaround for pp2022 (trigger info is shifted by -294 bcs)
334334
int32_t triggerBcId = mapGlobalBCtoBcId[bc.globalBC() + triggerBcShift];
@@ -917,7 +917,7 @@ struct EventSelectionTask {
917917
if (bc.has_foundFT0())
918918
vAmpFT0CperColl[colIndex] = bc.foundFT0().sumAmpC();
919919

920-
int64_t TFid = (foundGlobalBC - bcSOR) / nBCsPerTF;
920+
int64_t tfId = (foundGlobalBC - bcSOR) / nBCsPerTF;
921921
int64_t rofId = (foundGlobalBC + nBCsPerOrbit - rofOffset) / rofLength;
922922

923923
// ### for in-ROF occupancy
@@ -928,7 +928,7 @@ struct EventSelectionTask {
928928
int64_t thisBC = vFoundGlobalBC[minColIndex];
929929
// check if this is still the same TF
930930
int64_t thisTFid = (thisBC - bcSOR) / nBCsPerTF;
931-
if (thisTFid != TFid)
931+
if (thisTFid != tfId)
932932
break;
933933
// int thisRofIdInTF = (thisBC - rofOffset) / rofLength;
934934
int64_t thisRofId = (thisBC + nBCsPerOrbit - rofOffset) / rofLength;
@@ -944,7 +944,7 @@ struct EventSelectionTask {
944944
while (maxColIndex < cols.size()) {
945945
int64_t thisBC = vFoundGlobalBC[maxColIndex];
946946
int64_t thisTFid = (thisBC - bcSOR) / nBCsPerTF;
947-
if (thisTFid != TFid)
947+
if (thisTFid != tfId)
948948
break;
949949
int64_t thisRofId = (thisBC + nBCsPerOrbit - rofOffset) / rofLength;
950950
if (thisRofId != rofId)
@@ -961,7 +961,7 @@ struct EventSelectionTask {
961961
int64_t thisBC = vFoundGlobalBC[minColIndex];
962962
// check if this is still the same TF
963963
int64_t thisTFid = (thisBC - bcSOR) / nBCsPerTF;
964-
if (thisTFid != TFid)
964+
if (thisTFid != tfId)
965965
break;
966966
int64_t thisRofId = (thisBC + nBCsPerOrbit - rofOffset) / rofLength;
967967
if (thisRofId == rofId - 1)
@@ -987,7 +987,7 @@ struct EventSelectionTask {
987987
int64_t thisBC = vFoundGlobalBC[minColIndex];
988988
// check if this is still the same TF
989989
int64_t thisTFid = (thisBC - bcSOR) / nBCsPerTF;
990-
if (thisTFid != TFid)
990+
if (thisTFid != tfId)
991991
break;
992992
float dt = (thisBC - foundGlobalBC) * bcNS; // ns
993993
// check if we are within the chosen time range
@@ -1002,7 +1002,7 @@ struct EventSelectionTask {
10021002
while (maxColIndex < cols.size()) {
10031003
int64_t thisBC = vFoundGlobalBC[maxColIndex];
10041004
int64_t thisTFid = (thisBC - bcSOR) / nBCsPerTF;
1005-
if (thisTFid != TFid)
1005+
if (thisTFid != tfId)
10061006
break;
10071007
float dt = (thisBC - foundGlobalBC) * bcNS; // ns
10081008
if (dt > timeWinOccupancyCalcMaxNS)

0 commit comments

Comments
 (0)