Skip to content

[PWGLF] fix in hStrangeCorrelation.cxx #14519

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

Closed
lhusova wants to merge 3 commits into from
Closed

[PWGLF] fix in hStrangeCorrelation.cxx #14519

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
718319b
fix the trigger eff for mixing
Jan 16, 2026
e541c3c
fix O2 linter
Jan 16, 2026
f5576ba
fix MegaLinter
Jan 16, 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
122 changes: 61 additions & 61 deletions PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@

std::vector<std::vector<float>> axisRanges;

const float ctauxiPDG = 4.91; // from PDG

Check failure on line 271 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
const float ctauomegaPDG = 2.461; // from PDG

Check failure on line 272 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

/// Function to aid in calculating delta-phi
/// \param phi1 first phi value
Expand Down Expand Up @@ -536,9 +536,9 @@
return false;
// dcacascdaughters
float ptDepCut = systCuts.dcaCacsDauPar0;
if (casc.pt() > 1 && casc.pt() < 4)

Check failure on line 539 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
ptDepCut = systCuts.dcaCacsDauPar1;
else if (casc.pt() > 4)

Check failure on line 541 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
ptDepCut = systCuts.dcaCacsDauPar2;
if (casc.dcacascdaughters() > ptDepCut)
return false;
Expand Down Expand Up @@ -571,7 +571,7 @@
double phaseProton = (-0.3 * B * assoc[2]) / (2 * assoc[1]);
double phaseTrack = (-0.3 * B * trigg[2]) / (2 * trigg[1]);

for (double r = 0.8; r <= 2.5; r += 0.05) {

Check failure on line 574 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
dPhiStar = dPhi + std::asin(phaseProton * r) - std::asin(phaseTrack * r);
dPhiStarMean += (dPhiStar / 34);
}
Expand Down Expand Up @@ -612,21 +612,22 @@
float efficiencyTriggError = 0.0f;
float purityTrigg = 1.0f;
float purityTriggErr = 0.0;
if (!mixing) {
if (efficiencyFlags.applyEfficiencyForTrigger) {
efficiencyTrigg = hEfficiencyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyEfficiencyForTrigger) {
efficiencyTrigg = hEfficiencyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger)
purityTrigg = hPurityHadron->Interpolate(trigg.pt());
if (efficiencyFlags.applyEfficiencyPropagation) {
efficiencyTriggError = hEfficiencyUncertaintyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger)
purityTrigg = hPurityHadron->Interpolate(trigg.pt());
if (efficiencyFlags.applyEfficiencyPropagation) {
efficiencyTriggError = hEfficiencyUncertaintyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger)
purityTriggErr = hPurityHadron->Interpolate(trigg.pt());
}
if (efficiencyTrigg == 0) { // check for zero efficiency, do not apply if the case
efficiencyTrigg = 1;
efficiencyTriggError = 0;
}
purityTriggErr = hPurityHadron->Interpolate(trigg.pt());
}
if (efficiencyTrigg == 0) { // check for zero efficiency, do not apply if the case
efficiencyTrigg = 1;
efficiencyTriggError = 0;
}
}
if (!mixing) {

fillTriggerHistogram(histos.get<TH2>(HIST("sameEvent/TriggerParticlesV0")), trigg.pt(), mult, efficiencyTrigg, efficiencyTriggError, purityTrigg, purityTriggErr);
}

Expand Down Expand Up @@ -734,7 +735,7 @@
if (doDeltaPhiStarCheck) {
double deltaPhiStar = calculateAverageDeltaPhiStar(triggForDeltaPhiStar, assocForDeltaPhiStar, bField);
double deltaPhiStarPion = calculateAverageDeltaPhiStar(triggForDeltaPhiStar, assocForDeltaPhiStarPion, bField);
if ((Index == 0 && triggSign > 0) || (Index == 1 && triggSign > 0) || (Index == 2 && triggSign < 0)) {

Check failure on line 738 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
histos.fill(HIST("sameEvent/LeftBg/") + HIST(kV0names[Index]) + HIST("DeltaPhiStar"), deltaPhiStar, trigg.eta() - etaProton, 0.5);
if (Index == 0) {
histos.fill(HIST("sameEvent/LeftBg/") + HIST(kV0names[Index]) + HIST("DeltaPhiStar"), deltaPhiStarPion, trigg.eta() - etaPion, -0.5);
Expand All @@ -749,18 +750,18 @@
}
if (assocCandidate.compatible(Index, systCuts.dEdxCompatibility) && (!doMCassociation || assocCandidate.mcTrue(Index)) && (!doAssocPhysicalPrimary || assocCandidate.mcPhysicalPrimary()) && !mixing && -massWindowConfigurations.maxPeakNSigma < assocCandidate.invMassNSigma(Index) && assocCandidate.invMassNSigma(Index) < +massWindowConfigurations.maxPeakNSigma) {
fillCorrelationHistogram(histos.get<THn>(HIST("sameEvent/Signal/") + HIST(kV0names[Index])), binFillThn, etaWeight, efficiency * efficiencyTrigg, totalEffUncert, purityTrigg, purityTriggErr);
if (std::abs(deltaphi) < 0.8 && doITSClustersQA) {

Check failure on line 753 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
histos.fill(HIST("hITSClusters") + HIST(kV0names[Index]) + HIST("NegativeDaughterToward"), ptassoc, negtrack.itsNCls(), assoc.v0radius());
histos.fill(HIST("hITSClusters") + HIST(kV0names[Index]) + HIST("PositiveDaughterToward"), ptassoc, postrack.itsNCls(), assoc.v0radius());
}
if (std::abs(deltaphi) > 1 && std::abs(deltaphi) < 2 && doITSClustersQA) {

Check failure on line 757 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
histos.fill(HIST("hITSClusters") + HIST(kV0names[Index]) + HIST("NegativeDaughterTransverse"), ptassoc, negtrack.itsNCls(), assoc.v0radius());
histos.fill(HIST("hITSClusters") + HIST(kV0names[Index]) + HIST("PositiveDaughterTransverse"), ptassoc, postrack.itsNCls(), assoc.v0radius());
}
if (doDeltaPhiStarCheck) {
double deltaPhiStar = calculateAverageDeltaPhiStar(triggForDeltaPhiStar, assocForDeltaPhiStar, bField);
double deltaPhiStarPion = calculateAverageDeltaPhiStar(triggForDeltaPhiStar, assocForDeltaPhiStarPion, bField);
if ((Index == 0 && triggSign > 0) || (Index == 1 && triggSign > 0) || (Index == 2 && triggSign < 0)) {

Check failure on line 764 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
histos.fill(HIST("sameEvent/Signal/") + HIST(kV0names[Index]) + HIST("DeltaPhiStar"), deltaPhiStar, trigg.eta() - etaProton, 0.5);
if (Index == 0) {
histos.fill(HIST("sameEvent/Signal/") + HIST(kV0names[Index]) + HIST("DeltaPhiStar"), deltaPhiStarPion, trigg.eta() - etaPion, -0.5);
Expand Down Expand Up @@ -816,36 +817,36 @@
float efficiencyTriggError = 0.0f;
float purityTrigg = 1.0f;
float purityTriggErr = 0.0f;
if (!mixing) {
if (efficiencyFlags.applyEfficiencyForTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult) {
efficiencyTrigg = hEfficiencyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
} else {
efficiencyTrigg = hEfficiencyTrigger->Interpolate(trigg.pt(), trigg.eta());
}
if (efficiencyFlags.applyEfficiencyForTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult) {
efficiencyTrigg = hEfficiencyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
} else {
efficiencyTrigg = hEfficiencyTrigger->Interpolate(trigg.pt(), trigg.eta());
}
if (efficiencyFlags.applyPurityTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
purityTrigg = hPurityHadronMult->Interpolate(trigg.pt(), mult);
else
purityTrigg = hPurityHadron->Interpolate(trigg.pt());
}
if (efficiencyFlags.applyEfficiencyPropagation) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
efficiencyTriggError = hEfficiencyUncertaintyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
else
efficiencyTriggError = hEfficiencyUncertaintyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
purityTrigg = hPurityHadronMult->Interpolate(trigg.pt(), mult);
purityTriggErr = hPurityUncertaintyHadronMult->Interpolate(trigg.pt(), mult);
else
purityTrigg = hPurityHadron->Interpolate(trigg.pt());
}
if (efficiencyFlags.applyEfficiencyPropagation) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
efficiencyTriggError = hEfficiencyUncertaintyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
else
efficiencyTriggError = hEfficiencyUncertaintyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
purityTriggErr = hPurityUncertaintyHadronMult->Interpolate(trigg.pt(), mult);
else
purityTriggErr = hPurityUncertaintyHadron->Interpolate(trigg.pt());
}
}
if (efficiencyTrigg == 0) { // check for zero efficiency, do not apply if the case
efficiencyTrigg = 1;
efficiencyTriggError = 0;
purityTriggErr = hPurityUncertaintyHadron->Interpolate(trigg.pt());
}
}
if (efficiencyTrigg == 0) { // check for zero efficiency, do not apply if the case
efficiencyTrigg = 1;
efficiencyTriggError = 0;
}
}
if (!mixing) {
fillTriggerHistogram(histos.get<TH2>(HIST("sameEvent/TriggerParticlesCascade")), trigg.pt(), mult, efficiencyTrigg, efficiencyTriggError, purityTrigg, purityTriggErr);
}
double triggSign = trigg.sign();
Expand Down Expand Up @@ -1008,36 +1009,35 @@
float efficiencyTriggerError = 0.0f;
float purityTrigger = 1.0f;
float purityTriggerError = 0.0f;
if (!mixing) {

if (efficiencyFlags.applyEfficiencyForTrigger) {
if (efficiencyFlags.applyEfficiencyForTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
efficiencyTrigger = hEfficiencyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
else
efficiencyTrigger = hEfficiencyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
efficiencyTrigger = hEfficiencyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
purityTrigger = hPurityHadronMult->Interpolate(trigg.pt(), mult);
else
efficiencyTrigger = hEfficiencyTrigger->Interpolate(trigg.pt(), trigg.eta());
purityTrigger = hPurityHadron->Interpolate(trigg.pt());
}
if (efficiencyFlags.applyEfficiencyPropagation) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
efficiencyTriggerError = hEfficiencyUncertaintyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
else
efficiencyTriggerError = hEfficiencyUncertaintyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
purityTrigger = hPurityHadronMult->Interpolate(trigg.pt(), mult);
purityTriggerError = hPurityUncertaintyHadronMult->Interpolate(trigg.pt(), mult);
else
purityTrigger = hPurityHadron->Interpolate(trigg.pt());
}
if (efficiencyFlags.applyEfficiencyPropagation) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
efficiencyTriggerError = hEfficiencyUncertaintyTriggerMult->Interpolate(trigg.pt(), trigg.eta(), mult);
else
efficiencyTriggerError = hEfficiencyUncertaintyTrigger->Interpolate(trigg.pt(), trigg.eta());
if (efficiencyFlags.applyPurityTrigger) {
if (efficiencyFlags.applyEffAsFunctionOfMult)
purityTriggerError = hPurityUncertaintyHadronMult->Interpolate(trigg.pt(), mult);
else
purityTriggerError = hPurityUncertaintyHadron->Interpolate(trigg.pt());
}
}
if (efficiencyTrigger == 0) { // check for zero efficiency, do not apply if the case
efficiencyTrigger = 1;
efficiencyTriggerError = 0;
purityTriggerError = hPurityUncertaintyHadron->Interpolate(trigg.pt());
}
}
if (efficiencyTrigger == 0) { // check for zero efficiency, do not apply if the case
efficiencyTrigger = 1;
efficiencyTriggerError = 0;
}
}
if (!mixing) {
if constexpr (requires { triggerTrack.extra(); })
fillTriggerHistogram(histos.get<TH2>(HIST("sameEvent/TriggerParticlesPion")), trigg.pt(), mult, efficiencyTrigger, efficiencyTriggerError, purityTrigger, purityTriggerError);
else
Expand Down Expand Up @@ -2034,7 +2034,7 @@
histos.fill(HIST("hPionEtaVsPtAllSelected"), pionTrack.pt(), pionTrack.eta(), collision.centFT0M());
if (doAssocPhysicalPrimary && !pion.mcPhysicalPrimary())
continue;
if (doMCassociation && std::abs(pion.pdgCode()) != 211)

Check failure on line 2037 in PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
continue;
histos.fill(HIST("hPionEtaVsPt"), pionTrack.pt(), pionTrack.eta(), collision.centFT0M());
if (pionTrack.sign() > 0)
Expand Down
Loading