Speed-up seed/dup. cleaning mkFit #37122
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -137,6 +137,12 @@ namespace mkfit { | |
| std::vector<float> d0(ns); | ||
| int i1, i2; //for the sorting | ||
|
|
||
| axis_pow2_u1<float, unsigned short, 16, 8> ax_phi(-Const::PI, Const::PI); | ||
| axis<float, unsigned short, 8, 8> ax_eta(-3.0, 3.0, 30u); | ||
| binnor<unsigned int, decltype(ax_phi), decltype(ax_eta), 24, 8> phi_eta_binnor(ax_phi, ax_eta); | ||
|
|
||
| phi_eta_binnor.begin_registration(ns); | ||
|
|
||
| for (int ts = 0; ts < ns; ts++) { | ||
| const Track &tk = seeds[ts]; | ||
| nHits[ts] = tk.nFoundHits(); | ||
|
|
@@ -151,9 +157,16 @@ namespace mkfit { | |
| y[ts] = tk.y(); | ||
| z[ts] = tk.z(); | ||
| d0[ts] = tk.d0BeamSpot(bspot.x, bspot.y); | ||
|
|
||
| phi_eta_binnor.register_entry_safe(oldPhi[ts], eta[ts]); | ||
| // If one is sure values are *within* axis ranges: b.register_entry(oldPhi[ts], eta[ts]); | ||
| } | ||
|
|
||
| phi_eta_binnor.finalize_registration(); | ||
|
|
||
| for (int sorted_ts = 0; sorted_ts < ns; sorted_ts++) { | ||
| int ts = phi_eta_binnor.m_ranks[sorted_ts]; | ||
|
|
||
| if (not writetrack[ts]) | ||
| continue; // Note: this speed up prevents transitive masking (possibly marginal gain). | ||
|
|
||
|
|
@@ -166,105 +179,122 @@ namespace mkfit { | |
| // To study some more details -- need EventOfHits for this | ||
| int n_ovlp_hits_added = 0; | ||
|
|
||
| auto phi_rng = ax_phi.from_R_rdr_to_N_bins(oldPhi[ts], 0.08f); | ||
| auto eta_rng = ax_eta.from_R_rdr_to_N_bins(eta[ts], .1f); | ||
|
|
||
| for (auto i_phi = phi_rng.begin; i_phi != phi_rng.end; i_phi = ax_phi.next_N_bin(i_phi)) { | ||
| for (auto i_eta = eta_rng.begin; i_eta != eta_rng.end; i_eta = ax_eta.next_N_bin(i_eta)) { | ||
| const auto cbin = phi_eta_binnor.get_content(i_phi, i_eta); | ||
| for (auto i = cbin.first; i < cbin.end(); ++i) { | ||
| int tss = phi_eta_binnor.m_ranks[i]; | ||
|
|
||
| if (not writetrack[ts]) | ||
| continue; | ||
| if (not writetrack[tss]) | ||
| continue; | ||
| if (tss == ts) | ||
| continue; | ||
|
|
||
| const float pt2 = pt[tss]; | ||
|
|
||
| // Always require charge consistency. If different charge is assigned, do not remove seed-track | ||
| if (charge[tss] != charge[ts]) | ||
| continue; | ||
|
|
||
| const float thisDPt = std::abs(pt2 - pt1); | ||
| // Require pT consistency between seeds. If dpT is large, do not remove seed-track. | ||
| if (thisDPt > dpt_common * pt1) | ||
| continue; | ||
|
|
||
| const float eta2 = eta[tss]; | ||
| const float deta2 = std::pow(eta1 - eta2, 2); | ||
|
|
||
| const float oldPhi2 = oldPhi[tss]; | ||
|
|
||
| const float pos2_second = pos2[tss]; | ||
| const float thisDXYSign05 = pos2_second > pos2_first ? -0.5f : 0.5f; | ||
|
|
||
| const float thisDXY = thisDXYSign05 * sqrt(std::pow(x[ts] - x[tss], 2) + std::pow(y[ts] - y[tss], 2)); | ||
|
|
||
| const float invptq_second = invptq[tss]; | ||
|
|
||
| const float newPhi1 = oldPhi1 - thisDXY * invR1GeV * invptq_first; | ||
| const float newPhi2 = oldPhi2 + thisDXY * invR1GeV * invptq_second; | ||
|
|
||
| const float dphi = cdist(std::abs(newPhi1 - newPhi2)); | ||
|
|
||
| const float dr2 = deta2 + dphi * dphi; | ||
|
|
||
| const float thisDZ = z[ts] - z[tss] - thisDXY * (ctheta[ts] + ctheta[tss]); | ||
| const float dz2 = thisDZ * thisDZ; | ||
|
|
||
| // Reject tracks within dR-dz elliptical window. | ||
| // Adaptive thresholds, based on observation that duplicates are more abundant at large pseudo-rapidity and low track pT | ||
| bool overlapping = false; | ||
| if (std::abs(eta1) < etamax_brl) { | ||
| if (pt1 > ptmin_hpt) { | ||
| if (dz2 * dzmax2_inv_bh + dr2 * drmax2_inv_bh < 1.0f) | ||
| overlapping = true; | ||
| } else { | ||
| if (dz2 * dzmax2_inv_bl + dr2 * drmax2_inv_bl < 1.0f) | ||
| overlapping = true; | ||
| } | ||
| } else { | ||
| if (pt1 > ptmin_hpt) { | ||
| if (dz2 * dzmax2_inv_eh + dr2 * drmax2_inv_eh < 1.0f) | ||
| overlapping = true; | ||
| } else { | ||
| if (dz2 * dzmax2_inv_el + dr2 * drmax2_inv_el < 1.0f) | ||
| overlapping = true; | ||
| } | ||
| } | ||
|
|
||
| if (overlapping) { | ||
| //Mark tss as a duplicate | ||
| i1 = ts; | ||
| i2 = tss; | ||
| if (d0[tss] > d0[ts]) | ||
| writetrack[tss] = false; | ||
| else { | ||
| writetrack[ts] = false; | ||
| i2 = ts; | ||
| i1 = tss; | ||
| } | ||
| // Add hits from tk2 to the seed we are keeping. | ||
| // NOTE: We have a limit in Track::Status for the number of seed hits. | ||
| // There is a check at entry and after adding of a new hit. | ||
| Track &tk = seeds[i1]; | ||
| if (merge_hits && tk.nTotalHits() < Track::Status::kMaxSeedHits) { | ||
| const Track &tk2 = seeds[i2]; | ||
| //We are not actually fitting to the extra hits; use chi2 of 0 | ||
| float fakeChi2 = 0.0; | ||
|
|
||
| for (int j = 0; j < tk2.nTotalHits(); ++j) { | ||
| int hitidx = tk2.getHitIdx(j); | ||
| int hitlyr = tk2.getHitLyr(j); | ||
| if (hitidx >= 0) { | ||
| bool unique = true; | ||
| for (int i = 0; i < tk.nTotalHits(); ++i) { | ||
| if ((hitidx == tk.getHitIdx(i)) && (hitlyr == tk.getHitLyr(i))) { | ||
| unique = false; | ||
| break; | ||
| } | ||
| } | ||
| if (unique) { | ||
| tk.addHitIdx(tk2.getHitIdx(j), tk2.getHitLyr(j), fakeChi2); | ||
| ++n_ovlp_hits_added; | ||
| if (tk.nTotalHits() >= Track::Status::kMaxSeedHits) | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| if (n_ovlp_hits_added > 0) | ||
| tk.sortHitsByLayer(); | ||
| } | ||
| } //end of inner loop over tss | ||
| } //eta bin | ||
| } //phi bin | ||
|
|
||
| if (writetrack[ts]) { | ||
| cleanSeedTracks.emplace_back(seeds[ts]); | ||
|
|
@@ -399,54 +429,62 @@ namespace mkfit { | |
| const auto ntracks = tracks.size(); | ||
|
|
||
| std::vector<float> ctheta(ntracks); | ||
| std::multimap<int, int> hitMap; | ||
|
|
||
| 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); | ||
| hitMap.insert(std::make_pair(b * 1000 + a, i > 0 ? itrack : -itrack)); //negative for first hit in trk | ||
|
Contributor
Author
There was a problem hiding this comment. a way to write layer and hit id in a single int.
Contributor
There was a problem hiding this comment. I know, I commented already here: #36546 (comment), not sure if it's in the plans to document it. |
||
| } | ||
| } | ||
|
|
||
| for (auto itrack = 0U; itrack < ntracks; itrack++) { | ||
| auto &trk = tracks[itrack]; | ||
| auto phi1 = trk.momPhi(); | ||
| auto ctheta1 = ctheta[itrack]; | ||
|
|
||
| std::map<int, int> sharingMap; | ||
| for (int i = 0; i < trk.nTotalHits(); ++i) { | ||
| if (trk.getHitIdx(i) < 0) | ||
| continue; | ||
| int a = trk.getHitLyr(i); | ||
| int b = trk.getHitIdx(i); | ||
| auto range = hitMap.equal_range(b * 1000 + a); | ||
| for (auto it = range.first; it != range.second; ++it) { | ||
| if (std::abs(it->second) >= (int)itrack) | ||
| continue; // don't check your own hits (==) nor sym. checks (>) | ||
| if (i == 0 && it->second < 0) | ||
| continue; // shared first - first is not counted | ||
| sharingMap[std::abs(it->second)]++; | ||
| } | ||
| } | ||
|
|
||
| for (const auto &elem : sharingMap) { | ||
| auto &track2 = tracks[elem.first]; | ||
|
|
||
| // broad dctheta-dphi compatibility checks; keep mostly to preserve consistency with old results | ||
| auto dctheta = std::abs(ctheta[elem.first] - ctheta1); | ||
| 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 | ||
|
|
||
| tracks.erase(std::remove_if(tracks.begin(), tracks.end(), [](auto track) { return track.getDuplicateValue(); }), | ||
| tracks.end()); | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
usual set of hard-coded constants.