Skip to content

modify find_duplicates_sharedhits #393

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

Closed
leonardogiannini wants to merge 1 commit into from
Closed

modify find_duplicates_sharedhits #393

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
75 changes: 43 additions & 32 deletions mkFit/MkStdSeqs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,20 @@ void find_duplicates_sharedhits(TrackVec &tracks, const float fraction)
{
const auto ntracks = tracks.size();

std::vector<float> ctheta(ntracks);
std::vector<float> ctheta(ntracks);
std::multimap<int, int> theHitMap;

for (auto itrack = 0U; itrack < ntracks; itrack++)
{
auto &trk = tracks[itrack];
ctheta[itrack] = 1.f/std::tan(trk.theta());
for (int i = 0; i < trk.nTotalHits(); ++i)
{
if (trk.getHitIdx(i)<0) continue;
int a=trk.getHitLyr(i);
int b=trk.getHitIdx(i);
theHitMap.insert(std::make_pair(b*1000+a, i>0?itrack:-itrack)); //negative for first hit in trk
}
}

for (auto itrack = 0U; itrack < ntracks; itrack++)
Expand All @@ -469,42 +478,44 @@ void find_duplicates_sharedhits(TrackVec &tracks, const float fraction)
auto phi1 = trk.momPhi();
auto ctheta1 = ctheta[itrack];

for (auto jtrack = itrack + 1; jtrack < ntracks; jtrack++)
std::map<int,int> theSharingMap;
for (int i = 0; i < trk.nTotalHits(); ++i)
{
auto &track2 = tracks[jtrack];
auto sharedCount=0;
auto sharedFirst=0;
if (trk.getHitIdx(i)<0) continue;
int a=trk.getHitLyr(i);
int b=trk.getHitIdx(i);
auto range = theHitMap.equal_range(b*1000+a);
for (auto it = range.first; it != range.second; ++it)
{
if( std::abs(it->second) >= itrack ) continue; // don't check your own hits (==) nor sym. checks (>)
if (i==0 && it->second<0) continue; // shared first - first is not counted
theSharingMap[std::abs(it->second)]++;
}
}

auto dctheta = std::abs(ctheta[jtrack] - ctheta1);
if (dctheta > 1.) continue;
for(const auto& elem : theSharingMap)
{
auto &track2 = tracks[elem.first];

auto dphi = std::abs(squashPhiMinimal(phi1 - track2.momPhi()));
if (dphi > 1.) continue;
//these dctheta dphi are wasting time here -> need to remove these checks and revisit the fraction WP
auto dctheta = std::abs(ctheta[elem.first] - ctheta1); if (dctheta > 1.) continue;
if (dctheta > 1.) continue;

auto dphi = std::abs(squashPhiMinimal(phi1 - track2.momPhi()));
if (dphi > 1.) continue;

if ((elem.second) >= ((std::min(trk.nFoundHits(), track2.nFoundHits()) ) * (fraction)) )
{
if (trk.score() > track2.score())
track2.setDuplicateValue(true);
else
trk.setDuplicateValue(true);
}
} // end sharing hits loop
} // end trk loop

for (int i = 0; i < trk.nTotalHits(); ++i)
{
if (trk.getHitIdx(i)<0) continue;
int a=trk.getHitLyr(i);
int b=trk.getHitIdx(i);
for (int j = 0; j < track2.nTotalHits(); ++j)
{
if (track2.getHitIdx(j)<0) continue;
int c=track2.getHitLyr(j);
int d=track2.getHitIdx(j);
if(a==c && b==d) sharedCount+=1;
if(a==c && b==d && j==0 && i==0) sharedFirst+=1;
}
}
if ((sharedCount - sharedFirst) >= ((std::min(trk.nFoundHits(), track2.nFoundHits()) - sharedFirst) * (fraction)) )
{
if (trk.score() > track2.score())
track2.setDuplicateValue(true);
else
trk.setDuplicateValue(true);
}
}
}
tracks.erase(std::remove_if(tracks.begin(),tracks.end(),[](auto track){return track.getDuplicateValue();}),tracks.end());

}

void find_duplicates_sharedhits_pixelseed(TrackVec &tracks, const float fraction, const float drth_central, const float drth_obarrel, const float drth_forward)
Expand Down