Skip to content

[PWGCF] Bug-fix MC truth-truth and recon-truth #16452

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 1 commit into from
May 29, 2026
+76 −6
Merged

[PWGCF] Bug-fix MC truth-truth and recon-truth #16452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 30 additions & 2 deletions PWGCF/TwoParticleCorrelations/Tasks/flowDecorrelation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,6 +1841,23 @@ struct FlowDecorrelation {
for (auto it = pairs.begin(); it != pairs.end(); it++) {
auto& [collision1, tracks1, collision2, tracks2] = *it;

int tpcMult1 = 0;
for (const auto& track : tracks1) {
if (std::abs(track.eta()) < cfgMcTrue.cfgEtaTpcCut)
tpcMult1 += 1;
}
int tpcMult2 = 0;
for (const auto& track : tracks2) {
if (std::abs(track.eta()) < cfgMcTrue.cfgEtaTpcCut)
tpcMult2 += 1;
}

if (cfgSelCollByNch && (tpcMult1 < cfgGeneralCuts.cfgCutMultMin || tpcMult1 >= cfgGeneralCuts.cfgCutMultMax))
continue;

if (cfgSelCollByNch && (tpcMult2 < cfgGeneralCuts.cfgCutMultMin || tpcMult2 >= cfgGeneralCuts.cfgCutMultMax))
continue;

auto groupedCollisions1 = collisions.sliceBy(collisionPerMCCollision, collision1.globalIndex());
auto groupedCollisions2 = collisions.sliceBy(collisionPerMCCollision, collision2.globalIndex());
float cent1 = -1;
Expand Down Expand Up @@ -1939,10 +1956,21 @@ struct FlowDecorrelation {
for (auto it = pairs.begin(); it != pairs.end(); it++) {
auto& [collision1, tracks1, collision2, tracks2] = *it;

if (cfgSelCollByNch && (tracks1.size() < cfgGeneralCuts.cfgCutMultMin || tracks1.size() >= cfgGeneralCuts.cfgCutMultMax))
int tpcMult1 = 0;
for (const auto& track : tracks1) {
if (std::abs(track.eta()) < cfgMcTrue.cfgEtaTpcCut)
tpcMult1 += 1;
}
int tpcMult2 = 0;
for (const auto& track : tracks2) {
if (std::abs(track.eta()) < cfgMcTrue.cfgEtaTpcCut)
tpcMult2 += 1;
}

if (cfgSelCollByNch && (tpcMult1 < cfgGeneralCuts.cfgCutMultMin || tpcMult1 >= cfgGeneralCuts.cfgCutMultMax))
continue;

if (cfgSelCollByNch && (tracks2.size() < cfgGeneralCuts.cfgCutMultMin || tracks2.size() >= cfgGeneralCuts.cfgCutMultMax))
if (cfgSelCollByNch && (tpcMult2 < cfgGeneralCuts.cfgCutMultMin || tpcMult2 >= cfgGeneralCuts.cfgCutMultMax))
continue;

auto groupedCollisions1 = collisions.sliceBy(collisionPerMCCollision, collision1.globalIndex());
Expand Down
50 changes: 46 additions & 4 deletions PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,13 +1040,13 @@
registry.fill(HIST("deltaEta_deltaPhi_same_TPC_FT0A"), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
sameTpcFt0a->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
if (mirrorChannel)
sameTpcFt0a->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), RecoDecay::constrainAngle(track1.phi() - phi - 2 * PIHalf, -PIHalf), deltaEta, ampl * eventWeight * triggerWeight);

Check failure on line 1043 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
} else if (corType == kFT0C) {
registry.fill(HIST("Assoc_amp_same_TPC_FT0C"), chanelid, ampl);
registry.fill(HIST("deltaEta_deltaPhi_same_TPC_FT0C"), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
sameTpcFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
if (mirrorChannel)
sameTpcFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), RecoDecay::constrainAngle(track1.phi() - phi - 2 * PIHalf, -PIHalf), deltaEta, ampl * eventWeight * triggerWeight);

Check failure on line 1049 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
}
} else if (system == MixedEvent) {
if (corType == kFT0A) {
Expand All @@ -1054,13 +1054,13 @@
registry.fill(HIST("deltaEta_deltaPhi_mixed_TPC_FT0A"), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
mixedTpcFt0a->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
if (mirrorChannel)
mixedTpcFt0a->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), RecoDecay::constrainAngle(track1.phi() - phi - 2 * PIHalf, -PIHalf), deltaEta, ampl * eventWeight * triggerWeight);

Check failure on line 1057 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
} else if (corType == kFT0C) {
registry.fill(HIST("Assoc_amp_mixed_TPC_FT0C"), chanelid, ampl);
registry.fill(HIST("deltaEta_deltaPhi_mixed_TPC_FT0C"), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
mixedTpcFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
if (mirrorChannel)
mixedTpcFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), RecoDecay::constrainAngle(track1.phi() - phi - 2 * PIHalf, -PIHalf), deltaEta, ampl * eventWeight * triggerWeight);

Check failure on line 1063 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
}
}
}
Expand Down Expand Up @@ -1110,22 +1110,22 @@
registry.fill(HIST("deltaEta_deltaPhi_same_FT0A_FT0C"), deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight);
sameFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight);
if (mirrorChannelA) {
sameFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA + 2 * PIHalf - phiC, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight);

Check failure on line 1113 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
if (mirrorChannelC)
sameFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight);
}
if (mirrorChannelC)
sameFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA - phiC - 2 * PIHalf, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight);

Check failure on line 1118 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
} else if (system == MixedEvent) {
registry.fill(HIST("deltaEta_deltaPhi_mixed_FT0A_FT0C"), deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight);
mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight);
if (mirrorChannelA) {
mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA + 2 * PIHalf - phiC, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight);

Check failure on line 1123 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
if (mirrorChannelC)
mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight);
}
if (mirrorChannelC)
mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA - phiC - 2 * PIHalf, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight);

Check failure on line 1128 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
}
}
}
Expand Down Expand Up @@ -1277,13 +1277,13 @@
registry.fill(HIST("deltaEta_deltaPhi_same_TPC_FT0A"), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
sameTpcFt0a->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
if (mirrorChannel)
sameTpcFt0a->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), RecoDecay::constrainAngle(track1.phi() - phi - 2 * PIHalf, -PIHalf), deltaEta, ampl * eventWeight * triggerWeight);

Check failure on line 1280 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
} else if (corType == kFT0C) {
registry.fill(HIST("Assoc_amp_same_TPC_FT0C"), chanelid, ampl);
registry.fill(HIST("deltaEta_deltaPhi_same_TPC_FT0C"), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
sameTpcFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), deltaPhi, deltaEta, ampl * eventWeight * triggerWeight);
if (mirrorChannel)
sameTpcFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, track1.pt(), track1.pt(), RecoDecay::constrainAngle(track1.phi() - phi - 2 * PIHalf, -PIHalf), deltaEta, ampl * eventWeight * triggerWeight);

Check failure on line 1286 in PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[two-pi-add-subtract] 

Use RecoDecay::constrainAngle to restrict angle to a given range.
}
} else if (system == MixedEvent) {
if (corType == kFT0A) {
Expand Down Expand Up @@ -2105,10 +2105,21 @@
for (auto it = pairs.begin(); it != pairs.end(); it++) {
auto& [collision1, tracks1, collision2, tracks2] = *it;

if (cfgGeneral.cfgSelCollByNch && (tracks1.size() < cfgGeneral.cfgCutMultMin || tracks1.size() >= cfgGeneral.cfgCutMultMax))
int tpcMult1 = 0;
for (const auto& track : tracks1) {
if (std::abs(track.eta()) < cfgGeneral.cfgEtaTpcCut)
tpcMult1 += 1;
}
int tpcMult2 = 0;
for (const auto& track : tracks2) {
if (std::abs(track.eta()) < cfgGeneral.cfgEtaTpcCut)
tpcMult2 += 1;
}

if (cfgGeneral.cfgSelCollByNch && (tpcMult1 < cfgGeneral.cfgCutMultMin || tpcMult1 >= cfgGeneral.cfgCutMultMax))
continue;

if (cfgGeneral.cfgSelCollByNch && (tracks2.size() < cfgGeneral.cfgCutMultMin || tracks2.size() >= cfgGeneral.cfgCutMultMax))
if (cfgGeneral.cfgSelCollByNch && (tpcMult2 < cfgGeneral.cfgCutMultMin || tpcMult2 >= cfgGeneral.cfgCutMultMax))
continue;

auto groupedCollisions1 = collisions.sliceBy(collisionPerMCCollision, collision1.globalIndex());
Expand Down Expand Up @@ -2164,10 +2175,21 @@
for (auto it = pairs.begin(); it != pairs.end(); it++) {
auto& [collision1, tracks1, collision2, tracks2] = *it;

if (cfgGeneral.cfgSelCollByNch && (tracks1.size() < cfgGeneral.cfgCutMultMin || tracks1.size() >= cfgGeneral.cfgCutMultMax))
int tpcMult1 = 0;
for (const auto& track : tracks1) {
if (std::abs(track.eta()) < cfgGeneral.cfgEtaTpcCut)
tpcMult1 += 1;
}
int tpcMult2 = 0;
for (const auto& track : tracks2) {
if (std::abs(track.eta()) < cfgGeneral.cfgEtaTpcCut)
tpcMult2 += 1;
}

if (cfgGeneral.cfgSelCollByNch && (tpcMult1 < cfgGeneral.cfgCutMultMin || tpcMult1 >= cfgGeneral.cfgCutMultMax))
continue;

if (cfgGeneral.cfgSelCollByNch && (tracks2.size() < cfgGeneral.cfgCutMultMin || tracks2.size() >= cfgGeneral.cfgCutMultMax))
if (cfgGeneral.cfgSelCollByNch && (tpcMult2 < cfgGeneral.cfgCutMultMin || tpcMult2 >= cfgGeneral.cfgCutMultMax))
continue;

auto groupedCollisions1 = collisions.sliceBy(collisionPerMCCollision, collision1.globalIndex());
Expand Down Expand Up @@ -2363,6 +2385,16 @@
cent1 = getCentrality(collision1);
cent2 = getCentrality(collision2);
}

int tpcMult = 0;
for (const auto& track : tracksTruth1) {
if (std::abs(track.eta()) < cfgGeneral.cfgEtaTpcCut)
tpcMult += 1;
}

if (cfgGeneral.cfgSelCollByNch && (tpcMult < cfgGeneral.cfgCutMultMin || tpcMult >= cfgGeneral.cfgCutMultMax))
continue;

if (cfgGeneral.cfgUseAdditionalEventCut && !eventSelected(collision1, tracksRecon1.size(), cent1, false))
continue;
if (cfgGeneral.cfgUseAdditionalEventCut && !eventSelected(collision2, tracksRecon2.size(), cent2, false))
Expand Down Expand Up @@ -2429,6 +2461,16 @@
cent1 = getCentrality(collision1);
cent2 = getCentrality(collision2);
}

int tpcMult = 0;
for (const auto& track : tracksTruth1) {
if (std::abs(track.eta()) < cfgGeneral.cfgEtaTpcCut)
tpcMult += 1;
}

if (cfgGeneral.cfgSelCollByNch && (tpcMult < cfgGeneral.cfgCutMultMin || tpcMult >= cfgGeneral.cfgCutMultMax))
continue;

if (cfgGeneral.cfgUseAdditionalEventCut && !eventSelected(collision1, tracksRecon1.size(), cent1, false))
continue;
if (cfgGeneral.cfgUseAdditionalEventCut && !eventSelected(collision2, tracksRecon2.size(), cent2, false))
Expand Down
Loading