Skip to content

OT-OT Duplicate Cleanup #249

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

Draft
GNiendorf wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

OT-OT Duplicate Cleanup #249

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
8 changes: 4 additions & 4 deletions RecoTracker/LSTCore/src/alpaka/Kernels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,10 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
float dEta = alpaka::math::abs(acc, eta1 - eta2);
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);

if (dEta > 0.1f)
if (dEta > 0.15f)
continue;

if (alpaka::math::abs(acc, dPhi) > 0.1f)
if (alpaka::math::abs(acc, dPhi) > 0.15f)
continue;

float dR2 = dEta * dEta + dPhi * dPhi;
Expand Down Expand Up @@ -433,7 +433,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

int nMatched[2];
checkHitspT3(ix, jx, pixelTriplets, nMatched);
const int minNHitsForDup_pT3 = 5;
const int minNHitsForDup_pT3 = 4;
if ((nMatched[0] + nMatched[1]) >= minNHitsForDup_pT3) {
// Check the layers
if (pixelTriplets.logicalLayers()[jx][2] < pixelTriplets.logicalLayers()[ix][2]) {
Expand Down Expand Up @@ -465,7 +465,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

int nMatched = checkHitspT5(ix, jx, pixelQuintuplets);
float score2 = __H2F(pixelQuintuplets.score()[jx]);
const int minNHitsForDup_pT5 = 7;
const int minNHitsForDup_pT5 = 5;
if (nMatched >= minNHitsForDup_pT5) {
if (score1 > score2 or ((score1 == score2) and (ix > jx))) {
rmPixelQuintupletFromMemory(pixelQuintuplets, ix);
Expand Down
94 changes: 92 additions & 2 deletions RecoTracker/LSTCore/src/alpaka/TrackCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,33 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

unsigned int nPixelQuintuplets = pixelQuintuplets.nPixelQuintuplets();
for (unsigned int pixelQuintupletIndex : cms::alpakatools::uniform_elements_x(acc, nPixelQuintuplets)) {
if (pixelQuintuplets.isDup()[pixelQuintupletIndex])
continue;

unsigned int pLS_jx = pixelQuintuplets.pixelSegmentIndices()[pixelQuintupletIndex];
float eta2 = pixelSeeds.eta()[pLS_jx - prefix];
float phi2 = pixelSeeds.phi()[pLS_jx - prefix];
float dEta = alpaka::math::abs(acc, (eta1 - eta2));
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);

float dR2 = dEta * dEta + dPhi * dPhi;
if (dR2 < 1e-5f)
if (dR2 < 1e-5f) {
pixelTriplets.isDup()[pixelTripletIndex] = true;
} else if (dEta < 0.15f && alpaka::math::abs(acc, dPhi) < 0.15f) {
// Check OT hit overlap: pT3 OT hits vs pT5 OT hits
int nOTMatched = 0;
for (int i = Params_pLS::kHits; i < Params_pT3::kHits; ++i) {
unsigned int hit_i = pixelTriplets.hitIndices()[pixelTripletIndex][i];
for (int j = Params_pLS::kHits; j < Params_pT5::kHits; ++j) {
if (hit_i == pixelQuintuplets.hitIndices()[pixelQuintupletIndex][j]) {
nOTMatched++;
break;
}
}
}
if (nOTMatched >= 4)
pixelTriplets.isDup()[pixelTripletIndex] = true;
}
}
}
}
Expand Down Expand Up @@ -275,9 +293,38 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
}
if ((dR2 < 0.02f && d2 < 0.1f) || (dR2 < 1e-3f && d2 < 1.0f)) {
quintuplets.isDup()[iT5] = true;
} else if (dEta < 0.15f && alpaka::math::abs(acc, dPhi) < 0.15f) {
// OT hit matching: T5 hits vs pT5 OT hits
int nOTMatched = 0;
for (int i = 0; i < Params_T5::kHits; ++i) {
unsigned int hit_i = quintuplets.hitIndices()[iT5][i];
for (int j = Params_pLS::kHits; j < Params_pT5::kHits; ++j) {
if (hit_i == pixelQuintuplets.hitIndices()[jx][j]) {
nOTMatched++;
break;
}
}
}
if (nOTMatched >= 4)
quintuplets.isDup()[iT5] = true;
}
} else if (dR2 < 1e-3f) {
quintuplets.isDup()[iT5] = true;
} else if (dEta < 0.15f && alpaka::math::abs(acc, dPhi) < 0.15f) {
// OT hit matching: T5 hits [0..9] vs pT3 OT hits
unsigned int ptidx = jx - pixelQuintuplets.nPixelQuintuplets();
int nOTMatched = 0;
for (int i = 0; i < Params_T5::kHits; ++i) {
unsigned int hit_i = quintuplets.hitIndices()[iT5][i];
for (int j = Params_pLS::kHits; j < Params_pT3::kHits; ++j) {
if (hit_i == pixelTriplets.hitIndices()[ptidx][j]) {
nOTMatched++;
break;
}
}
}
if (nOTMatched >= 4)
quintuplets.isDup()[iT5] = true;
}

if (quintuplets.isDup()[iT5])
Expand Down Expand Up @@ -443,6 +490,20 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
float dR2 = dEta * dEta + dPhi * dPhi;
if (dR2 < 1e-3f) {
quadruplets.isDup()[iT4] = true;
} else if (dEta < 0.2f && alpaka::math::abs(acc, dPhi) < 0.2f) {
// OT hit matching: T4 hits vs T5 hits
int nMatched = 0;
for (int i = 0; i < Params_T4::kHits; ++i) {
unsigned int hit_i = quadruplets.hitIndices()[iT4][i];
for (int j = 0; j < Params_T5::kHits; ++j) {
if (hit_i == quintuplets.hitIndices()[quintupletIndex][j]) {
nMatched++;
break;
}
}
}
if (nMatched >= 2)
quadruplets.isDup()[iT4] = true;
}
}
if (type == LSTObjType::pT3) {
Expand All @@ -467,8 +528,23 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);

float dR2 = dEta * dEta + dPhi * dPhi;
if (dR2 < 1e-3f)
if (dR2 < 1e-3f) {
quadruplets.isDup()[iT4] = true;
} else if (dEta < 0.2f && alpaka::math::abs(acc, dPhi) < 0.2f) {
// OT hit matching: T4 hits vs pT3 OT hits
int nMatched = 0;
for (int i = 0; i < Params_T4::kHits; ++i) {
unsigned int hit_i = quadruplets.hitIndices()[iT4][i];
for (int j = Params_pLS::kHits; j < Params_pT3::kHits; ++j) {
if (hit_i == pixelTriplets.hitIndices()[pT3Index][j]) {
nMatched++;
break;
}
}
}
if (nMatched >= 2)
quadruplets.isDup()[iT4] = true;
}
}
if (type == LSTObjType::pT5) {
unsigned int quintupletIndex = outerTrackletIdx;
Expand All @@ -494,6 +570,20 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
float dR2 = dEta * dEta + dPhi * dPhi;
if (dR2 < 1e-3f) {
quadruplets.isDup()[iT4] = true;
} else if (dEta < 0.2f && alpaka::math::abs(acc, dPhi) < 0.2f) {
// OT hit matching: T4 hits vs pT5 OT hits
int nMatched = 0;
for (int i = 0; i < Params_T4::kHits; ++i) {
unsigned int hit_i = quadruplets.hitIndices()[iT4][i];
for (int j = 0; j < Params_T5::kHits; ++j) {
if (hit_i == quintuplets.hitIndices()[quintupletIndex][j]) {
nMatched++;
break;
}
}
}
if (nMatched >= 2)
quadruplets.isDup()[iT4] = true;
}
}
}
Expand Down