Skip to content

Commit f957d68

Browse files
somabhattasomabhatta
committed
Fixing isfinite to std:isfinite
1 parent 08c2426 commit f957d68

File tree

1 file changed

+45
-44
lines changed

1 file changed

+45
-44
lines changed

‎PWGCF/EbyEFluctuations/Tasks/radialFlowDecorr.cxx‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -620,12 +620,14 @@ struct RadialFlowDecorr {
620620
void declareMCFlucHists()
621621
{
622622
static constexpr int KNbinsNchFluc = 1000;
623+
624+
ConfigurableAxis nChAxis{"nChAxis", {KNbinsNch, KBinOffset, KNchMax}, "PV-contributor track multiplicity axis"};
625+
ConfigurableAxis nChAxis2{"nChAxis2", {KNbinsNchCoarse, KBinOffset, KNchMax}, "PV-contributor track multiplicity axis"};
626+
623627
// pT cumulants
624628
histos.add("MCGen/Prof_C2_Cent", ";cent;C_{2}", kTProfile, {centAxis});
625629
histos.add("MCGen/Prof_C2_Mult", ";N_{PV};C_{2}", kTProfile, {nChAxis});
626-
histos.add<TProfile3D>("MCGen/Prof_C2Sub_Mult_etabin_ptbin",
627-
";N_{PV};#eta-bin; p_{T}-bin", kTProfile3D,
628-
{{KNbinsNchFluc, KNchMin, KNchCoarseMax}, {KNEta + 1, -KBinOffset, KNEta + KBinOffset}, {KNpT + 1, -KBinOffset, KNpT + KBinOffset}});
630+
histos.add<TProfile3D>("MCGen/Prof_C2Sub_Mult_etabin_ptbin",";N_{PV};#eta-bin; p_{T}-bin", kTProfile3D,{{KNbinsNchFluc, KBinOffset, KNchMax}, {KNEta + 1, -KBinOffset, KNEta + KBinOffset}, {KNpT + 1, -KBinOffset, KNpT + KBinOffset}});
629631
histos.add<TProfile3D>("MCGen/Prof_ipt0_C2Sub2D_Mult_etaA_etaC", ";cent;#eta_{A};#eta_{C}", kTProfile3D, {{centAxis}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}});
630632
histos.add<TProfile3D>("MCGen/Prof_ipt1_C2Sub2D_Mult_etaA_etaC", ";cent;#eta_{A};#eta_{C}", kTProfile3D, {{centAxis}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}});
631633
histos.add<TProfile3D>("MCGen/Prof_ipt2_C2Sub2D_Mult_etaA_etaC", ";cent;#eta_{A};#eta_{C}", kTProfile3D, {{centAxis}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}});
@@ -637,8 +639,7 @@ struct RadialFlowDecorr {
637639
histos.add("MCGen/Prof_ipt2_Cov_Eta", ";#eta;cov", kTProfile, {{(KNEta - 1) / 2, 0., KEtaAxisMax}});
638640
histos.add("MCGen/Prof_C2Et_Cent", ";cent;C_{2}^{E_{T}}", kTProfile, {centAxis});
639641
histos.add("MCGen/Prof_C2Et_Mult", ";N_{PV};C_{2}^{E_{T}}", kTProfile, {nChAxis});
640-
histos.add<TProfile3D>("MCGen/Prof_C2EtSub_Mult_etabin_ptbin", ";N_{PV};#eta-bin; p_{T}-bin", kTProfile3D,
641-
{{KNbinsNchFluc, KNchMin, KNchCoarseMax}, {KNEta + 1, -KBinOffset, KNEta + KBinOffset}, {KNpT + 1, -KBinOffset, KNpT + KBinOffset}});
642+
histos.add<TProfile3D>("MCGen/Prof_C2EtSub_Mult_etabin_ptbin", ";N_{PV};#eta-bin; p_{T}-bin", kTProfile3D,{{KNbinsNchFluc, KBinOffset, KNchMax}, {KNEta + 1, -KBinOffset, KNEta + KBinOffset}, {KNpT + 1, -KBinOffset, KNpT + KBinOffset}});
642643
histos.add<TProfile3D>("MCGen/Prof_ipt0_C2EtSub2D_Mult_etaA_etaC", ";cent;#eta_{A};#eta_{C}", kTProfile3D, {{centAxis}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}});
643644
histos.add<TProfile3D>("MCGen/Prof_ipt1_C2EtSub2D_Mult_etaA_etaC", ";cent;#eta_{A};#eta_{C}", kTProfile3D, {{centAxis}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}});
644645
histos.add<TProfile3D>("MCGen/Prof_ipt2_C2EtSub2D_Mult_etaA_etaC", ";cent;#eta_{A};#eta_{C}", kTProfile3D, {{centAxis}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}, {KNEta - 1, KEtaAxisMin, KEtaAxisMax}});
@@ -1194,7 +1195,7 @@ struct RadialFlowDecorr {
11941195
}
11951196
}
11961197

1197-
if (effIncl <= 0 || !isfinite(wIncl) || !isfinite(fakeIncl) || !isfinite(flatWeightIncl))
1198+
if (effIncl <= 0 || !std::isfinite(wIncl) || !std::isfinite(fakeIncl) || !std::isfinite(flatWeightIncl))
11981199
continue;
11991200

12001201
for (int ieta = 0; ieta < KNEta; ++ieta) {
@@ -1238,7 +1239,7 @@ struct RadialFlowDecorr {
12381239
}
12391240
}
12401241

1241-
if (effPid <= KFloatEpsilon || !isfinite(wPid) || !isfinite(fakePid) || !isfinite(flatWeightPid))
1242+
if (effPid <= KFloatEpsilon || !std::isfinite(wPid) || !std::isfinite(fakePid) || !std::isfinite(flatWeightPid))
12421243
continue;
12431244

12441245
for (int ieta = 0; ieta < KNEta; ++ieta) {
@@ -1253,7 +1254,7 @@ struct RadialFlowDecorr {
12531254
}
12541255
}
12551256

1256-
if (isfinite(wIncl)) {
1257+
if (std::isfinite(wIncl)) {
12571258
if (cent < KCentTestMin) {
12581259
histos.fill(HIST("wgt_pT"), pt, wIncl);
12591260
histos.fill(HIST("Eff_pT"), pt, effIncl);
@@ -1272,81 +1273,81 @@ struct RadialFlowDecorr {
12721273

12731274
} // end track loop
12741275

1275-
if (isfinite(sumWiTruth[0][0])) {
1276+
if (std::isfinite(sumWiTruth[0][0])) {
12761277
float meanPtTruth = sumWiptiTruth[0][0] / sumWiTruth[0][0];
1277-
if (!isfinite(meanPtTruth))
1278+
if (!std::isfinite(meanPtTruth))
12781279
LOGF(info, "meanPtTruth = %.3f, num = %.3f, den =%.3f", meanPtTruth, sumWiptiTruth[0][0], sumWiTruth[0][0]);
1279-
if (!isfinite(meanPtTruth))
1280+
if (!std::isfinite(meanPtTruth))
12801281
continue;
12811282
histos.fill(HIST("MCGen/Prof_cent_Nchrec"), cent, sumWiTruth[0][0]);
12821283
histos.fill(HIST("MCGen/Prof_MeanpT_Cent"), cent, meanPtTruth);
12831284
histos.fill(HIST("MCGen/Prof_MeanpT_Mult"), col.multNTracksPV(), meanPtTruth);
12841285
}
1285-
if (isfinite(sumWiReco[0][0])) {
1286+
if (std::isfinite(sumWiReco[0][0])) {
12861287
float meanPtReco = sumWiptiReco[0][0] / sumWiReco[0][0];
1287-
if (!isfinite(meanPtReco))
1288+
if (!std::isfinite(meanPtReco))
12881289
LOGF(info, "meanPtReco = %.3f, num = %.3f, den =%.3f", meanPtReco, sumWiptiReco[0][0], sumWiReco[0][0]);
1289-
if (!isfinite(meanPtReco))
1290+
if (!std::isfinite(meanPtReco))
12901291
continue;
12911292
histos.fill(HIST("MCReco/Prof_cent_Nchrec"), cent, sumWiReco[0][0]);
12921293
histos.fill(HIST("MCReco/Prof_MeanpT_Cent"), cent, meanPtReco);
12931294
histos.fill(HIST("MCReco/Prof_MeanpT_Mult"), col.multNTracksPV(), meanPtReco);
12941295
}
1295-
if (isfinite(sumWiRecoEffCorr[0][0])) {
1296+
if (std::isfinite(sumWiRecoEffCorr[0][0])) {
12961297
float meanpTeffcorr = sumWiptiRecoEffCorr[0][0] / sumWiRecoEffCorr[0][0];
1297-
if (!isfinite(meanpTeffcorr))
1298+
if (!std::isfinite(meanpTeffcorr))
12981299
LOGF(info, "meanPtRecoEffcorr = %.3f, num = %.3f, den =%.3f", meanpTeffcorr, sumWiptiRecoEffCorr[0][0], sumWiRecoEffCorr[0][0]);
1299-
if (!isfinite(meanpTeffcorr))
1300+
if (!std::isfinite(meanpTeffcorr))
13001301
continue;
13011302
histos.fill(HIST("MCRecoEffCorr/Prof_cent_Nchrec"), cent, sumWiRecoEffCorr[0][0]);
13021303
histos.fill(HIST("MCRecoEffCorr/Prof_MeanpT_Cent"), cent, meanpTeffcorr);
13031304
histos.fill(HIST("MCRecoEffCorr/Prof_MeanpT_Mult"), col.multNTracksPV(), meanpTeffcorr);
13041305
}
13051306

1306-
if (isfinite(sumWiTruthEt[0][0])) {
1307+
if (std::isfinite(sumWiTruthEt[0][0])) {
13071308
float meanEt = sumWiptiTruthEt[0][0] / sumWiTruthEt[0][0];
1308-
if (!isfinite(meanEt))
1309+
if (!std::isfinite(meanEt))
13091310
LOGF(info, "meanEtTruthEt = %.3f, num = %.3f, den =%.3f", meanEt, sumWiptiTruthEt[0][0], sumWiTruthEt[0][0]);
1310-
if (!isfinite(meanEt))
1311+
if (!std::isfinite(meanEt))
13111312
continue;
13121313
histos.fill(HIST("MCGen/Prof_MeanEt_Cent"), cent, meanEt);
13131314
histos.fill(HIST("MCGen/Prof_MeanEt_Mult"), col.multNTracksPV(), meanEt);
13141315
}
13151316
// "MCReco"
1316-
if (isfinite(sumWiRecoEt[0][0])) {
1317+
if (std::isfinite(sumWiRecoEt[0][0])) {
13171318
float meanEt = sumWiptiRecoEt[0][0] / sumWiRecoEt[0][0];
1318-
if (!isfinite(meanEt))
1319+
if (!std::isfinite(meanEt))
13191320
LOGF(info, "meanEtRecoEt = %.3f, num = %.3f, den =%.3f", meanEt, sumWiptiRecoEt[0][0], sumWiRecoEt[0][0]);
1320-
if (!isfinite(meanEt))
1321+
if (!std::isfinite(meanEt))
13211322
continue;
13221323
histos.fill(HIST("MCReco/Prof_MeanEt_Cent"), cent, meanEt);
13231324
histos.fill(HIST("MCReco/Prof_MeanEt_Mult"), col.multNTracksPV(), meanEt);
13241325
}
13251326
// "MCRecoEffCorr"
1326-
if (isfinite(sumWiRecoEffCorrEt[0][0])) {
1327+
if (std::isfinite(sumWiRecoEffCorrEt[0][0])) {
13271328
float meanEt = sumWiptiRecoEffCorrEt[0][0] / sumWiRecoEffCorrEt[0][0];
1328-
if (!isfinite(meanEt))
1329+
if (!std::isfinite(meanEt))
13291330
LOGF(info, "meanEtRecoEffcorrEt = %.3f, num = %.3f, den =%.3f", meanEt, sumWiptiRecoEffCorrEt[0][0], sumWiRecoEffCorrEt[0][0]);
1330-
if (!isfinite(meanEt))
1331+
if (!std::isfinite(meanEt))
13311332
continue;
13321333
histos.fill(HIST("MCRecoEffCorr/Prof_MeanEt_Cent"), cent, meanEt);
13331334
histos.fill(HIST("MCRecoEffCorr/Prof_MeanEt_Mult"), col.multNTracksPV(), meanEt);
13341335
}
13351336

13361337
for (int ieta = 0; ieta < KNEta; ++ieta) {
13371338
for (int ipt = 0; ipt < KNpT; ++ipt) {
1338-
if (isfinite(sumWiTruth[ieta][ipt]))
1339+
if (std::isfinite(sumWiTruth[ieta][ipt]))
13391340
histos.fill(HIST("pmeanTruNchEtabinPtbin"), col.multNTracksPV(), ieta, ipt, sumWiptiTruth[ieta][ipt] / sumWiTruth[ieta][ipt]);
1340-
if (isfinite(sumWiReco[ieta][ipt]))
1341+
if (std::isfinite(sumWiReco[ieta][ipt]))
13411342
histos.fill(HIST("pmeanRecoNchEtabinPtbin"), col.multNTracksPV(), ieta, ipt, sumWiptiReco[ieta][ipt] / sumWiReco[ieta][ipt]);
1342-
if (isfinite(sumWiRecoEffCorr[ieta][ipt]))
1343+
if (std::isfinite(sumWiRecoEffCorr[ieta][ipt]))
13431344
histos.fill(HIST("pmeanRecoEffcorrNchEtabinPtbin"), col.multNTracksPV(), ieta, ipt, sumWiptiRecoEffCorr[ieta][ipt] / sumWiRecoEffCorr[ieta][ipt]);
13441345

1345-
if (isfinite(sumWiTruthEt[ieta][ipt]))
1346+
if (std::isfinite(sumWiTruthEt[ieta][ipt]))
13461347
histos.fill(HIST("pmeanEtTruNchEtabinPtbin"), col.multNTracksPV(), ieta, ipt, sumWiptiTruthEt[ieta][ipt] / sumWiTruthEt[ieta][ipt]);
1347-
if (isfinite(sumWiRecoEt[ieta][ipt]))
1348+
if (std::isfinite(sumWiRecoEt[ieta][ipt]))
13481349
histos.fill(HIST("pmeanEtRecoNchEtabinPtbin"), col.multNTracksPV(), ieta, ipt, sumWiptiRecoEt[ieta][ipt] / sumWiRecoEt[ieta][ipt]);
1349-
if (isfinite(sumWiRecoEffCorrEt[ieta][ipt]))
1350+
if (std::isfinite(sumWiRecoEffCorrEt[ieta][ipt]))
13501351
histos.fill(HIST("pmeanEtRecoEffcorrNchEtabinPtbin"), col.multNTracksPV(), ieta, ipt, sumWiptiRecoEffCorrEt[ieta][ipt] / sumWiRecoEffCorrEt[ieta][ipt]);
13511352
}
13521353
}
@@ -1490,7 +1491,7 @@ struct RadialFlowDecorr {
14901491
float wIncl = flatWeightIncl * (1.0 - fakeIncl) / effIncl;
14911492
if (!std::isfinite(wIncl) || wIncl <= 0.f)
14921493
continue;
1493-
if (effIncl <= 0 || !isfinite(effIncl) || !isfinite(fakeIncl) || !isfinite(flatWeightIncl))
1494+
if (effIncl <= 0 || !std::isfinite(effIncl) || !std::isfinite(fakeIncl) || !std::isfinite(flatWeightIncl))
14941495
continue;
14951496

14961497
for (int ieta = 0; ieta < KNEta; ++ieta) {
@@ -1523,7 +1524,7 @@ struct RadialFlowDecorr {
15231524
float fakePid = getEfficiency(col.multNTracksPV(), pt, eta, kCombinedPID, 1);
15241525
float flatWeightPid = getFlatteningWeight(cent, eta, phi, kCombinedPID);
15251526
float wPid = flatWeightPid * (1.0 - fakePid) / effPid;
1526-
if (effPid >= 1.f || fakePid >= 1.f || !isfinite(effPid) || effPid <= KFloatEpsilon || !isfinite(fakePid) || !isfinite(flatWeightPid))
1527+
if (effPid >= 1.f || fakePid >= 1.f || !std::isfinite(effPid) || effPid <= KFloatEpsilon || !std::isfinite(fakePid) || !std::isfinite(flatWeightPid))
15271528
continue;
15281529

15291530
for (int ieta = 0; ieta < KNEta; ++ieta) {
@@ -1557,18 +1558,18 @@ struct RadialFlowDecorr {
15571558
float mmetReco = pmeanEtRecoNchEtabinPtbinStep2->GetBinContent(ibx, iby, ibz);
15581559
float mmetRecoEffCor = pmeanEtRecoEffcorrNchEtabinPtbinStep2->GetBinContent(ibx, iby, ibz);
15591560

1560-
if (isfinite(mmptTru))
1561+
if (std::isfinite(mmptTru))
15611562
std::tie(meanTru[ieta][ipt], c2Tru[ieta][ipt]) = calculateMeanAndC2FromSums<KIntM, KIntK>(sumPmwkTru[ieta][ipt], sumWkTru[ieta][ipt], mmptTru);
1562-
if (isfinite(mmptReco))
1563+
if (std::isfinite(mmptReco))
15631564
std::tie(meanReco[ieta][ipt], c2Reco[ieta][ipt]) = calculateMeanAndC2FromSums<KIntM, KIntK>(sumPmwkReco[ieta][ipt], sumWkReco[ieta][ipt], mmptReco);
1564-
if (isfinite(mmptRecoEffCor))
1565+
if (std::isfinite(mmptRecoEffCor))
15651566
std::tie(meanRecoEffCor[ieta][ipt], c2RecoEffCor[ieta][ipt]) = calculateMeanAndC2FromSums<KIntM, KIntK>(sumPmwkRecoEffCor[ieta][ipt], sumWkRecoEffCor[ieta][ipt], mmptRecoEffCor);
15661567

1567-
if (isfinite(mmetTru))
1568+
if (std::isfinite(mmetTru))
15681569
std::tie(meanTruEt[ieta][ipt], c2TruEt[ieta][ipt]) = calculateMeanAndC2FromSums<KIntM, KIntK>(sumPmwkTruEt[ieta][ipt], sumWkTruEt[ieta][ipt], mmetTru);
1569-
if (isfinite(mmetReco))
1570+
if (std::isfinite(mmetReco))
15701571
std::tie(meanRecoEt[ieta][ipt], c2RecoEt[ieta][ipt]) = calculateMeanAndC2FromSums<KIntM, KIntK>(sumPmwkRecoEt[ieta][ipt], sumWkRecoEt[ieta][ipt], mmetReco);
1571-
if (isfinite(mmetRecoEffCor))
1572+
if (std::isfinite(mmetRecoEffCor))
15721573
std::tie(meanRecoEffCorEt[ieta][ipt], c2RecoEffCorEt[ieta][ipt]) = calculateMeanAndC2FromSums<KIntM, KIntK>(sumPmwkRecoEffCorEt[ieta][ipt], sumWkRecoEffCorEt[ieta][ipt], mmetRecoEffCor);
15731574
}
15741575
}
@@ -2090,16 +2091,16 @@ struct RadialFlowDecorr {
20902091
}
20912092
}
20922093
histos.fill(HIST("Prof_cent_Nchrec"), cent, sumWi[0][0]);
2093-
if (isfinite(sumWi[0][0]))
2094+
if (std::isfinite(sumWi[0][0]))
20942095
histos.fill(HIST("Prof_MeanpT_Cent"), cent, sumWipti[0][0] / sumWi[0][0]);
2095-
if (isfinite(sumWiEt[0][0]))
2096+
if (std::isfinite(sumWiEt[0][0]))
20962097
histos.fill(HIST("Prof_MeanEt_Cent"), cent, sumWiEtVal[0][0] / sumWiEt[0][0]);
20972098

20982099
for (int ieta = 0; ieta < KNEta; ++ieta) {
20992100
for (int ipt = 0; ipt < KNpT; ++ipt) {
2100-
if (isfinite(sumWi[ieta][ipt]))
2101+
if (std::isfinite(sumWi[ieta][ipt]))
21012102
histos.fill(HIST("pmean_nch_etabin_ptbin"), coll.multNTracksPV(), ieta, ipt, sumWipti[ieta][ipt] / sumWi[ieta][ipt]);
2102-
if (isfinite(sumWiEt[ieta][ipt]))
2103+
if (std::isfinite(sumWiEt[ieta][ipt]))
21032104
histos.fill(HIST("pmeanEt_nch_etabin_ptbin"), coll.multNTracksPV(), ieta, ipt, sumWiEtVal[ieta][ipt] / sumWiEt[ieta][ipt]);
21042105
}
21052106
}

0 commit comments

Comments
 (0)