Skip to content

Commit 77d68f5

Browse files
EmilGormEmilGorm
authored
[PWGCF] fix pid efficiency logic, counting logic (#15514)
1 parent 75d6966 commit 77d68f5

File tree

2 files changed

+98
-61
lines changed

2 files changed

+98
-61
lines changed

‎PWGCF/GenericFramework/Core/FlowContainer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ TH1D* FlowContainer::GetCorrXXVsPt(const char* order, double lminmulti, double l
422422
TProfile* profY = rhProfSub->ProfileY("profY", minm, maxm);
423423
TH1D* histY = ProfToHist(profY);
424424
TH1D* hist = new TH1D("temphist", "temphist", fNbinsPt, fbinsPt);
425-
for (int ibin = 1; ibin < hist->GetNbinsX(); ibin++) {
425+
for (int ibin = 1; ibin <= hist->GetNbinsX(); ibin++) {
426426
TString bLabel = rhProfSub->GetYaxis()->GetBinLabel(ibin + ybn1 - 1);
427427
hist->GetXaxis()->SetBinLabel(ibin, bLabel.Data());
428428
hist->SetBinContent(ibin, histY->GetBinContent(ibin + ybn1 - 1));

‎PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx‎

Lines changed: 97 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ struct FlowGenericFramework {
572572
registry.add("K0/hK0Eta", "", {HistType::kTH1D, {etaAxis}});
573573
registry.add("K0/hK0Mass_sparse", "", {HistType::kTHnSparseF, {{axisK0Mass, ptAxis, nchAxis}}});
574574
registry.add("K0/hK0s", "", {HistType::kTH1D, {singleCount}});
575+
registry.add("K0/hK0s_corrected", "", {HistType::kTH1D, {singleCount}});
575576

576577
registry.add("K0/hK0Count", "Number of K0;; Count", {HistType::kTH1D, {{10, 0.5, 10.5}}});
577578
registry.get<TH1>(HIST("K0/hK0Count"))->GetXaxis()->SetBinLabel(kFillCandidate, "K0 candidates");
@@ -602,6 +603,7 @@ struct FlowGenericFramework {
602603
registry.add("Lambda/hAntiLambdaEta", "", {HistType::kTH1D, {etaAxis}});
603604
registry.add("Lambda/hAntiLambdaMass_sparse", "", {HistType::kTHnSparseF, {{axisLambdaMass, ptAxis, nchAxis}}});
604605
registry.add("Lambda/hLambdas", "", {HistType::kTH1D, {singleCount}});
606+
registry.add("Lambda/hLambdas_corrected", "", {HistType::kTH1D, {singleCount}});
605607

606608
registry.add("Lambda/hLambdaCount", "Number of Lambda;; Count", {HistType::kTH1D, {{10, 0.5, 10.5}}});
607609
registry.get<TH1>(HIST("Lambda/hLambdaCount"))->GetXaxis()->SetBinLabel(kFillCandidate, "Lambda candidates");
@@ -855,7 +857,7 @@ struct FlowGenericFramework {
855857
}
856858
LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), (void*)cfg.mEfficiency);
857859
} else {
858-
std::vector<std::string> species = {"ch", "pi", "ka", "pr", "k0", "lambda"};
860+
std::vector<std::string> species = {"ch", "pi", "ka", "pr"};
859861
for (const auto& sp : species) {
860862
cfg.mPIDEfficiencies.push_back(ccdb->getForTimeStamp<TH1D>(cfgEfficiency.value + "/" + sp, timestamp));
861863
if (cfg.mPIDEfficiencies.back() == nullptr)
@@ -1203,13 +1205,14 @@ struct FlowGenericFramework {
12031205
template <DataType dt>
12041206
void fillOutputContainers(const float& centmult, const double& rndm, AcceptedTracks acceptedtracks)
12051207
{
1206-
for (auto container : fFCpts) {
1208+
for (auto& container : fFCpts) {
12071209
container->calculateCorrelations();
12081210
container->fillPtProfiles(centmult, rndm);
12091211
container->fillCMProfiles(centmult, rndm);
1210-
if (!cfgUseGapMethod)
1211-
container->fillVnPtStdProfiles(centmult, rndm);
12121212
}
1213+
if (!cfgUseGapMethod)
1214+
fFCpts[0]->fillVnPtStdProfiles(centmult, rndm);
1215+
12131216
for (uint l_ind = 0; l_ind < corrconfigs.size(); ++l_ind) {
12141217
if (!corrconfigs.at(l_ind).pTDif) {
12151218
auto dnx = fGFW->Calculate(corrconfigs.at(l_ind), 0, kTRUE).real();
@@ -1219,9 +1222,7 @@ struct FlowGenericFramework {
12191222
if (std::abs(val) < 1) {
12201223
(dt == kGen) ? fFCgen->FillProfile(corrconfigs.at(l_ind).Head.c_str(), centmult, val, dnx, rndm) : fFC->FillProfile(corrconfigs.at(l_ind).Head.c_str(), centmult, val, dnx, rndm);
12211224
if (cfgUseGapMethod) {
1222-
for (auto container : fFCpts) {
1223-
container->fillVnPtProfiles(centmult, val, dnx, rndm, o2::analysis::gfw::configs.GetpTCorrMasks()[l_ind]);
1224-
}
1225+
fFCpts[0]->fillVnPtProfiles(centmult, val, dnx, rndm, o2::analysis::gfw::configs.GetpTCorrMasks()[l_ind]);
12251226
}
12261227
}
12271228
continue;
@@ -1235,8 +1236,8 @@ struct FlowGenericFramework {
12351236
(dt == kGen) ? fFCgen->FillProfile(Form("%s_pt_%i", corrconfigs.at(l_ind).Head.c_str(), i), centmult, val, dnx, rndm) : fFC->FillProfile(Form("%s_pt_%i", corrconfigs.at(l_ind).Head.c_str(), i), centmult, val, dnx, rndm);
12361237
}
12371238
}
1238-
float chtotal = (cfgUseNchCorrection) ? acceptedtracks.total : acceptedtracks.total_uncorr;
12391239

1240+
double chtotal = (cfgUseNchCorrection) ? acceptedtracks.total : acceptedtracks.total_uncorr;
12401241
// calculate fractions
12411242
std::vector<std::vector<double>> inputs = {acceptedtracks.nch, acceptedtracks.npi, acceptedtracks.nka, acceptedtracks.npr};
12421243
std::vector<std::vector<double>> fractions;
@@ -1246,9 +1247,9 @@ struct FlowGenericFramework {
12461247
fractions.emplace_back();
12471248
fractions.back().reserve(vec.size());
12481249

1249-
float total = chtotal;
1250+
double total = chtotal;
12501251
if (cfgUsePIDTotal)
1251-
(pidcounter) ? acceptedtracks.pidtotal[pidcounter] : chtotal;
1252+
total = (pidcounter) ? acceptedtracks.pidtotal[pidcounter - 1] : chtotal;
12521253

12531254
if (total == 0.) {
12541255
++pidcounter;
@@ -1259,6 +1260,7 @@ struct FlowGenericFramework {
12591260
[&](double x) { return x / total; });
12601261
++pidcounter;
12611262
}
1263+
12621264
for (std::size_t i = 0; i < fractions[0].size(); ++i)
12631265
registry.fill(HIST("npt_ch"), fPtAxis->GetBinCenter(i + 1), centmult, fractions[0][i]);
12641266
for (std::size_t i = 0; i < fractions[1].size(); ++i)
@@ -1267,6 +1269,10 @@ struct FlowGenericFramework {
12671269
registry.fill(HIST("npt_ka"), fPtAxis->GetBinCenter(i + 1), centmult, fractions[2][i]);
12681270
for (std::size_t i = 0; i < fractions[3].size(); ++i)
12691271
registry.fill(HIST("npt_pr"), fPtAxis->GetBinCenter(i + 1), centmult, fractions[3][i]);
1272+
1273+
if (corrconfigsradial.size() < 4)
1274+
return;
1275+
12701276
for (uint l_ind = 0; l_ind < 4; ++l_ind) {
12711277
for (int i = 1; i <= fPtAxis->GetNbins(); i++) {
12721278
auto dnx = fGFW->Calculate(corrconfigsradial.at(l_ind), i - 1, kTRUE).real();
@@ -1349,51 +1355,50 @@ struct FlowGenericFramework {
13491355
// Process V0s
13501356
for (const auto& v0 : v0s) {
13511357
if (resoSwitchVals[K0][kUseParticle]) {
1352-
if (selectK0(collision, v0, centrality)) {
1358+
double weff = 1;
1359+
if (selectK0(collision, v0, centrality, weff)) {
13531360
int ptBinIndex = fPtAxis->FindBin(v0.pt()) - 1;
13541361
if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
13551362
if (v0.mK0Short() < cfgPIDCuts.cfgK0SignalMin)
1356-
npt_resonances[0][ptBinIndex] += getEfficiency(v0);
1363+
npt_resonances[0][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
13571364
else if (v0.mK0Short() > cfgPIDCuts.cfgK0SignalMax)
1358-
npt_resonances[2][ptBinIndex] += getEfficiency(v0);
1365+
npt_resonances[2][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
13591366
else
1360-
npt_resonances[1][ptBinIndex] += getEfficiency(v0);
1361-
registry.fill(HIST("K0/hK0s"), 1);
1367+
npt_resonances[1][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
13621368
}
13631369
}
13641370
}
13651371
// Add lambdabar
13661372
if (resoSwitchVals[LAMBDA][kUseParticle]) {
1367-
if (selectLambda(collision, v0, centrality)) {
1373+
double weff = 1.;
1374+
if (selectLambda(collision, v0, centrality, weff)) {
13681375
int ptBinIndex = fPtAxis->FindBin(v0.pt()) - 1;
13691376
if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
13701377
if (v0.mLambda() < cfgPIDCuts.cfgLambdaSignalMin)
1371-
npt_resonances[3][ptBinIndex] += getEfficiency(v0);
1378+
npt_resonances[3][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
13721379
else if (v0.mLambda() > cfgPIDCuts.cfgLambdaSignalMax)
1373-
npt_resonances[5][ptBinIndex] += getEfficiency(v0);
1380+
npt_resonances[5][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
13741381
else
1375-
npt_resonances[4][ptBinIndex] += getEfficiency(v0);
1376-
registry.fill(HIST("Lambda/hLambdas"), 1);
1382+
npt_resonances[4][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
13771383
}
13781384
}
13791385
}
13801386
}
1381-
float chtotal = (cfgUseNchCorrection) ? acceptedTracks.total : acceptedTracks.total_uncorr;
1387+
double chtotal = (cfgUseNchCorrection) ? acceptedTracks.total : acceptedTracks.total_uncorr;
13821388
// calculate fractions
13831389
std::vector<std::vector<float>> fractions_resonances = npt_resonances;
13841390
int pidcounter = 0;
1385-
for (const auto& vec : fractions_resonances) {
1386-
float total = chtotal;
1391+
for (auto& vec : fractions_resonances) {
1392+
double total = chtotal;
13871393
if (cfgUsePIDTotal)
1388-
(pidcounter) ? std::accumulate(vec.begin(), vec.end(), 0) : chtotal;
1394+
total = (pidcounter) ? std::accumulate(vec.begin(), vec.end(), 0.f) : chtotal;
13891395

13901396
if (total == 0.) {
13911397
++pidcounter;
13921398
continue;
13931399
}
1394-
std::transform(vec.begin(), vec.end(),
1395-
std::back_inserter(fractions_resonances.back()),
1396-
[&](double x) { return x / total; });
1400+
std::transform(vec.begin(), vec.end(), vec.begin(),
1401+
[&](float x) { return x / total; });
13971402
++pidcounter;
13981403
}
13991404
for (std::size_t i = 0; i < fractions_resonances[0].size(); ++i)
@@ -1408,6 +1413,7 @@ struct FlowGenericFramework {
14081413
registry.fill(HIST("npt_Lambda_sb2"), fPtAxis->GetBinCenter(i + 1), centrality, fractions_resonances[5][i]);
14091414
for (std::size_t i = 0; i < fractions_resonances[4].size(); ++i)
14101415
registry.fill(HIST("npt_Lambda_sig"), fPtAxis->GetBinCenter(i + 1), centrality, fractions_resonances[4][i]);
1416+
14111417
for (uint l_ind = 4; l_ind < corrconfigsradial.size(); ++l_ind) {
14121418
for (int i = 1; i <= fPtAxis->GetNbins(); i++) {
14131419
auto dnx = fGFW->Calculate(corrconfigsradial.at(l_ind), i - 1, kTRUE).real();
@@ -1458,8 +1464,10 @@ struct FlowGenericFramework {
14581464
if (!nchSelected(track))
14591465
return;
14601466

1467+
double weffCh = getEfficiency(track, 0);
14611468
if (std::abs(track.eta()) < cfgEtaNch) {
1462-
acceptedTracks.total += getEfficiency(track, 0);
1469+
if (weffCh > 0)
1470+
acceptedTracks.total += weffCh;
14631471
++acceptedTracks.total_uncorr;
14641472
}
14651473

@@ -1477,18 +1485,21 @@ struct FlowGenericFramework {
14771485
}
14781486

14791487
if (std::abs(track.eta()) < cfgEtaNch) {
1480-
if (pidIndex)
1481-
acceptedTracks.pidtotal[pidIndex - 1] += getEfficiency(track, pidIndex);
1488+
double weff = getEfficiency(track, pidIndex);
1489+
1490+
if (pidIndex && weff > 0)
1491+
acceptedTracks.pidtotal[pidIndex - 1] += weff;
14821492

14831493
int ptBinIndex = fPtAxis->FindBin(track.pt()) - 1;
14841494
if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
1485-
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, 0) : 1.0;
1486-
if (pidIndex == 1)
1487-
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
1488-
if (pidIndex == 2)
1489-
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
1490-
if (pidIndex == 3)
1491-
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
1495+
if (weffCh > 0)
1496+
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? weffCh : 1.0;
1497+
if (pidIndex == 1 && weff > 0)
1498+
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
1499+
if (pidIndex == 2 && weff > 0)
1500+
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
1501+
if (pidIndex == 3 && weff > 0)
1502+
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
14921503
}
14931504
}
14941505

@@ -1557,8 +1568,10 @@ struct FlowGenericFramework {
15571568
if (!nchSelected(track))
15581569
return;
15591570

1571+
double weffCh = getEfficiency(track, 0);
15601572
if (std::abs(track.eta()) < cfgEtaNch) {
1561-
acceptedTracks.total += getEfficiency(track, 0);
1573+
if (weffCh > 0)
1574+
acceptedTracks.total += (cfgUseNchCorrection) ? weffCh : 1.0;
15621575
++acceptedTracks.total_uncorr;
15631576
}
15641577

@@ -1569,23 +1582,23 @@ struct FlowGenericFramework {
15691582
int pidIndex = getNsigmaPID(track);
15701583

15711584
if (std::abs(track.eta()) < cfgEtaNch) {
1572-
if (pidIndex)
1573-
acceptedTracks.pidtotal[pidIndex - 1] += getEfficiency(track, pidIndex);
1585+
double weff = getEfficiency(track, pidIndex);
1586+
if (pidIndex && weff > 0)
1587+
acceptedTracks.pidtotal[pidIndex - 1] += weff;
15741588

1575-
if (pidIndex)
1576-
acceptedTracks.pidtotal[pidIndex - 1] += getEfficiency(track);
15771589
int ptBinIndex = fPtAxis->FindBin(track.pt()) - 1;
15781590

15791591
if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
1580-
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, 0) : 1.0;
1581-
if (pidIndex == 1) {
1582-
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
1592+
if (weffCh > 0)
1593+
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? weffCh : 1.0;
1594+
if (pidIndex == 1 && weff > 0) {
1595+
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
15831596
}
1584-
if (pidIndex == 2) {
1585-
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
1597+
if (pidIndex == 2 && weff > 0) {
1598+
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
15861599
}
1587-
if (pidIndex == 3) {
1588-
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
1600+
if (pidIndex == 3 && weff > 0) {
1601+
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
15891602
}
15901603
}
15911604
}
@@ -1636,7 +1649,7 @@ struct FlowGenericFramework {
16361649
}
16371650

16381651
template <typename TCollision, typename TV0>
1639-
bool selectK0(TCollision const& collision, TV0 const& v0, const double& centrality)
1652+
bool selectK0(TCollision const& collision, TV0 const& v0, const double& centrality, double& weff)
16401653
{
16411654

16421655
double mass_K0s = v0.mK0Short();
@@ -1686,11 +1699,20 @@ struct FlowGenericFramework {
16861699
registry.fill(HIST("K0/PiMinusTPC_K0"), negtrack.pt(), negtrack.tpcNSigmaKa());
16871700
registry.fill(HIST("K0/PiMinusTOF_K0"), negtrack.pt(), negtrack.tofNSigmaKa());
16881701

1702+
registry.fill(HIST("K0/hK0s"), 1);
1703+
if (cfgUsePIDEfficiencies) {
1704+
double weff_d1 = getEfficiency(postrack, 1);
1705+
double weff_d2 = getEfficiency(negtrack, 1);
1706+
weff = weff_d1 * weff_d2;
1707+
if (weff > 0)
1708+
registry.fill(HIST("K0/hK0s_corrected"), weff);
1709+
}
1710+
16891711
return true;
16901712
}
16911713

16921714
template <typename TCollision, typename TV0>
1693-
bool selectLambda(TCollision const& collision, TV0 const& v0, const double& centrality)
1715+
bool selectLambda(TCollision const& collision, TV0 const& v0, const double& centrality, double& weff)
16941716
{
16951717
bool isL = false; // Is lambda candidate
16961718
bool isAL = false; // Is anti-lambda candidate
@@ -1764,6 +1786,15 @@ struct FlowGenericFramework {
17641786
registry.fill(HIST("Lambda/PrPlusTOF_L"), postrack.pt(), postrack.tofNSigmaKa());
17651787
registry.fill(HIST("Lambda/PiMinusTPC_L"), negtrack.pt(), negtrack.tpcNSigmaKa());
17661788
registry.fill(HIST("Lambda/PiMinusTOF_L"), negtrack.pt(), negtrack.tofNSigmaKa());
1789+
1790+
registry.fill(HIST("Lambda/hLambdas"), 1);
1791+
if (cfgUsePIDEfficiencies) {
1792+
double weff_d1 = getEfficiency(postrack, 3);
1793+
double weff_d2 = getEfficiency(negtrack, 1);
1794+
weff = weff_d1 * weff_d2;
1795+
if (weff > 0)
1796+
registry.fill(HIST("Lambda/hLambdas_corrected"), weff);
1797+
}
17671798
}
17681799
if (isAL) {
17691800
registry.fill(HIST("Lambda/hAntiLambdaMass_sparse"), mantilambda, v0.pt(), centrality);
@@ -1773,6 +1804,15 @@ struct FlowGenericFramework {
17731804
registry.fill(HIST("Lambda/PiPlusTOF_AL"), postrack.pt(), postrack.tofNSigmaKa());
17741805
registry.fill(HIST("Lambda/PrMinusTPC_AL"), negtrack.pt(), negtrack.tpcNSigmaKa());
17751806
registry.fill(HIST("Lambda/PrMinusTOF_AL"), negtrack.pt(), negtrack.tofNSigmaKa());
1807+
1808+
registry.fill(HIST("Lambda/hLambdas"), 1);
1809+
if (cfgUsePIDEfficiencies) {
1810+
double weff_d1 = getEfficiency(postrack, 1);
1811+
double weff_d2 = getEfficiency(negtrack, 3);
1812+
weff = weff_d1 * weff_d2;
1813+
if (weff > 0)
1814+
registry.fill(HIST("Lambda/hLambdas_corrected"), weff);
1815+
}
17761816
}
17771817
return true;
17781818
}
@@ -1808,25 +1848,22 @@ struct FlowGenericFramework {
18081848
bool withinPtNch = (track.pt() > ptmins[0] && track.pt() < ptmaxs[0]);
18091849
if (!withinPtPOI && !withinPtRef)
18101850
return;
1811-
double weff = (dt == kGen) ? 1. : getEfficiency(track, pid_index);
1812-
double weffInclusive = (dt == kGen) ? 1. : getEfficiency(track, 0);
1813-
if (weff < 0)
1814-
return;
1851+
18151852
double waccRef = (dt == kGen) ? 1. : getAcceptance(track, vtxz, 0);
18161853
double waccPOI = (dt == kGen) ? 1. : withinPtPOI ? getAcceptance(track, vtxz, pid_index + 1)
18171854
: getAcceptance(track, vtxz, 0); //
18181855
if (withinPtRef && withinPtPOI && pid_index)
18191856
waccRef = waccPOI; // if particle is both (then it's overlap), override ref with POI
18201857
if (withinPtRef)
1821-
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccRef * weffInclusive, 1);
1858+
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccRef, 1);
18221859
if (withinPtPOI && pid_index)
1823-
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff, (1 << (pid_index + 1)));
1860+
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, (1 << (pid_index + 1)));
18241861
if (withinPtNch)
1825-
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff * weffInclusive, 2);
1862+
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, 2);
18261863
if (withinPtPOI && withinPtRef && pid_index)
1827-
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff, (1 << (pid_index + 5)));
1864+
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, (1 << (pid_index + 5)));
18281865
if (withinPtNch && withinPtRef)
1829-
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff * weffInclusive, 32);
1866+
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, 32);
18301867
} else { // Analysing only integrated flow
18311868
bool withinPtRef = (track.pt() > o2::analysis::gfw::ptreflow && track.pt() < o2::analysis::gfw::ptrefup);
18321869
bool withinPtPOI = (track.pt() > o2::analysis::gfw::ptpoilow && track.pt() < o2::analysis::gfw::ptpoiup);

0 commit comments

Comments
 (0)