Skip to content

ITSMFT/ITS3: fix MC labels for clusters after digit squashing #16098

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

Open
mpuccio wants to merge 2 commits into
base: dev
Choose a base branch
from
+14 −22
Open

ITSMFT/ITS3: fix MC labels for clusters after digit squashing #16098

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
714cf05
ITSMFT: fix MC labels for single pixel clusters in the labels
mpuccio Nov 10, 2026
642f101
ITSMFT/ITS3: centralize cluster digit IDs for squashing labels
mpuccio Nov 12, 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: 2 additions & 0 deletions Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/PixelData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ class ChipPixelData
std::vector<uint32_t>& getPixIds() { return mPixIds; }
std::vector<int>& getPixelsOrder() { return mPixelsOrder; }
uint32_t getOrderedPixId(int pos) const { return mPixIds[mPixelsOrder[pos]]; }
// Squashing can remove or reorder digits; otherwise their indices are contiguous.
uint32_t getDigitID(int pos) const { return mPixIds.empty() ? mStartID + pos : getOrderedPixId(pos); }

private:
uint8_t mROFlags = 0; // readout flags from the chip trailer
Expand Down
17 changes: 6 additions & 11 deletions Detectors/ITSMFT/common/reconstruction/src/Clusterer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,7 @@ void Clusterer::ClustererThread::finishChip(ChipPixelData* curChipData, CompClus
pixArrBuff.push_back(pix); // needed for cluster topology
bbox.adjust(pix.getRowDirect(), pix.getCol());
if (labelsClusPtr) {
if (parent->mSquashingDepth) { // the MCtruth for this pixel is stored in chip data: due to squashing we lose contiguity
fetchMCLabels(curChipData->getOrderedPixId(pixEntry.second), labelsDigPtr, nlab);
} else { // the MCtruth for this pixel is at curChipData->startID+pixEntry.second
fetchMCLabels(pixEntry.second + curChipData->getStartID(), labelsDigPtr, nlab);
}
fetchMCLabels(curChipData->getDigitID(pixEntry.second), labelsDigPtr, nlab);
}
next = pixEntry.first;
}
Expand All @@ -256,11 +252,7 @@ void Clusterer::ClustererThread::finishChip(ChipPixelData* curChipData, CompClus
pixArrBuff.push_back(pix); // needed for cluster topology
bbox.adjust(pix.getRowDirect(), pix.getCol());
if (labelsClusPtr) {
if (parent->mSquashingDepth) { // the MCtruth for this pixel is stored in chip data: due to squashing we lose contiguity
fetchMCLabels(curChipData->getOrderedPixId(pixEntry.second), labelsDigPtr, nlab);
} else { // the MCtruth for this pixel is at curChipData->startID+pixEntry.second
fetchMCLabels(pixEntry.second + curChipData->getStartID(), labelsDigPtr, nlab);
}
fetchMCLabels(curChipData->getDigitID(pixEntry.second), labelsDigPtr, nlab);
}
next = pixEntry.first;
}
Expand Down Expand Up @@ -315,7 +307,7 @@ void Clusterer::ClustererThread::finishChipSingleHitFast(uint32_t hit, ChipPixel

if (labelsClusPtr) { // MC labels were requested
int nlab = 0;
fetchMCLabels(curChipData->getStartID() + hit, labelsDigPtr, nlab);
fetchMCLabels(curChipData->getDigitID(hit), labelsDigPtr, nlab);
auto cnt = compClusPtr->size();
for (int i = 0; i < nlab; i++) {
labelsClusPtr->addElement(cnt, labelsBuff[i]);
Expand Down Expand Up @@ -437,6 +429,9 @@ void Clusterer::ClustererThread::updateChip(const ChipPixelData* curChipData, ui
void Clusterer::ClustererThread::fetchMCLabels(int digID, const ConstMCTruth* labelsDig, int& nfilled)
{
// transfer MC labels to cluster
if (!labelsDig) {
return;
}
auto sortBuffer = [this]() { std::sort(this->labelsBuff.begin(), this->labelsBuff.end(), [](Label const& a, Label const& b) { return a.getTrackID() < b.getTrackID(); }); };
for (const auto& l : labelsDig->getLabels(digID)) {
bool skip = false;
Expand Down
17 changes: 6 additions & 11 deletions Detectors/Upgrades/ITS3/reconstruction/src/Clusterer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,7 @@ void Clusterer::ClustererThread::finishChip(ChipPixelData* curChipData, CompClus
pixArrBuff.push_back(pix); // needed for cluster topology
bbox.adjust(pix.getRowDirect(), pix.getCol());
if (labelsClusPtr) {
if (parent->mSquashingDepth) { // the MCtruth for this pixel is stored in chip data: due to squashing we lose contiguity
fetchMCLabels(curChipData->getOrderedPixId(pixEntry.second), labelsDigPtr, nlab);
} else { // the MCtruth for this pixel is at curChipData->startID+pixEntry.second
fetchMCLabels(pixEntry.second + curChipData->getStartID(), labelsDigPtr, nlab);
}
fetchMCLabels(curChipData->getDigitID(pixEntry.second), labelsDigPtr, nlab);
}
next = pixEntry.first;
}
Expand All @@ -255,11 +251,7 @@ void Clusterer::ClustererThread::finishChip(ChipPixelData* curChipData, CompClus
pixArrBuff.push_back(pix); // needed for cluster topology
bbox.adjust(pix.getRowDirect(), pix.getCol());
if (labelsClusPtr) {
if (parent->mSquashingDepth) { // the MCtruth for this pixel is stored in chip data: due to squashing we lose contiguity
fetchMCLabels(curChipData->getOrderedPixId(pixEntry.second), labelsDigPtr, nlab);
} else { // the MCtruth for this pixel is at curChipData->startID+pixEntry.second
fetchMCLabels(pixEntry.second + curChipData->getStartID(), labelsDigPtr, nlab);
}
fetchMCLabels(curChipData->getDigitID(pixEntry.second), labelsDigPtr, nlab);
}
next = pixEntry.first;
}
Expand Down Expand Up @@ -316,7 +308,7 @@ void Clusterer::ClustererThread::finishChipSingleHitFast(uint32_t hit, ChipPixel

if (labelsClusPtr) { // MC labels were requested
int nlab = 0;
fetchMCLabels(curChipData->getStartID() + hit, labelsDigPtr, nlab);
fetchMCLabels(curChipData->getDigitID(hit), labelsDigPtr, nlab);
auto cnt = compClusPtr->size();
for (int i = 0; i < nlab; i++) {
labelsClusPtr->addElement(cnt, labelsBuff[i]);
Expand Down Expand Up @@ -454,6 +446,9 @@ void Clusterer::ClustererThread::updateChip(const ChipPixelData* curChipData, ui
void Clusterer::ClustererThread::fetchMCLabels(int digID, const ConstMCTruth* labelsDig, int& nfilled)
{
// transfer MC labels to cluster
if (!labelsDig) {
return;
}
auto sortBuffer = [this]() { std::sort(this->labelsBuff.begin(), this->labelsBuff.end(), [](Label const& a, Label const& b) { return a.getTrackID() < b.getTrackID(); }); };
for (const auto& label : labelsDig->getLabels(digID)) {
bool skip = false;
Expand Down
Loading