Skip to content

Commit 20be907

Browse files
committed
o2-linter fixes
1 parent 749a870 commit 20be907

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

PWGCF/Flow/Tasks/flowSP.cxx

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,9 @@ struct FlowSP {
456456
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_ParticleWeights + 1, "Apply weights");
457457

458458
if (cfgUseAdditionalEventCut) {
459+
460+
int twoSigma = 2;
461+
int threeSigma = 3;
459462
// Fitted for LHC23zzh_pass4
460463
fMultPVCutLow = new TF1("fMultPVCutLow", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
461464

@@ -466,13 +469,13 @@ struct FlowSP {
466469
double fitParamLowPV4 = -0.00974862;
467470
double fitParamLowPV5 = 2.71433e-05;
468471

469-
if (cfgnSigmaMultCuts == 2) {
472+
if (cfgnSigmaMultCuts == twoSigma) {
470473
fitParamLowPV1 = 2665.68;
471474
fitParamLowPV2 = -93.3784;
472475
fitParamLowPV3 = 1.27137;
473476
fitParamLowPV4 = -0.00818936;
474477
fitParamLowPV5 = 2.115e-05;
475-
} else if (cfgnSigmaMultCuts == 3) {
478+
} else if (cfgnSigmaMultCuts == threeSigma) {
476479
fitParamLowPV1 = 2389.99;
477480
fitParamLowPV2 = -83.8483;
478481
fitParamLowPV3 = 1.11062;
@@ -491,13 +494,13 @@ struct FlowSP {
491494
double fitParamHighPV4 = -0.0145343;
492495
double fitParamHighPV5 = 4.80688e-05;
493496

494-
if (cfgnSigmaMultCuts == 2) {
497+
if (cfgnSigmaMultCuts == twoSigma) {
495498
fitParamHighPV1 = 3787.93;
496499
fitParamHighPV2 = -135.184;
497500
fitParamHighPV3 = 2.07683;
498501
fitParamHighPV4 = -0.0165997;
499502
fitParamHighPV5 = 5.68725e-05;
500-
} else if (cfgnSigmaMultCuts == 3) {
503+
} else if (cfgnSigmaMultCuts == threeSigma) {
501504
fitParamHighPV1 = 4067.4;
502505
fitParamHighPV2 = -145.485;
503506
fitParamHighPV3 = 2.27273;
@@ -514,13 +517,13 @@ struct FlowSP {
514517
double fitParamLow4 = -0.00235284;
515518
double fitParamLow5 = 3.01132e-06;
516519

517-
if (cfgnSigmaMultCuts == 2) {
520+
if (cfgnSigmaMultCuts == twoSigma) {
518521
fitParamLow1 = 1307.92;
519522
fitParamLow2 = -39.9168;
520523
fitParamLow3 = 0.412675;
521524
fitParamLow4 = -0.00148081;
522525
fitParamLow5 = 1.10868e-07;
523-
} else if (cfgnSigmaMultCuts == 3) {
526+
} else if (cfgnSigmaMultCuts == threeSigma) {
524527
fitParamLow1 = 1048.48;
525528
fitParamLow2 = -31.4568;
526529
fitParamLow3 = 0.287794;
@@ -537,13 +540,13 @@ struct FlowSP {
537540
double fitParamHigh4 = -0.00496563;
538541
double fitParamHigh5 = 1.34314e-05;
539542

540-
if (cfgnSigmaMultCuts == 2) {
543+
if (cfgnSigmaMultCuts == twoSigma) {
541544
fitParamHigh1 = 2350.39;
542545
fitParamHigh2 = -74.6939;
543546
fitParamHigh3 = 0.953287;
544547
fitParamHigh4 = -0.006162;
545548
fitParamHigh5 = 1.80808e-05;
546-
} else if (cfgnSigmaMultCuts == 3) {
549+
} else if (cfgnSigmaMultCuts == threeSigma) {
547550
fitParamHigh1 = 2610.98;
548551
fitParamHigh2 = -83.3983;
549552
fitParamHigh3 = 1.0893;
@@ -1182,11 +1185,6 @@ struct FlowSP {
11821185
if (track.sign() == 0.0)
11831186
continue;
11841187
registry.fill(HIST("hTrackCount"), trackSel_ZeroCharge);
1185-
<<<<<<< Updated upstream
1186-
1187-
bool pos = (track.sign() > 0) ? true : false;
1188-
=======
1189-
>>>>>>> Stashed changes
11901188

11911189
fillMCPtHistos<kBefore, kReco>(track, mcParticle.pdgCode());
11921190

0 commit comments

Comments
 (0)