Skip to content
Snippets Groups Projects

simplify branch stopper implemented as a lambda

Merged Tim Adye requested to merge adye/athena:adye-ckf58 into main
All threads resolved!

CkfBranchStopper can be simplified by converting it to call a lambda defined in findTracks.

Edited by Tim Adye

Merge request reports

Pipeline #7456175 passed

Pipeline passed for 2c6025ad on adye:adye-ckf58

Approval is optional

All merge request dependencies have been merged (3 merged)

Merged by Frank WinklmeierFrank Winklmeier 9 months ago (May 28, 2024 9:25am UTC)

Merge details

  • Changes merged into main with 6d49a72b (commits were squashed).
  • Did not delete the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Jenkins please retry a build

  • This merge request affects 1 package:

    • Tracking/Acts/ActsTrackReconstruction

    This merge request affects 3 files:

    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx
    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h
    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingData.h

    Adding @jojungge ,@pagessin ,@adye ,@cvarni ,@tbold ,@goetz ,@toyamaza as watchers

  • :white_check_mark: CI Result SUCCESS (hash cf319f05)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    tests :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 10230] (remote access info)

  • Hi @adye there are some MR conflicts. Can you resolve them?

  • Jenkins please retry a build

  • Jenkins please retry a build

  • Tim Adye resolved all threads

    resolved all threads

  • Tim Adye marked this merge request as draft

    marked this merge request as draft

  • Tim Adye added 130 commits

    added 130 commits

    • cf319f05...54915b41 - 127 commits from branch atlas:main
    • 46976e5d - CkfBranchStopper now calls a lambda
    • 8e0463e0 - simplify further: Acts::Delegate can in fact use a lambda capture
    • 2c6025ad - undo formatting change

    Compare with previous version

  • Tim Adye marked this merge request as ready

    marked this merge request as ready

  • Tim Adye changed the description

    changed the description

  • Author Developer

    Jenkins please retry a build

  • This merge request affects 1 package:

    • Tracking/Acts/ActsTrackReconstruction

    This merge request affects 3 files:

    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx
    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h
    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingData.h

    Adding @pagessin ,@jojungge ,@adye ,@tbold ,@cvarni ,@toyamaza ,@goetz as watchers

  • :x: CI Result FAILURE (hash 2c6025ad)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    tests :o:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 10264] (remote access info)

  • Tim Adye resolved all threads

    resolved all threads

  • Rerunning CI after !71744 (merged)

  • Jenkins please retry a build

  • This merge request affects 1 package:

    • Tracking/Acts/ActsTrackReconstruction

    This merge request affects 3 files:

    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.cxx
    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingAlg.h
    • Tracking/Acts/ActsTrackReconstruction/src/TrackFindingData.h

    Adding @jojungge ,@goetz ,@tbold ,@toyamaza ,@pagessin ,@adye ,@cvarni as watchers

  • lgtm. waiting for CI to confirm everything is ok and then I can approve

  • :white_check_mark: CI Result SUCCESS (hash 2c6025ad)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    tests :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 10316] (remote access info)

  • added review-approved label and removed review-pending-level-2 label

  • mentioned in commit 6d49a72b

  • Please register or sign in to reply
    Loading