Skip to content

Commit 9528556

Browse files
committed
Linter fixes 2
1 parent 97fc543 commit 9528556

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

Common/TableProducer/eventSelectionServiceRun2.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Run3MatchedToBCSparse>;
4343
using FullTracks = soa::Join<aod::Tracks, aod::TracksExtra>;
4444
using FullTracksIU = soa::Join<aod::TracksIU, aod::TracksExtra>;
4545

46-
struct EventselectionRun2 {
46+
struct EventselectionRun2 { // o2-linter: disable=name/workflow-file (exception due to metadata-driven topology)
4747
o2::common::timestamp::TimestampConfigurables timestampConfigurables;
4848
o2::common::timestamp::TimestampModule timestampMod;
4949

@@ -53,7 +53,7 @@ struct EventselectionRun2 {
5353
o2::common::eventselection::EvselConfigurables evselOpts;
5454
o2::common::eventselection::EventSelectionModule evselmodule;
5555

56-
Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
56+
Produces<aod::Timestamps> timestampTable; // Table with SOR timestamps produced by the task
5757
Produces<aod::BcSels> bcsel;
5858
Produces<aod::EvSels> evsel;
5959

@@ -102,7 +102,7 @@ struct EventselectionRun2 {
102102
}
103103
};
104104

105-
struct EventselectionRun3 {
105+
struct EventselectionRun3 { // o2-linter: disable=name/workflow-file (exception due to metadata-driven topology)
106106
o2::common::timestamp::TimestampConfigurables timestampConfigurables;
107107
o2::common::timestamp::TimestampModule timestampMod;
108108

Common/Tools/EventSelectionModule.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,13 +1757,13 @@ class LumiModule
17571757
double perBcRateTCE = static_cast<double>(mCounterTCE[i + 1] - mCounterTCE[i]) / nOrbits / nCollidingBCs;
17581758
double perBcRateZNC = static_cast<double>(mCounterZNC[i + 1] - mCounterZNC[i]) / nOrbits / nCollidingBCs;
17591759
double perBcRateZEM = static_cast<double>(mCounterZEM[i + 1] - mCounterZEM[i]) / nOrbits / nCollidingBCs;
1760-
constexpr float rateMin = 1.e-10;
1760+
const float rateMin = 1.e-10;
17611761
double muTVX = (perBcRateTVX < 1 && perBcRateTVX > rateMin) ? -std::log(1 - perBcRateTVX) : 0;
17621762
double muTCE = (perBcRateTCE < 1 && perBcRateTCE > rateMin) ? -std::log(1 - perBcRateTCE) : 0;
17631763
double muZNC = (perBcRateZNC < 1 && perBcRateZNC > rateMin) ? -std::log(1 - perBcRateZNC) : 0;
17641764
double muZEM = (perBcRateZEM < 1 && perBcRateZEM > rateMin) ? -std::log(1 - perBcRateZEM) : 0;
17651765
LOGP(debug, "orbit={} muTVX={} muTCE={} muZNC={} muZEM={}", mOrbits[i], muTVX, muTCE, muZNC, muZEM);
1766-
constexpr float muMin = 1.e-10;
1766+
const float muMin = 1.e-10;
17671767
mPileupCorrectionTVX.push_back(muTVX > muMin ? muTVX / (1 - std::exp(-muTVX)) : 1);
17681768
mPileupCorrectionTCE.push_back(muTCE > muMin ? muTCE / (1 - std::exp(-muTCE)) : 1);
17691769
mPileupCorrectionZNC.push_back(muZNC > muMin ? muZNC / (1 - std::exp(-muZNC)) : 1);

Common/Tools/timestampModule.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ class TimestampModule
109109
// FIXME this should not have been a problem, to be investigated
110110
ccdb->clearCache(timestampOpts.orbitResetPath.value.data());
111111

112-
constexpr int maxRunNumberUnanchored = 499999;
113-
constexpr int minRunNumberUnanchored = 300000;
114-
const bool isUnanchoredRun3MC = runNumber >= minRunNumberUnanchored && runNumber < maxRunNumberUnanchored;
112+
const int maxRunNumberUnanchored = 499999;
113+
const int minRunNumberUnanchored = 300000;
114+
const bool isUnanchoredRun3MC = runNumber >= minRunNumberUnanchored && runNumber <= maxRunNumberUnanchored;
115115
if (timestampOpts.isRun2MC.value == 1 || isUnanchoredRun3MC) {
116116
// isRun2MC: bc/orbit distributions are not simulated in Run2 MC. All bcs are set to 0.
117117
// isUnanchoredRun3MC: assuming orbit-reset is done in the beginning of each run

0 commit comments

Comments
 (0)