Skip to content

Commit c31a854

Browse files
cnkostercnkoster
committed
o2-linter fixes
1 parent a3b1f68 commit c31a854

File tree

1 file changed

+119
-25
lines changed

1 file changed

+119
-25
lines changed

‎PWGCF/Flow/Tasks/flowSP.cxx‎

Lines changed: 119 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "PWGCF/DataModel/SPTableZDC.h"
4040
#include "GFWWeights.h"
4141
#include "TF1.h"
42+
#include "TPDGCode.h"
4243

4344
using namespace o2;
4445
using namespace o2::framework;
@@ -231,10 +232,10 @@ struct FlowSP {
231232
AxisSpec axisVz = {40, -10, 10, "v_{z}"};
232233
AxisSpec axisCent = {90, 0, 90, "Centrality(%)"};
233234
AxisSpec axisPhiPlane = {100, -constants::math::PI, constants::math::PI, "#Psi"};
234-
AxisSpec axisNch = {40, 0, 4000, "N_{ch}"};
235-
AxisSpec axisT0c = {70, 0, 70000, "N_{ch} (T0C)"};
236-
AxisSpec axisT0a = {70, 0, 70000, "N_{ch} (T0A)"};
237-
AxisSpec axisV0a = {70, 0, 70000, "N_{ch} (V0A)"};
235+
AxisSpec axisNch = {40, 0, 40000, "N_{ch}"};
236+
AxisSpec axisT0c = {70, 0, 100000, "N_{ch} (T0C)"};
237+
AxisSpec axisT0a = {70, 0, 200000, "N_{ch} (T0A)"};
238+
AxisSpec axisV0a = {70, 0, 200000, "N_{ch} (V0A)"};
238239
AxisSpec axisMultpv = {40, 0, 4000, "N_{ch} (PV)"};
239240
AxisSpec axisShCl = {100, 0, 1, "Fraction shared cl. TPC"};
240241
AxisSpec axisCl = {100, 0, 160, "Number of cl. TPC"};
@@ -457,33 +458,103 @@ struct FlowSP {
457458
if (cfgUseAdditionalEventCut) {
458459
// Fitted for LHC23zzh_pass4
459460
fMultPVCutLow = new TF1("fMultPVCutLow", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
460-
fMultPVCutLow->SetParameters(2942.55, -103.111, 1.4397, -0.00974862, 2.71433e-05);
461-
if (cfgnSigmaMultCuts == 2)
462-
fMultPVCutLow->SetParameters(2665.68, -93.3784, 1.27137, -0.00818936, 2.115e-05);
463-
if (cfgnSigmaMultCuts == 3)
464-
fMultPVCutLow->SetParameters(2389.99, -83.8483, 1.11062, -0.00672263, 1.54725e-05);
461+
462+
// Variables from fitting distribution with mean+1sigma
463+
double fitParamLowPV1 = 2942.55;
464+
double fitParamLowPV2 = -103.111;
465+
double fitParamLowPV3 = 1.4397;
466+
double fitParamLowPV4 = -0.00974862;
467+
double fitParamLowPV5 = 2.71433e-05;
468+
469+
if (cfgnSigmaMultCuts == 2){
470+
fitParamLowPV1 = 2665.68;
471+
fitParamLowPV2 = -93.3784;
472+
fitParamLowPV3 = 1.27137;
473+
fitParamLowPV4 = -0.00818936;
474+
fitParamLowPV5 = 2.115e-05;
475+
}
476+
else if (cfgnSigmaMultCuts == 3){
477+
fitParamLowPV1 = 2389.99;
478+
fitParamLowPV2 = -83.8483;
479+
fitParamLowPV3 = 1.11062;
480+
fitParamLowPV4 = -0.00672263;
481+
fitParamLowPV5 = 1.54725e-05;
482+
}
483+
484+
fMultPVCutLow->SetParameters( fitParamLowPV1, fitParamLowPV2, fitParamLowPV3, fitParamLowPV4, fitParamLowPV5);
465485

466486
fMultPVCutHigh = new TF1("fMultPVCutHigh", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
467-
fMultPVCutHigh->SetParameters(3508.13, -124.831, 1.87871, -0.0145343, 4.80688e-05);
468-
if (cfgnSigmaMultCuts == 2)
469-
fMultPVCutHigh->SetParameters(3787.93, -135.184, 2.07683, -0.0165997, 5.68725e-05);
470-
if (cfgnSigmaMultCuts == 3)
471-
fMultPVCutHigh->SetParameters(4067.4, -145.485, 2.27273, -0.0186308, 6.5501e-05);
487+
488+
// Variables from fitting distribution with mean+1sigma
489+
double fitParamHighPV1 = 3508.13;
490+
double fitParamHighPV2 = -124.831;
491+
double fitParamHighPV3 = 1.87871;
492+
double fitParamHighPV4 = -0.0145343;
493+
double fitParamHighPV5 = 4.80688e-05;
494+
495+
if (cfgnSigmaMultCuts == 2){
496+
fitParamHighPV1 = 3787.93;
497+
fitParamHighPV2 = -135.184;
498+
fitParamHighPV3 = 2.07683;
499+
fitParamHighPV4 = -0.0165997;
500+
fitParamHighPV5 = 5.68725e-05;
501+
}
502+
else if (cfgnSigmaMultCuts == 3){
503+
fitParamHighPV1 = 4067.4;
504+
fitParamHighPV2 = -145.485;
505+
fitParamHighPV3 = 2.27273;
506+
fitParamHighPV4 = -0.0186308;
507+
fitParamHighPV5 = 6.5501e-05;
508+
}
509+
fMultPVCutHigh->SetParameters(fitParamHighPV1, fitParamHighPV2, fitParamHighPV3, fitParamHighPV4, fitParamHighPV5);
472510

473511
fMultCutLow = new TF1("fMultCutLow", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
474-
fMultCutLow->SetParameters(1566.5, -48.2114, 0.529522, -0.00235284, 3.01132e-06);
475-
if (cfgnSigmaMultCuts == 2)
476-
fMultCutLow->SetParameters(1307.92, -39.9168, 0.412675, -0.00148081, 1.10868e-07);
477-
if (cfgnSigmaMultCuts == 3)
478-
fMultCutLow->SetParameters(1048.48, -31.4568, 0.287794, -0.00046847, -3.5909e-06);
512+
513+
double fitParamLow1 = 1566.5;
514+
double fitParamLow2 = -48.2114;
515+
double fitParamLow3 = 0.529522;
516+
double fitParamLow4 = -0.00235284;
517+
double fitParamLow5 = 3.01132e-06;
518+
519+
if (cfgnSigmaMultCuts == 2){
520+
fitParamLow1 = 1307.92;
521+
fitParamLow2 = -39.9168;
522+
fitParamLow3 = 0.412675;
523+
fitParamLow4 = -0.00148081;
524+
fitParamLow5 = 1.10868e-07;
525+
}
526+
else if (cfgnSigmaMultCuts == 3){
527+
fitParamLow1 = 1048.48;
528+
fitParamLow2 = -31.4568;
529+
fitParamLow3 = 0.287794;
530+
fitParamLow4 = -0.00046847;
531+
fitParamLow5 = -3.5909e-06;
532+
}
533+
fMultCutLow->SetParameters(fitParamLow1, fitParamLow2, fitParamLow3, fitParamLow4, fitParamLow5);
479534

480535
fMultCutHigh = new TF1("fMultCutHigh", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
481-
fMultCutHigh->SetParameters(2089.73, -65.9772, 0.816781, -0.00496563, 1.34314e-05);
482-
if (cfgnSigmaMultCuts == 2)
483-
fMultCutHigh->SetParameters(2350.39, -74.6939, 0.953287, -0.006162, 1.80808e-05);
484-
if (cfgnSigmaMultCuts == 3)
485-
fMultCutHigh->SetParameters(2610.98, -83.3983, 1.0893, -0.00735094, 2.26929e-05);
486-
}
536+
537+
double fitParamHigh1 = 2089.73;
538+
double fitParamHigh2 = -65.9772;
539+
double fitParamHigh3 = 0.816781;
540+
double fitParamHigh4 = -0.00496563;
541+
double fitParamHigh5 = 1.34314e-05;
542+
if (cfgnSigmaMultCuts == 2){
543+
fitParamHigh1 = 2350.39;
544+
fitParamHigh2 = -74.6939;
545+
fitParamHigh3 = 0.953287;
546+
fitParamHigh4 = -0.006162;
547+
fitParamHigh5 = 1.80808e-05;
548+
}
549+
else if (cfgnSigmaMultCuts == 3){
550+
fitParamHigh1 = 2610.98;
551+
fitParamHigh2 = -83.3983;
552+
fitParamHigh3 = 1.0893;
553+
fitParamHigh4 = -0.00735094;
554+
fitParamHigh5 = 2.26929e-05;
555+
}
556+
557+
fMultCutHigh->SetParameters(fitParamHigh1, fitParamHigh2, fitParamHigh3, fitParamHigh4, fitParamHigh5);
487558

488559
if (cfgManualEventParameters) {
489560
fMultPVCutLow->SetParameters((cfgMultPv.value)[0], (cfgMultPv.value)[1], (cfgMultPv.value)[2], (cfgMultPv.value)[3], (cfgMultPv.value)[4]);
@@ -492,6 +563,8 @@ struct FlowSP {
492563
fMultCutHigh->SetParameters((cfgMult.value)[5], (cfgMult.value)[6], (cfgMult.value)[7], (cfgMult.value)[8], (cfgMult.value)[9]);
493564
}
494565

566+
}
567+
495568
if (cfgUseAdditionalTrackCut) {
496569
fPhiCutLow = new TF1("fPhiCutLow", "0.06/x+pi/18.0-0.06", 0, 100);
497570
fPhiCutHigh = new TF1("fPhiCutHigh", "0.1/x+pi/18.0+0.06", 0, 100);
@@ -876,23 +949,41 @@ struct FlowSP {
876949
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("neg/hPt_hadron"), track.pt());
877950
}
878951

952+
<<<<<<< Updated upstream
879953
if (pdgCode == 211 || pdgCode == -211) {
880954
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("incl/hPt_pion"), track.pt());
881955
if (pdgCode == 211) {
956+
=======
957+
if(pdgCode == kPiPlus || pdgCode == kPiMinus){
958+
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("incl/hPt_pion"), track.pt());
959+
if(pdgCode == kPiPlus) {
960+
>>>>>>> Stashed changes
882961
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("pos/hPt_pion"), track.pt());
883962
} else {
884963
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("neg/hPt_pion"), track.pt());
885964
}
965+
<<<<<<< Updated upstream
886966
} else if (pdgCode == 321 || pdgCode == -321) {
887967
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("incl/hPt_kaon"), track.pt());
888968
if (pdgCode == 321) {
969+
=======
970+
} else if(pdgCode == kKPlus || pdgCode == kKMinus) {
971+
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("incl/hPt_kaon"), track.pt());
972+
if(pdgCode == kKPlus) {
973+
>>>>>>> Stashed changes
889974
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("pos/hPt_kaon"), track.pt());
890975
} else {
891976
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("neg/hPt_kaon"), track.pt());
892977
}
978+
<<<<<<< Updated upstream
893979
} else if (pdgCode == 2212 || pdgCode == -2212) {
894980
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("incl/hPt_proton"), track.pt());
895981
if (pdgCode == 2212) {
982+
=======
983+
} else if(pdgCode == kProton || pdgCode == kProtonBar) {
984+
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("incl/hPt_proton"), track.pt());
985+
if(pdgCode == kProton) {
986+
>>>>>>> Stashed changes
896987
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("pos/hPt_proton"), track.pt());
897988
} else {
898989
registry.fill(HIST("trackMC") + HIST(Mode[md]) + HIST(Time[ft]) + HIST("neg/hPt_proton"), track.pt());
@@ -1111,8 +1202,11 @@ struct FlowSP {
11111202
if (track.sign() == 0.0)
11121203
continue;
11131204
registry.fill(HIST("hTrackCount"), trackSel_ZeroCharge);
1205+
<<<<<<< Updated upstream
11141206

11151207
bool pos = (track.sign() > 0) ? true : false;
1208+
=======
1209+
>>>>>>> Stashed changes
11161210

11171211
fillMCPtHistos<kBefore, kReco>(track, mcParticle.pdgCode());
11181212

0 commit comments

Comments
 (0)