Skip to content

ITSMFT: fix clusterizer merge correctly connected pixels #14785

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
f3sch wants to merge 1 commit into
base: dev
Choose a base branch
from
+48 −15
Open

ITSMFT: fix clusterizer merge correctly connected pixels #14785

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
15 changes: 15 additions & 0 deletions Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/Clusterer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,21 @@ class Clusterer
curr[row] = lastIndex; // store index of the new precluster in the current column buffer
}

///< find canoncial root by path-halving, compresses lookup for idx otf
int findRoot(int idx)
{
int root = idx;
while (preClusterIndices[root] != root) { // root finding
root = preClusterIndices[root];
}
while (preClusterIndices[idx] != root) { // path compression
int parent = preClusterIndices[idx];
preClusterIndices[idx] = root;
idx = parent;
}
return root;
}

void fetchMCLabels(int digID, const ConstMCTruth* labelsDig, int& nfilled);
void initChip(const ChipPixelData* curChipData, uint32_t first);
void updateChip(const ChipPixelData* curChipData, uint32_t ip);
Expand Down
48 changes: 33 additions & 15 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 @@ -133,15 +133,17 @@ void Clusterer::process(int nThreads, PixelReader& reader, CompClusCont* compClu
if (stat.firstChip == chid) {
thrStatIdx[ith]++;
chid += stat.nChips; // next chip to look
const auto clbeg = mThreads[ith]->compClusters.begin() + stat.firstClus;
auto szold = compClus->size();
compClus->insert(compClus->end(), clbeg, clbeg + stat.nClus);
if (patterns) {
const auto ptbeg = mThreads[ith]->patterns.begin() + stat.firstPatt;
patterns->insert(patterns->end(), ptbeg, ptbeg + stat.nPatt);
}
if (labelsCl) {
labelsCl->mergeAtBack(mThreads[ith]->labels, stat.firstClus, stat.nClus);
if (stat.nClus > 0) {
const auto clbeg = mThreads[ith]->compClusters.begin() + stat.firstClus;
auto szold = compClus->size();
compClus->insert(compClus->end(), clbeg, clbeg + stat.nClus);
if (patterns) {
const auto ptbeg = mThreads[ith]->patterns.begin() + stat.firstPatt;
patterns->insert(patterns->end(), ptbeg, ptbeg + stat.nPatt);
}
if (labelsCl) {
labelsCl->mergeAtBack(mThreads[ith]->labels, stat.firstClus, stat.nClus);
}
}
}
}
Expand Down Expand Up @@ -214,6 +216,14 @@ void Clusterer::ClustererThread::finishChip(ChipPixelData* curChipData, CompClus
PatternCont* patternsPtr, const ConstMCTruth* labelsDigPtr, MCTruth* labelsClusPtr)
{
const auto& pixData = curChipData->getData();

// normalize all precluster indices to their roots
for (int i = 0; i < preClusterIndices.size(); ++i) {
if (preClusterIndices[i] >= 0) {
preClusterIndices[i] = findRoot(i);
}
}

for (int i1 = 0; i1 < preClusterHeads.size(); ++i1) {
auto ci = preClusterIndices[i1];
if (ci < 0) {
Expand Down Expand Up @@ -379,11 +389,13 @@ void Clusterer::ClustererThread::updateChip(const ChipPixelData* curChipData, ui
}

Bool_t orphan = true;
int currPreClusterIdx = -1;

if (noLeftCol) { // check only the row above
if (curr[row - 1] >= 0) {
expandPreCluster(ip, row, curr[row - 1]); // attach to the precluster of the previous row
return;
currPreClusterIdx = curr[row - 1];
orphan = false;
}
} else {
#ifdef _ALLOW_DIAGONAL_ALPIDE_CLUSTERS_
Expand All @@ -397,14 +409,20 @@ void Clusterer::ClustererThread::updateChip(const ChipPixelData* curChipData, ui
}
if (orphan) {
expandPreCluster(ip, row, pci); // attach to the adjascent precluster
currPreClusterIdx = pci;
orphan = false;
continue;
}
// reassign precluster index to smallest one
if (preClusterIndices[pci] < preClusterIndices[curr[row]]) {
preClusterIndices[curr[row]] = preClusterIndices[pci];
} else {
preClusterIndices[pci] = preClusterIndices[curr[row]];
// merge the roots of both preclusters
int root1 = findRoot(pci);
int root2 = findRoot(currPreClusterIdx);
if (root1 != root2) {
// point to higher index to lower index for consistency
if (root1 < root2) {
preClusterIndices[root2] = root1;
} else {
preClusterIndices[root1] = root2;
}
}
}
}
Expand Down