Skip to content

[PWGLF,PWGMM] Fix position of update of last BC with activity for SL BCs #15198

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
jgcn merged 1 commit into from
Feb 28, 2026
+14 −14
Merged

[PWGLF,PWGMM] Fix position of update of last BC with activity for SL BCs #15198

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
28 changes: 14 additions & 14 deletions PWGMM/Lumi/Tasks/lumiStabilityPP.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,23 +337,16 @@ struct LumiStabilityPP {
isSuperLeadingBcFT0 = false; // not a super-leading BC for FT0
}

if (ctpInputMask.test(12) || ctpInputMask.test(14) || ctpInputMask.test(15) || ctpInputMask.test(16) || ctpInputMask.test(17)) { // 5 FDD triggers
globalBCIdOfLastBCWithActivityFDD = globalBCFDD;
}
if (ctpInputMask.test(0) || ctpInputMask.test(1) || ctpInputMask.test(2) || ctpInputMask.test(3) || ctpInputMask.test(4)) { // 5 FT0 triggers
globalBCIdOfLastBCWithActivityFT0 = globalBC;
if (!bcPatternB[localBCFDD]) {
isSuperLeadingBcFDD = false; // not a super-leading BC for FDD
}

if (!bcPatternB[localBC]) {
isSuperLeadingBcFT0 = false; // not a super-leading BC
}
if (!bcPatternB[localBCFDD]) {
isSuperLeadingBcFDD = false; // not a super-leading BC
isSuperLeadingBcFT0 = false; // not a super-leading BC for FT0
}

int64_t globalBCStart = (globalBCLastInspectedBC >= 0 && globalBCLastInspectedBC < globalBC) ? globalBCLastInspectedBC + 1 : globalBC;
int64_t maxBcDiff = (rate > 0) ? 10 * static_cast<int>(nBunchesFillingScheme * constants::lhc::LHCRevFreq / rate / 1.e3) : 1500;
if (globalBC - globalBCStart > maxBcDiff) { // we changed fill, we should not count all BCs between the current and the previous one
int64_t maxBcDiff = (rate > 0) ? 15 * static_cast<int>(nBunchesFillingScheme * constants::lhc::LHCRevFreq / rate / 1.e3) : 1500;
if (globalBC - globalBCStart > maxBcDiff) { // we have a big jump in global BCs, we should not count all BCs between the current and the previous one
globalBCStart = globalBC;
}
for (int64_t iGlobalBC{globalBCStart}; iGlobalBC <= globalBC; ++iGlobalBC) { // we count all BCs in between one and another stored in the AO2Ds
Expand All @@ -363,12 +356,12 @@ struct LumiStabilityPP {
}
if (bcPatternB[iLocalBC]) {
nBCsPerBcId[iLocalBC][BCB]++;
if (iGlobalBC - globalBCIdOfLastBCWithActivityFDD > numEmptyBCsBeforeLeadingBC->get(0u, 2u)) {
if (iGlobalBC - globalBCIdOfLastBCWithActivityFDD >= numEmptyBCsBeforeLeadingBC->get(0u, 2u)) {
nBCsPerBcId[iLocalBC][BCSLFDD]++;
} else {
nBCsPerBcId[iLocalBC][BCNSLFDD]++;
}
if (iGlobalBC - globalBCIdOfLastBCWithActivityFT0 > numEmptyBCsBeforeLeadingBC->get(0u, 2u)) {
if (iGlobalBC - globalBCIdOfLastBCWithActivityFT0 >= numEmptyBCsBeforeLeadingBC->get(0u, 2u)) {
nBCsPerBcId[iLocalBC][BCSLFT0]++;
} else {
nBCsPerBcId[iLocalBC][BCNSLFT0]++;
Expand All @@ -394,6 +387,13 @@ struct LumiStabilityPP {
}
}

if (ctpInputMask.test(12) || ctpInputMask.test(14) || ctpInputMask.test(15) || ctpInputMask.test(16) || ctpInputMask.test(17)) { // 5 FDD triggers
globalBCIdOfLastBCWithActivityFDD = globalBCFDD;
}
if (ctpInputMask.test(0) || ctpInputMask.test(1) || ctpInputMask.test(2) || ctpInputMask.test(3) || ctpInputMask.test(4)) { // 5 FT0 triggers
globalBCIdOfLastBCWithActivityFT0 = globalBC;
}

int64_t thisTFid = (globalBC - bcSOR) / nBCsPerTF;

if (thisTFid != currentTFid) {
Expand Down
Loading