Skip to content
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

back to BackwardFitBH for iters without bw search #349

Closed
wants to merge 2 commits into from
Closed

back to BackwardFitBH for iters without bw search #349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7852743
back to BackwardFitBH for iters without bw search
slava77devel Aug 28, 2021
6bc5d91
back to BackwardFitBH for iters without bw search in runBtpCe_MultiIt…
slava77devel Aug 28, 2021
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
45 changes: 29 additions & 16 deletions mkFit/buildtestMPlex.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,20 +531,23 @@ std::vector<double> runBtpCe_MultiIter(Event& ev, const EventOfHits &eoh, MkBuil
// now do backwards fit... do we want to time this section?
if (Config::backwardFit)
{
// a) TrackVec version:
// builder.BackwardFitBH();

// b) Version that runs on CombCand / TrackCand
builder.BackwardFit();

if (Config::backwardSearch && itconf.m_backward_search)
if (!(Config::backwardSearch && itconf.m_backward_search))
{
// a) TrackVec version:
builder.BackwardFitBH();
}
else
{
// b) Version that runs on CombCand / TrackCand
builder.BackwardFit();

builder.BeginBkwSearch();
builder.FindTracksCloneEngine(SteeringParams::IT_BkwSearch);
builder.EndBkwSearch();
}

builder.select_best_comb_cands(true); // true -> clear m_tracks as they were already filled once above
builder.select_best_comb_cands(true); // true -> clear m_tracks as they were already filled once above
}


StdSeq::find_and_remove_duplicates(builder.ref_tracks_nc(), itconf);
builder.export_tracks(ev.fitTracks_);
Expand Down Expand Up @@ -646,19 +649,29 @@ void run_OneIteration(const TrackerInfo& trackerInfo, const IterationConfig &itc
{ return StdSeq::qfilter_n_hits_pixseed(t, 3); });
}

if (do_backward_fit)

if (itconf.m_backward_search)
{
builder.BackwardFit();
if (do_backward_fit)
{
builder.BackwardFit();

if (itconf.m_backward_search)
builder.BeginBkwSearch();
builder.FindTracksCloneEngine(SteeringParams::IT_BkwSearch);
builder.EndBkwSearch();
}
builder.export_best_comb_cands(out_tracks);
}
else
{
builder.select_best_comb_cands();
if (do_backward_fit)
{
builder.BeginBkwSearch();
builder.FindTracksCloneEngine(SteeringParams::IT_BkwSearch);
builder.EndBkwSearch();
builder.BackwardFitBH();
}
builder.export_tracks(out_tracks);
}

builder.export_best_comb_cands(out_tracks);

if (do_remove_duplicates)
{
Expand Down