Skip to content
Snippets Groups Projects

Fix for branching logic in tracking core.

Merged Dominik Smith requested to merge d.smith/cbmroot:TrackingFix into master
All threads resolved!

Changed "&&" to "||" as discussed yesterday in private conversations.

Includes !1903 (closed) and should be applied after the other MR is merged (bugfix is in the second-to-last commit here, see !1910 (0fb80229)).

Edited by Dominik Smith

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Dominik Smith added 6 commits

    added 6 commits

    • 0fb80229...7be16917 - 3 commits from branch computing:master
    • 49479a30 - - Cleaned up ca::TripletConstructor.
    • a31f4483 - Fixed branching logic in ca::TrackFinderWindow::DoCompetitionLoop().
    • 12c62516 - Replaced ca::Vector::erase() by ca::Vector::reduce() in ca::TripletConstructor.

    Compare with previous version

  • Dominik Smith added 7 commits

    added 7 commits

    • 12c62516...584a3864 - 5 commits from branch computing:master
    • 04a814e6 - - Cleaned up ca::TripletConstructor.
    • 0175c0b8 - Fixed branching logic in ca::TrackFinderWindow::DoCompetitionLoop().

    Compare with previous version

  • Dominik Smith added 3 commits

    added 3 commits

    • 16919daa - - Cleaned up ca::TripletConstructor.
    • 95ad49c3 - Fixed branching logic in ca::TrackFinderWindow::DoCompetitionLoop().
    • 19daa88e - Replaced ca::Vector::erase() by ca::Vector::reduce() in ca::TripletConstructor.

    Compare with previous version

  • Sergey Gorbunov resolved all threads

    resolved all threads

  • Dominik Smith changed the description

    changed the description

  • added 5 commits

    • 19daa88e...d6cf7018 - 2 commits from branch computing:master
    • cbb0c4fc - - Cleaned up ca::TripletConstructor.
    • 2ba831b6 - Fixed branching logic in ca::TrackFinderWindow::DoCompetitionLoop().
    • 82ab656f - Replaced ca::Vector::erase() by ca::Vector::reduce() in ca::TripletConstructor.

    Compare with previous version

  • Sergey Gorbunov approved this merge request

    approved this merge request

  • Sergey Gorbunov enabled an automatic merge when the pipeline for 82ab656f succeeds

    enabled an automatic merge when the pipeline for 82ab656f succeeds

  • Sergey Gorbunov mentioned in merge request !1918 (merged)

    mentioned in merge request !1918 (merged)

  • Please register or sign in to reply
    Loading