Skip to content

[Common] Fix issue 14173 #16814

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
dsekihat merged 4 commits into from
Jun 30, 2026
+26 −39
Merged

[Common] Fix issue 14173 #16814

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7862bb
Fixing issues/14173
amaringarcia Jun 25, 2026
b253950
fixing issues
amaringarcia Jun 25, 2026
685aa0c
fixing issues
amaringarcia Jun 25, 2026
cb9385a
removing two more warnings
amaringarcia Jun 29, 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
50 changes: 19 additions & 31 deletions Common/TableProducer/occupancyTableProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,47 +433,39 @@ struct OccupancyTableProducer {
template <int processMode, int tableMode, int meanTableMode, int robustTableMode, int meanRobustTableMode, typename B, typename C, typename T>
void executeOccProducerProcessing(B const& BCs, C const& collisions, T const& tracks)
{
if (tableMode == checkTableMode) {
if constexpr (tableMode == checkTableMode) {
if (buildFlag00OccTable) {
executeOccProducerProcessing<processMode, fillOccTable, meanTableMode, robustTableMode, meanRobustTableMode>(BCs, collisions, tracks);
} else {
executeOccProducerProcessing<processMode, doNotFill, meanTableMode, robustTableMode, meanRobustTableMode>(BCs, collisions, tracks);
}
}
if constexpr (tableMode == checkTableMode) {
return;
}

if (meanTableMode == checkTableMode) {
if constexpr (meanTableMode == checkTableMode) {
if (buildFlag01OccMeanTable) {
executeOccProducerProcessing<processMode, tableMode, fillMeanOccTable, robustTableMode, meanRobustTableMode>(BCs, collisions, tracks);
} else {
executeOccProducerProcessing<processMode, tableMode, doNotFill, robustTableMode, meanRobustTableMode>(BCs, collisions, tracks);
}
}
if constexpr (meanTableMode == checkTableMode) {
return;
}

if (robustTableMode == checkTableMode) {
if constexpr (robustTableMode == checkTableMode) {
if (buildFlag02OccRobustTable) {
executeOccProducerProcessing<processMode, tableMode, meanTableMode, fillOccRobustTable, meanRobustTableMode>(BCs, collisions, tracks);
} else {
executeOccProducerProcessing<processMode, tableMode, meanTableMode, doNotFill, meanRobustTableMode>(BCs, collisions, tracks);
}
}
if constexpr (robustTableMode == checkTableMode) {
return;
}

if (meanRobustTableMode == checkTableMode) {
if constexpr (meanRobustTableMode == checkTableMode) {
if (buildFlag03OccMeanRobustTable) {
executeOccProducerProcessing<processMode, tableMode, meanTableMode, robustTableMode, fillOccMeanRobustTable>(BCs, collisions, tracks);
} else {
executeOccProducerProcessing<processMode, tableMode, meanTableMode, robustTableMode, doNotFill>(BCs, collisions, tracks);
}
}
if constexpr (meanRobustTableMode == checkTableMode) {
return;
}

Expand Down Expand Up @@ -802,7 +794,7 @@ struct OccupancyTableProducer {

auto& vecOccPrimUnfm80 = occPrimUnfm80[i];
float meanOccPrimUnfm80 = TMath::Mean(vecOccPrimUnfm80.size(), vecOccPrimUnfm80.data());
normalizeVector(vecOccPrimUnfm80, meanOccPrimUnfm80 / meanOccPrimUnfm80);
//normalizeVector(vecOccPrimUnfm80, meanOccPrimUnfm80 / meanOccPrimUnfm80);
Comment thread
vkucera marked this conversation as resolved.
Outdated

if constexpr (processMode == kProcessFullOccTableProducer || processMode == kProcessOnlyOccPrim || processMode == kProcessOnlyOccT0V0Prim || processMode == kProcessOnlyOccFDDT0V0Prim || processMode == kProcessOnlyOccNtrackDet || processMode == kProcessOnlyOccMultExtra) {
if constexpr (tableMode == fillOccTable) {
Expand Down Expand Up @@ -1699,20 +1691,22 @@ struct TrackMeanOccTableProducer {
{
occupancyQA.fill(HIST("occTrackQA/") + HIST(OccDire[occMode]) + HIST(OccNames[occName]), occValue);
if (fillQA1) {
occupancyQA.fill(HIST("occTrackQA/LogRatio/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), std::log(std::abs(occValue / occRobustValue)));
float logRatio = std::log(occValue / occRobustValue);
float weighted = logRatio * std::sqrt(occValue + occRobustValue);
occupancyQA.fill(HIST("occTrackQA/LogRatio/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), logRatio);
if (fillQA2) {
int two = 2, twenty = 20, fifty = 50, twoHundred = 200;
if (std::abs(std::log(occValue / occRobustValue)) < two) { // conditional filling start
occupancyQA.fill(HIST("occTrackQA/Condition1/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), (std::log(occValue / occRobustValue)) * std::sqrt(occValue + occRobustValue));
occupancyQA.fill(HIST("occTrackQA/Condition1/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), weighted);
if (std::abs(occRobustValue + occValue) > twoHundred) {
occupancyQA.fill(HIST("occTrackQA/Condition4/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), (std::log(occValue / occRobustValue)) * std::sqrt(occValue + occRobustValue));
occupancyQA.fill(HIST("occTrackQA/Condition3/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), (std::log(occValue / occRobustValue)) * std::sqrt(occValue + occRobustValue));
occupancyQA.fill(HIST("occTrackQA/Condition2/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), (std::log(occValue / occRobustValue)) * std::sqrt(occValue + occRobustValue));
occupancyQA.fill(HIST("occTrackQA/Condition4/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), weighted);
occupancyQA.fill(HIST("occTrackQA/Condition3/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), weighted);
occupancyQA.fill(HIST("occTrackQA/Condition2/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), weighted);
} else if (std::abs(occRobustValue + occValue) > fifty) {
occupancyQA.fill(HIST("occTrackQA/Condition3/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), (std::log(occValue / occRobustValue)) * std::sqrt(occValue + occRobustValue));
occupancyQA.fill(HIST("occTrackQA/Condition2/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), (std::log(occValue / occRobustValue)) * std::sqrt(occValue + occRobustValue));
occupancyQA.fill(HIST("occTrackQA/Condition3/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), weighted);
occupancyQA.fill(HIST("occTrackQA/Condition2/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), weighted);
} else if (std::abs(occRobustValue + occValue) > twenty) {
occupancyQA.fill(HIST("occTrackQA/Condition2/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), (std::log(occValue / occRobustValue)) * std::sqrt(occValue + occRobustValue));
occupancyQA.fill(HIST("occTrackQA/Condition2/") + HIST(OccDire[occRobustMode]) + HIST(OccDire[occMode]) + HIST(OccNames[occName]), weighted);
}
} // conditional filling end
}
Expand Down Expand Up @@ -1762,29 +1756,25 @@ struct TrackMeanOccTableProducer {
return;
}

if (meanTableMode == checkTableMode) {
if constexpr (meanTableMode == checkTableMode) {
if (buildFlag00MeanTable) {
executeTrackOccProducerProcessing<processMode, fillMeanOccTable, weightMeanTableMode, qaMode>(BCs, collisions, tracks, tracksQA, occsRobustT0V0Prim, occs, executeInThisBlock);
} else {
executeTrackOccProducerProcessing<processMode, doNotFill, weightMeanTableMode, qaMode>(BCs, collisions, tracks, tracksQA, occsRobustT0V0Prim, occs, executeInThisBlock);
}
}
if constexpr (meanTableMode == checkTableMode) {
return;
}

if (weightMeanTableMode == checkTableMode) {
if constexpr (weightMeanTableMode == checkTableMode) {
if (buildFlag01WeightMeanTable) {
executeTrackOccProducerProcessing<processMode, meanTableMode, fillWeightMeanOccTable, qaMode>(BCs, collisions, tracks, tracksQA, occsRobustT0V0Prim, occs, executeInThisBlock);
} else {
executeTrackOccProducerProcessing<processMode, meanTableMode, doNotFill, qaMode>(BCs, collisions, tracks, tracksQA, occsRobustT0V0Prim, occs, executeInThisBlock);
}
}
if constexpr (weightMeanTableMode == checkTableMode) {
return;
}

if (qaMode == checkQAMode) {
if constexpr (qaMode == checkQAMode) {
if (fillQA1 || fillQA2) {
if (occsRobustT0V0Prim.size() == 0) {
LOG(error) << "DEBUG :: ERROR ERROR ERROR :: OccsRobustT0V0Prim.size() == 0 :: Check \"occupancy-table-producer\" for \"buildOnlyOccsT0V0Prim == true\" & \"processOnlyOccT0V0PrimUnfm == true\"";
Expand All @@ -1794,8 +1784,6 @@ struct TrackMeanOccTableProducer {
} else {
executeTrackOccProducerProcessing<processMode, meanTableMode, weightMeanTableMode, doNotFill>(BCs, collisions, tracks, tracksQA, occsRobustT0V0Prim, occs, executeInThisBlock);
}
}
if constexpr (qaMode == checkQAMode) {
return;
}

Expand Down Expand Up @@ -1972,6 +1960,7 @@ struct TrackMeanOccTableProducer {
getTimingInfo(bc, lastRun, nBCsPerTF, bcSOR, time, tfIdThis, bcInTF);
}


if (tfIdThis != oldTFid) {
oldTFid = tfIdThis;
auto occsList = occs.iteratorAt(bc.occId());
Expand Down Expand Up @@ -2421,7 +2410,6 @@ struct TrackMeanOccTableProducer {
{
occupancyQA.fill(HIST("h_DFcount_Lvl0"), kProcessNothing);
return;
occupancyQA.fill(HIST("h_DFcount_Lvl1"), kProcessNothing);
}
PROCESS_SWITCH(TrackMeanOccTableProducer, processNothing, "process Nothing From Track Mean Occ Table Producer", true);

Expand Down
Loading