Skip to content

[PWGCF] fix pid efficiency logic, counting logic #15514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenyaCern merged 2 commits into from
Mar 27, 2026
+98 −61
Merged

[PWGCF] fix pid efficiency logic, counting logic #15514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad8793
fix pid efficiency logic, counting logic
EmilGorm Mar 24, 2026
2dc6394
Merge branch 'master' into master
EmilGorm Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PWGCF/GenericFramework/Core/FlowContainer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ TH1D* FlowContainer::GetCorrXXVsPt(const char* order, double lminmulti, double l
TProfile* profY = rhProfSub->ProfileY("profY", minm, maxm);
TH1D* histY = ProfToHist(profY);
TH1D* hist = new TH1D("temphist", "temphist", fNbinsPt, fbinsPt);
for (int ibin = 1; ibin < hist->GetNbinsX(); ibin++) {
for (int ibin = 1; ibin <= hist->GetNbinsX(); ibin++) {
TString bLabel = rhProfSub->GetYaxis()->GetBinLabel(ibin + ybn1 - 1);
hist->GetXaxis()->SetBinLabel(ibin, bLabel.Data());
hist->SetBinContent(ibin, histY->GetBinContent(ibin + ybn1 - 1));
Expand Down
157 changes: 97 additions & 60 deletions PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ struct FlowGenericFramework {
registry.add("K0/hK0Eta", "", {HistType::kTH1D, {etaAxis}});
registry.add("K0/hK0Mass_sparse", "", {HistType::kTHnSparseF, {{axisK0Mass, ptAxis, nchAxis}}});
registry.add("K0/hK0s", "", {HistType::kTH1D, {singleCount}});
registry.add("K0/hK0s_corrected", "", {HistType::kTH1D, {singleCount}});

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

registry.add("Lambda/hLambdaCount", "Number of Lambda;; Count", {HistType::kTH1D, {{10, 0.5, 10.5}}});
registry.get<TH1>(HIST("Lambda/hLambdaCount"))->GetXaxis()->SetBinLabel(kFillCandidate, "Lambda candidates");
Expand Down Expand Up @@ -855,7 +857,7 @@ struct FlowGenericFramework {
}
LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), (void*)cfg.mEfficiency);
} else {
std::vector<std::string> species = {"ch", "pi", "ka", "pr", "k0", "lambda"};
std::vector<std::string> species = {"ch", "pi", "ka", "pr"};
for (const auto& sp : species) {
cfg.mPIDEfficiencies.push_back(ccdb->getForTimeStamp<TH1D>(cfgEfficiency.value + "/" + sp, timestamp));
if (cfg.mPIDEfficiencies.back() == nullptr)
Expand Down Expand Up @@ -1203,13 +1205,14 @@ struct FlowGenericFramework {
template <DataType dt>
void fillOutputContainers(const float& centmult, const double& rndm, AcceptedTracks acceptedtracks)
{
for (auto container : fFCpts) {
for (auto& container : fFCpts) {
container->calculateCorrelations();
container->fillPtProfiles(centmult, rndm);
container->fillCMProfiles(centmult, rndm);
if (!cfgUseGapMethod)
container->fillVnPtStdProfiles(centmult, rndm);
}
if (!cfgUseGapMethod)
fFCpts[0]->fillVnPtStdProfiles(centmult, rndm);

for (uint l_ind = 0; l_ind < corrconfigs.size(); ++l_ind) {
if (!corrconfigs.at(l_ind).pTDif) {
auto dnx = fGFW->Calculate(corrconfigs.at(l_ind), 0, kTRUE).real();
Expand All @@ -1219,9 +1222,7 @@ struct FlowGenericFramework {
if (std::abs(val) < 1) {
(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);
if (cfgUseGapMethod) {
for (auto container : fFCpts) {
container->fillVnPtProfiles(centmult, val, dnx, rndm, o2::analysis::gfw::configs.GetpTCorrMasks()[l_ind]);
}
fFCpts[0]->fillVnPtProfiles(centmult, val, dnx, rndm, o2::analysis::gfw::configs.GetpTCorrMasks()[l_ind]);
}
}
continue;
Expand All @@ -1235,8 +1236,8 @@ struct FlowGenericFramework {
(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);
}
}
float chtotal = (cfgUseNchCorrection) ? acceptedtracks.total : acceptedtracks.total_uncorr;

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

float total = chtotal;
double total = chtotal;
if (cfgUsePIDTotal)
(pidcounter) ? acceptedtracks.pidtotal[pidcounter] : chtotal;
total = (pidcounter) ? acceptedtracks.pidtotal[pidcounter - 1] : chtotal;

if (total == 0.) {
++pidcounter;
Expand All @@ -1259,6 +1260,7 @@ struct FlowGenericFramework {
[&](double x) { return x / total; });
++pidcounter;
}

for (std::size_t i = 0; i < fractions[0].size(); ++i)
registry.fill(HIST("npt_ch"), fPtAxis->GetBinCenter(i + 1), centmult, fractions[0][i]);
for (std::size_t i = 0; i < fractions[1].size(); ++i)
Expand All @@ -1267,6 +1269,10 @@ struct FlowGenericFramework {
registry.fill(HIST("npt_ka"), fPtAxis->GetBinCenter(i + 1), centmult, fractions[2][i]);
for (std::size_t i = 0; i < fractions[3].size(); ++i)
registry.fill(HIST("npt_pr"), fPtAxis->GetBinCenter(i + 1), centmult, fractions[3][i]);

if (corrconfigsradial.size() < 4)
return;

for (uint l_ind = 0; l_ind < 4; ++l_ind) {
for (int i = 1; i <= fPtAxis->GetNbins(); i++) {
auto dnx = fGFW->Calculate(corrconfigsradial.at(l_ind), i - 1, kTRUE).real();
Expand Down Expand Up @@ -1349,51 +1355,50 @@ struct FlowGenericFramework {
// Process V0s
for (const auto& v0 : v0s) {
if (resoSwitchVals[K0][kUseParticle]) {
if (selectK0(collision, v0, centrality)) {
double weff = 1;
if (selectK0(collision, v0, centrality, weff)) {
int ptBinIndex = fPtAxis->FindBin(v0.pt()) - 1;
if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
if (v0.mK0Short() < cfgPIDCuts.cfgK0SignalMin)
npt_resonances[0][ptBinIndex] += getEfficiency(v0);
npt_resonances[0][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
else if (v0.mK0Short() > cfgPIDCuts.cfgK0SignalMax)
npt_resonances[2][ptBinIndex] += getEfficiency(v0);
npt_resonances[2][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
else
npt_resonances[1][ptBinIndex] += getEfficiency(v0);
registry.fill(HIST("K0/hK0s"), 1);
npt_resonances[1][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
}
}
}
// Add lambdabar
if (resoSwitchVals[LAMBDA][kUseParticle]) {
if (selectLambda(collision, v0, centrality)) {
double weff = 1.;
if (selectLambda(collision, v0, centrality, weff)) {
int ptBinIndex = fPtAxis->FindBin(v0.pt()) - 1;
if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
if (v0.mLambda() < cfgPIDCuts.cfgLambdaSignalMin)
npt_resonances[3][ptBinIndex] += getEfficiency(v0);
npt_resonances[3][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
else if (v0.mLambda() > cfgPIDCuts.cfgLambdaSignalMax)
npt_resonances[5][ptBinIndex] += getEfficiency(v0);
npt_resonances[5][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
else
npt_resonances[4][ptBinIndex] += getEfficiency(v0);
registry.fill(HIST("Lambda/hLambdas"), 1);
npt_resonances[4][ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
}
}
}
}
float chtotal = (cfgUseNchCorrection) ? acceptedTracks.total : acceptedTracks.total_uncorr;
double chtotal = (cfgUseNchCorrection) ? acceptedTracks.total : acceptedTracks.total_uncorr;
// calculate fractions
std::vector<std::vector<float>> fractions_resonances = npt_resonances;
int pidcounter = 0;
for (const auto& vec : fractions_resonances) {
float total = chtotal;
for (auto& vec : fractions_resonances) {
double total = chtotal;
if (cfgUsePIDTotal)
(pidcounter) ? std::accumulate(vec.begin(), vec.end(), 0) : chtotal;
total = (pidcounter) ? std::accumulate(vec.begin(), vec.end(), 0.f) : chtotal;

if (total == 0.) {
++pidcounter;
continue;
}
std::transform(vec.begin(), vec.end(),
std::back_inserter(fractions_resonances.back()),
[&](double x) { return x / total; });
std::transform(vec.begin(), vec.end(), vec.begin(),
[&](float x) { return x / total; });
++pidcounter;
}
for (std::size_t i = 0; i < fractions_resonances[0].size(); ++i)
Expand All @@ -1408,6 +1413,7 @@ struct FlowGenericFramework {
registry.fill(HIST("npt_Lambda_sb2"), fPtAxis->GetBinCenter(i + 1), centrality, fractions_resonances[5][i]);
for (std::size_t i = 0; i < fractions_resonances[4].size(); ++i)
registry.fill(HIST("npt_Lambda_sig"), fPtAxis->GetBinCenter(i + 1), centrality, fractions_resonances[4][i]);

for (uint l_ind = 4; l_ind < corrconfigsradial.size(); ++l_ind) {
for (int i = 1; i <= fPtAxis->GetNbins(); i++) {
auto dnx = fGFW->Calculate(corrconfigsradial.at(l_ind), i - 1, kTRUE).real();
Expand Down Expand Up @@ -1458,8 +1464,10 @@ struct FlowGenericFramework {
if (!nchSelected(track))
return;

double weffCh = getEfficiency(track, 0);
if (std::abs(track.eta()) < cfgEtaNch) {
acceptedTracks.total += getEfficiency(track, 0);
if (weffCh > 0)
acceptedTracks.total += weffCh;
++acceptedTracks.total_uncorr;
}

Expand All @@ -1477,18 +1485,21 @@ struct FlowGenericFramework {
}

if (std::abs(track.eta()) < cfgEtaNch) {
if (pidIndex)
acceptedTracks.pidtotal[pidIndex - 1] += getEfficiency(track, pidIndex);
double weff = getEfficiency(track, pidIndex);

if (pidIndex && weff > 0)
acceptedTracks.pidtotal[pidIndex - 1] += weff;

int ptBinIndex = fPtAxis->FindBin(track.pt()) - 1;
if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, 0) : 1.0;
if (pidIndex == 1)
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
if (pidIndex == 2)
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
if (pidIndex == 3)
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
if (weffCh > 0)
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? weffCh : 1.0;
if (pidIndex == 1 && weff > 0)
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
if (pidIndex == 2 && weff > 0)
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
if (pidIndex == 3 && weff > 0)
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
}
}

Expand Down Expand Up @@ -1557,8 +1568,10 @@ struct FlowGenericFramework {
if (!nchSelected(track))
return;

double weffCh = getEfficiency(track, 0);
if (std::abs(track.eta()) < cfgEtaNch) {
acceptedTracks.total += getEfficiency(track, 0);
if (weffCh > 0)
acceptedTracks.total += (cfgUseNchCorrection) ? weffCh : 1.0;
++acceptedTracks.total_uncorr;
}

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

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

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

if (!(ptBinIndex < 0 || ptBinIndex >= static_cast<int>(o2::analysis::gfw::ptbinning.size()))) {
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, 0) : 1.0;
if (pidIndex == 1) {
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
if (weffCh > 0)
acceptedTracks.nch[ptBinIndex] += (cfgUseNchCorrection) ? weffCh : 1.0;
if (pidIndex == 1 && weff > 0) {
acceptedTracks.npi[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
}
if (pidIndex == 2) {
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
if (pidIndex == 2 && weff > 0) {
acceptedTracks.nka[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
}
if (pidIndex == 3) {
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? getEfficiency(track, pidIndex) : 1.0;
if (pidIndex == 3 && weff > 0) {
acceptedTracks.npr[ptBinIndex] += (cfgUseNchCorrection) ? weff : 1.0;
}
}
}
Expand Down Expand Up @@ -1636,7 +1649,7 @@ struct FlowGenericFramework {
}

template <typename TCollision, typename TV0>
bool selectK0(TCollision const& collision, TV0 const& v0, const double& centrality)
bool selectK0(TCollision const& collision, TV0 const& v0, const double& centrality, double& weff)
{

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

registry.fill(HIST("K0/hK0s"), 1);
if (cfgUsePIDEfficiencies) {
double weff_d1 = getEfficiency(postrack, 1);
double weff_d2 = getEfficiency(negtrack, 1);
weff = weff_d1 * weff_d2;
if (weff > 0)
registry.fill(HIST("K0/hK0s_corrected"), weff);
}

return true;
}

template <typename TCollision, typename TV0>
bool selectLambda(TCollision const& collision, TV0 const& v0, const double& centrality)
bool selectLambda(TCollision const& collision, TV0 const& v0, const double& centrality, double& weff)
{
bool isL = false; // Is lambda candidate
bool isAL = false; // Is anti-lambda candidate
Expand Down Expand Up @@ -1764,6 +1786,15 @@ struct FlowGenericFramework {
registry.fill(HIST("Lambda/PrPlusTOF_L"), postrack.pt(), postrack.tofNSigmaKa());
registry.fill(HIST("Lambda/PiMinusTPC_L"), negtrack.pt(), negtrack.tpcNSigmaKa());
registry.fill(HIST("Lambda/PiMinusTOF_L"), negtrack.pt(), negtrack.tofNSigmaKa());

registry.fill(HIST("Lambda/hLambdas"), 1);
if (cfgUsePIDEfficiencies) {
double weff_d1 = getEfficiency(postrack, 3);
double weff_d2 = getEfficiency(negtrack, 1);
weff = weff_d1 * weff_d2;
if (weff > 0)
registry.fill(HIST("Lambda/hLambdas_corrected"), weff);
}
}
if (isAL) {
registry.fill(HIST("Lambda/hAntiLambdaMass_sparse"), mantilambda, v0.pt(), centrality);
Expand All @@ -1773,6 +1804,15 @@ struct FlowGenericFramework {
registry.fill(HIST("Lambda/PiPlusTOF_AL"), postrack.pt(), postrack.tofNSigmaKa());
registry.fill(HIST("Lambda/PrMinusTPC_AL"), negtrack.pt(), negtrack.tpcNSigmaKa());
registry.fill(HIST("Lambda/PrMinusTOF_AL"), negtrack.pt(), negtrack.tofNSigmaKa());

registry.fill(HIST("Lambda/hLambdas"), 1);
if (cfgUsePIDEfficiencies) {
double weff_d1 = getEfficiency(postrack, 1);
double weff_d2 = getEfficiency(negtrack, 3);
weff = weff_d1 * weff_d2;
if (weff > 0)
registry.fill(HIST("Lambda/hLambdas_corrected"), weff);
}
}
return true;
}
Expand Down Expand Up @@ -1808,25 +1848,22 @@ struct FlowGenericFramework {
bool withinPtNch = (track.pt() > ptmins[0] && track.pt() < ptmaxs[0]);
if (!withinPtPOI && !withinPtRef)
return;
double weff = (dt == kGen) ? 1. : getEfficiency(track, pid_index);
double weffInclusive = (dt == kGen) ? 1. : getEfficiency(track, 0);
if (weff < 0)
return;

double waccRef = (dt == kGen) ? 1. : getAcceptance(track, vtxz, 0);
double waccPOI = (dt == kGen) ? 1. : withinPtPOI ? getAcceptance(track, vtxz, pid_index + 1)
: getAcceptance(track, vtxz, 0); //
if (withinPtRef && withinPtPOI && pid_index)
waccRef = waccPOI; // if particle is both (then it's overlap), override ref with POI
if (withinPtRef)
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccRef * weffInclusive, 1);
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccRef, 1);
if (withinPtPOI && pid_index)
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff, (1 << (pid_index + 1)));
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, (1 << (pid_index + 1)));
if (withinPtNch)
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff * weffInclusive, 2);
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, 2);
if (withinPtPOI && withinPtRef && pid_index)
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff, (1 << (pid_index + 5)));
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, (1 << (pid_index + 5)));
if (withinPtNch && withinPtRef)
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI * weff * weffInclusive, 32);
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), waccPOI, 32);
} else { // Analysing only integrated flow
bool withinPtRef = (track.pt() > o2::analysis::gfw::ptreflow && track.pt() < o2::analysis::gfw::ptrefup);
bool withinPtPOI = (track.pt() > o2::analysis::gfw::ptpoilow && track.pt() < o2::analysis::gfw::ptpoiup);
Expand Down
Loading