Skip to content

Commit 64fd820

Browse files
committed
Fixed a strange bug where code comments were flagged as errors by the linter, and fixed the magic number issue.
1 parent c10d0d0 commit 64fd820

1 file changed

Lines changed: 11 additions & 18 deletions

File tree

PWGCF/Flow/Tasks/pidFlowPtCorr.cxx

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ using namespace o2::framework::expressions;
6868

6969
struct PidFlowPtCorr {
7070
// configurable
71+
double minVal4Float = 1e-3;
72+
double pidParticleNumber = 3;
7173

7274
O2_DEFINE_CONFIGURABLE(cfgCutVertex, float, 10.0f, "Accepted z-vertex range")
7375
O2_DEFINE_CONFIGURABLE(cfgCutChi2prTPCcls, float, 2.5, "Chi2 per TPC clusters")
@@ -855,15 +857,6 @@ struct PidFlowPtCorr {
855857
return resultKaon;
856858
}
857859

858-
/**
859-
* @brief Particle Identification using circular cut on TPC-TOF nSigma plane
860-
*
861-
* @param track Input track object to be identified
862-
* @return int PID code (-1=unknown, 1=pion, 2=kaon, 3=proton)
863-
* @note Cuts on sqrt(nsigmaTPC^2 + nsigmaTOF^2) < 2 when TOF is available
864-
* Falls back to |nsigmaTPC| < 2 when TOF is not in valid pt range
865-
* Rejects tracks that satisfy multiple particle hypotheses
866-
*/
867860
template <typename TrackObject>
868861
int getPidWithCircleCut(TrackObject const& track)
869862
{
@@ -1078,7 +1071,7 @@ struct PidFlowPtCorr {
10781071

10791072
if (switchsOpts.cfgClosureTest.value != 0) {
10801073
double npair4c22pure = fGFW->Calculate(corrconfigs.at(29), 0, kTRUE).real();
1081-
if (npair4c22pure > 1e-3)
1074+
if (npair4c22pure > minVal4Float)
10821075
registry.fill(HIST("meanptCentNbs/hPionMeanptWeightC22pure"),
10831076
pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap,
10841077
pidPtSum / nPid,
@@ -1383,7 +1376,7 @@ struct PidFlowPtCorr {
13831376
LOGF(warning, "eff path pid 1d size != 3, skip pid eff 1d load");
13841377
break;
13851378
}
1386-
for (int i = 0; i < 3; i++) {
1379+
for (int i = 0; i < pidParticleNumber; i++) {
13871380
mEfficiency.push_back(ccdb->getForTimeStamp<TH1>(effPathPid[i], timestamp));
13881381
}
13891382
if (mEfficiency.size() == static_cast<uint64_t>(3)) {
@@ -1398,7 +1391,7 @@ struct PidFlowPtCorr {
13981391
LOGF(warning, "eff path for its pid 1d size != 3, skip its pid eff 1d load");
13991392
break;
14001393
}
1401-
for (int i = 0; i < 3; i++) {
1394+
for (int i = 0; i < pidParticleNumber; i++) {
14021395
mEfficiency4ITSOnly.push_back(ccdb->getForTimeStamp<TH1>(effPathPid4ITSOnly[i], timestamp));
14031396
}
14041397
if (mEfficiency4ITSOnly.size() == static_cast<uint64_t>(3)) {
@@ -1501,9 +1494,9 @@ struct PidFlowPtCorr {
15011494

15021495
/// @todo add pid NUE eff
15031496
case 3: // pid
1504-
if (sizeOfEffVec != 3)
1497+
if (sizeOfEffVec != pidParticleNumber)
15051498
break;
1506-
if (sizeOfEffVec4ITS != 3)
1499+
if (sizeOfEffVec4ITS != pidParticleNumber)
15071500
break;
15081501

15091502
break;
@@ -2255,7 +2248,7 @@ struct PidFlowPtCorr {
22552248
fFCPr->FillProfile("hMeanPt", cent, (protonPtSum / nProtonWeighted), nProtonWeighted, rndm);
22562249

22572250
double nchDiff = nch * nch - nchSquare;
2258-
if (nchDiff > 1e-3) {
2251+
if (nchDiff > minVal4Float) {
22592252
fFCCh->FillProfile("ptSquareAve", cent,
22602253
(ptSum * ptSum - ptSquareSum) / nchDiff,
22612254
nchDiff, rndm);
@@ -2266,7 +2259,7 @@ struct PidFlowPtCorr {
22662259
}
22672260

22682261
double pionDiff = nPionWeighted * nPionWeighted - nPionSquare;
2269-
if (pionDiff > 1e-3) {
2262+
if (pionDiff > minVal4Float) {
22702263
fFCPi->FillProfile("ptSquareAve", cent,
22712264
(pionPtSum * pionPtSum - pionPtSquareSum) / pionDiff,
22722265
pionDiff, rndm);
@@ -2277,7 +2270,7 @@ struct PidFlowPtCorr {
22772270
}
22782271

22792272
double kaonDiff = nKaonWeighted * nKaonWeighted - nKaonSquare;
2280-
if (kaonDiff > 1e-3) {
2273+
if (kaonDiff > minVal4Float) {
22812274
fFCKa->FillProfile("ptSquareAve", cent,
22822275
(kaonPtSum * kaonPtSum - kaonPtSquareSum) / kaonDiff,
22832276
kaonDiff, rndm);
@@ -2288,7 +2281,7 @@ struct PidFlowPtCorr {
22882281
}
22892282

22902283
double protonDiff = nProtonWeighted * nProtonWeighted - nProtonSquare;
2291-
if (protonDiff > 1e-3) {
2284+
if (protonDiff > minVal4Float) {
22922285
fFCPr->FillProfile("ptSquareAve", cent,
22932286
(protonPtSum * protonPtSum - protonPtSquareSum) / protonDiff,
22942287
protonDiff, rndm);

0 commit comments

Comments
 (0)