Skip to content

Commit f8aa6ca

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 4818048 commit f8aa6ca

1 file changed

Lines changed: 74 additions & 71 deletions

File tree

‎PWGCF/EbyEFluctuations/Tasks/radialFlowDecorr.cxx‎

Lines changed: 74 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -67,59 +67,61 @@ using namespace constants::math;
6767
struct RadialFlowDecorr {
6868

6969
static constexpr int KIntM = 3;
70-
static constexpr int KIntK = 3;
71-
72-
static constexpr int KNEta = 17;
73-
static constexpr int KNpT = 3;
74-
75-
// --- Linter Fixes: Magic Numbers ---
76-
static constexpr float KFloatEpsilon = 1e-6f;
77-
// static constexpr int KPiPlus = o2::constants::physics::Pdg::kPiPlus;
78-
// static constexpr int KKPlus = o2::constants::physics::Pdg::kKaPlus;
79-
// static constexpr int KProton = o2::constants::physics::Pdg::kProton;
80-
static constexpr float KCentTestMin = 10.f;
81-
static constexpr float KCentTestMaxLo = 60.f;
82-
static constexpr float KCentTestMaxHi = 70.f;
83-
static constexpr float KCentCovCut = 1.0f;
84-
static constexpr float KBinOffset = 0.5f;
85-
static constexpr float KHalf = 0.5f;
86-
static constexpr float KPhiMin = 0.f; // Added for magic number fix
87-
// Histogram axis definitions
88-
static constexpr int KNbinsZvtx = 240;
89-
static constexpr float KZvtxMin = -12.f;
90-
static constexpr float KZvtxMax = 12.f;
91-
static constexpr int KNbinsP = 100;
92-
static constexpr float KPMin = 0.f;
93-
static constexpr float KPMax = 10.f;
94-
static constexpr int KNbinsPt = 200;
95-
static constexpr float KPtMin = 0.f;
96-
static constexpr float KPtMax = 10.f;
97-
static constexpr int KNbinsEta = 120;
98-
static constexpr float KEtaMin = -1.2f;
99-
static constexpr float KEtaMax = 1.2f;
100-
static constexpr int KNbinsPhi = 64;
101-
static constexpr float KEtaAxisMin = -0.8f;
102-
static constexpr float KEtaAxisMax = 0.8f;
103-
static constexpr int KNbinsPhiFine = 30;
104-
static constexpr int KNbinsPtRes = 50;
105-
static constexpr float KPtResMax = 1.f;
106-
static constexpr int KNbinsEtaRes = 100;
107-
static constexpr float KEtaResMax = 0.5f;
108-
static constexpr int KNbinsVz = 80;
109-
static constexpr float KVzMin = -40.f;
110-
static constexpr float KVzMax = 40.f;
111-
static constexpr float KVzResMax = 20.f;
112-
static constexpr int KNbinsEtaFine = 20;
113-
static constexpr float KEtaFineMax = 1.f;
114-
static constexpr int KNbinsDca = 400;
115-
static constexpr float KDcaMax = 0.2f;
116-
static constexpr int KNbinsPtCoarse = 50;
117-
static constexpr float KPtMinDefault = 0.2f;
118-
static constexpr float KPtMidMax = 3.0f;
119-
static constexpr float KPtHighMax = 5.0f;
120-
static constexpr float KPtFullMax = 10.0f;
121-
static constexpr float KCentMax = 90;
122-
enum PID { kInclusive = 0, kCombinedPID, kNumPID };
70+
static constexpr int KIntK = 3;
71+
72+
static constexpr int KNEta = 17;
73+
static constexpr int KNpT = 3;
74+
75+
// --- Linter Fixes: Magic Numbers ---
76+
static constexpr float KFloatEpsilon = 1e-6f;
77+
// static constexpr int KPiPlus = o2::constants::physics::Pdg::kPiPlus;
78+
// static constexpr int KKPlus = o2::constants::physics::Pdg::kKaPlus;
79+
// static constexpr int KProton = o2::constants::physics::Pdg::kProton;
80+
static constexpr float KCentTestMin = 10.f;
81+
static constexpr float KCentTestMaxLo = 60.f;
82+
static constexpr float KCentTestMaxHi = 70.f;
83+
static constexpr float KCentCovCut = 1.0f;
84+
static constexpr float KBinOffset = 0.5f;
85+
static constexpr float KHalf = 0.5f;
86+
static constexpr float KPhiMin = 0.f; // Added for magic number fix
87+
// Histogram axis definitions
88+
static constexpr int KNbinsZvtx = 240;
89+
static constexpr float KZvtxMin = -12.f;
90+
static constexpr float KZvtxMax = 12.f;
91+
static constexpr int KNbinsP = 100;
92+
static constexpr float KPMin = 0.f;
93+
static constexpr float KPMax = 10.f;
94+
static constexpr int KNbinsPt = 200;
95+
static constexpr float KPtMin = 0.f;
96+
static constexpr float KPtMax = 10.f;
97+
static constexpr int KNbinsEta = 120;
98+
static constexpr float KEtaMin = -1.2f;
99+
static constexpr float KEtaMax = 1.2f;
100+
static constexpr int KNbinsPhi = 64;
101+
static constexpr float KEtaAxisMin = -0.8f;
102+
static constexpr float KEtaAxisMax = 0.8f;
103+
static constexpr int KNbinsPhiFine = 30;
104+
static constexpr int KNbinsPtRes = 50;
105+
static constexpr float KPtResMax = 1.f;
106+
static constexpr int KNbinsEtaRes = 100;
107+
static constexpr float KEtaResMax = 0.5f;
108+
static constexpr int KNbinsVz = 80;
109+
static constexpr float KVzMin = -40.f;
110+
static constexpr float KVzMax = 40.f;
111+
static constexpr float KVzResMax = 20.f;
112+
static constexpr int KNbinsEtaFine = 20;
113+
static constexpr float KEtaFineMax = 1.f;
114+
static constexpr int KNbinsDca = 400;
115+
static constexpr float KDcaMax = 0.2f;
116+
static constexpr int KNbinsPtCoarse = 50;
117+
static constexpr float KPtMinDefault = 0.2f;
118+
static constexpr float KPtMidMax = 3.0f;
119+
static constexpr float KPtHighMax = 5.0f;
120+
static constexpr float KPtFullMax = 10.0f;
121+
static constexpr float KCentMax = 90;
122+
enum PID { kInclusive = 0,
123+
kCombinedPID,
124+
kNumPID };
123125
enum ECentralityEstimator {
124126
kCentFT0C = 1,
125127
kCentFT0A = 2,
@@ -136,20 +138,20 @@ struct RadialFlowDecorr {
136138
0.8,
137139
-0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8};
138140

139-
const std::vector<float> pTLw = {KPtMinDefault, KPtMinDefault, KPtMinDefault};
140-
const std::vector<float> pTUp = {KPtMidMax, KPtHighMax, KPtFullMax};
141-
//==============================
142-
// Configurables
143-
//==============================
144-
Configurable<float> cfgVtxZCut{"cfgVtxZCut", 10.f, "z-vertex range"};
145-
Configurable<float> cfgPtMin{"cfgPtMin", 0.2f, "min pT"};
146-
Configurable<float> cfgPtMax{"cfgPtMax", 10.0f, "max pT"};
147-
Configurable<float> cfgEtaCut{"cfgEtaCut", 0.8f, "|η| cut"};
148-
Configurable<float> cfgDCAXY{"cfgDCAXY", 2.4f, "DCAxy cut"};
149-
Configurable<float> cfgDCAZ{"cfgDCAZ", 3.2f, "DCAz cut"};
150-
Configurable<float> cfgTPCClsMin{"cfgTPCClsMin", 70.f, "min TPC clusters"};
151-
Configurable<float> cfgChi2TPCMax{"cfgChi2TPCMax", 4.0f, "max TPC χ²"};
152-
Configurable<float> cfgPIDnSigmaCut{"cfgPIDnSigmaCut", 3.f, "TPC PID |nσ| cut"};
141+
const std::vector<float> pTLw = {KPtMinDefault, KPtMinDefault, KPtMinDefault};
142+
const std::vector<float> pTUp = {KPtMidMax, KPtHighMax, KPtFullMax};
143+
//==============================
144+
//  Configurables
145+
//==============================
146+
Configurable<float> cfgVtxZCut{"cfgVtxZCut", 10.f, "z-vertex range"};
147+
Configurable<float> cfgPtMin{"cfgPtMin", 0.2f, "min pT"};
148+
Configurable<float> cfgPtMax{"cfgPtMax", 10.0f, "max pT"};
149+
Configurable<float> cfgEtaCut{"cfgEtaCut", 0.8f, "|η| cut"};
150+
Configurable<float> cfgDCAXY{"cfgDCAXY", 2.4f, "DCAxy cut"};
151+
Configurable<float> cfgDCAZ{"cfgDCAZ", 3.2f, "DCAz cut"};
152+
Configurable<float> cfgTPCClsMin{"cfgTPCClsMin", 70.f, "min TPC clusters"};
153+
Configurable<float> cfgChi2TPCMax{"cfgChi2TPCMax", 4.0f, "max TPC χ²"};
154+
Configurable<float> cfgPIDnSigmaCut{"cfgPIDnSigmaCut", 3.f, "TPC PID |nσ| cut"};
153155

154156
Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};
155157
Configurable<float> cfgCutTpcChi2NCl{"cfgCutTpcChi2NCl", 2.5f, "Maximum TPCchi2NCl"};
@@ -1188,7 +1190,7 @@ struct RadialFlowDecorr {
11881190
if (pt <= pTLw[ipt] || pt > pTUp[ipt])
11891191
continue;
11901192
sumWiTruth[ieta][ipt]++;
1191-
sumWiptiTruth[ieta][ipt] += pt;
1193+
sumWiptiTruth[ieta][ipt] += pt;
11921194
if (isPion || isKaon || isProton) {
11931195
float m = isPion ? o2::constants::physics::MassPiPlus : isKaon ? o2::constants::physics::MassKPlus
11941196
: o2::constants::physics::MassProton;
@@ -1259,7 +1261,7 @@ struct RadialFlowDecorr {
12591261
float effPid = getEfficiency(col.multNTracksPV(), pt, eta, kCombinedPID, 0);
12601262
float fakePid = getEfficiency(col.multNTracksPV(), pt, eta, kCombinedPID, 1);
12611263
float flatWeightPid = getFlatteningWeight(cent, eta, phi, kCombinedPID);
1262-
float wPid = flatWeightPid * (1.0 - fakePid) / effPid;
1264+
float wPid = flatWeightPid * (1.0 - fakePid) / effPid;
12631265

12641266
histos.fill(HIST("hCentEtaPhiWtd_PID"), cent, eta, track.phi(), flatWeightPid);
12651267
if (cent < KCentTestMin)
@@ -1426,7 +1428,8 @@ struct RadialFlowDecorr {
14261428
for (const auto& mcCollision : mcColl) {
14271429
auto partSlice = mcParticles.sliceBy(partPerMcCollision, mcCollision.globalIndex());
14281430
auto colSlice = collisions.sliceBy(colPerMcCollision, mcCollision.globalIndex());
1429-
if (colSlice.size() != 1) continue;
1431+
if (colSlice.size() != 1)
1432+
continue;
14301433
// histos.fill(HIST("MCGen/hVtxZ"), mcCollision.posZ());
14311434
for (const auto& col : colSlice) {
14321435

@@ -1536,7 +1539,7 @@ struct RadialFlowDecorr {
15361539
if (!std::isfinite(wIncl) || wIncl <= 0.f)
15371540
continue;
15381541
if (effIncl <= 0 || !isfinite(effIncl) || !isfinite(fakeIncl) || !isfinite(flatWeightIncl))
1539-
continue;
1542+
continue;
15401543

15411544
for (int ieta = 0; ieta < KNEta; ++ieta) {
15421545
if (eta <= etaLw[ieta] || eta > etaUp[ieta])

0 commit comments

Comments
 (0)