Skip to content
Snippets Groups Projects

FPGA TrackSim: GenScan re-factoring

Merged Elliot Lipeles requested to merge lipeles/athena:lipeles_merge into main
All threads resolved!

This is the next installment of the re-factoring of the GenScan code. Here the old BinningBase has been split into three classes: -- BinDescBase which describes the variables for the track parameters for the binning -- BinStep which describes each step of the binning (this generalized the old code where the steps were hardwires to "slice", "scan", and "row") -- BinTool which contains a list of BinStep to define the full binning

@brosser you might want to start looking at these

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Adam Edward BartonAdam Edward Barton 1 month ago (Mar 10, 2025 12:45pm UTC)

Merge details

  • Changes merged into main with 9160d475 (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
  • Looks good to me other than the two comments, asking L2 to take a second look. -l1

  • Elliot Lipeles added 1 commit

    added 1 commit

    Compare with previous version

  • Elliot Lipeles resolved all threads

    resolved all threads

  • This merge request affects 1 package:

    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning

    This merge request affects 5 files:

    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinDesc.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinStep.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinTool.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/src/FPGATrackSimBinStep.cxx
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/src/FPGATrackSimBinTool.cxx
  • :white_check_mark: CI Result SUCCESS (hash 8aa6b8e2)

    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 (remote access info)

  • MR already reviewed by previous shifter, just adding the request of a second look of the L2 before approving. L1 (Fábio).

  • Looks good from L2 PoV. Just a minor comment about a comment.

    Karolos (L2)

  • Elliot Lipeles added 1 commit

    added 1 commit

    • 50c2a86d - removed stray commented code

    Compare with previous version

  • Elliot Lipeles resolved all threads

    resolved all threads

  • This merge request affects 1 package:

    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning

    This merge request affects 5 files:

    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinDesc.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinStep.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinTool.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/src/FPGATrackSimBinStep.cxx
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/src/FPGATrackSimBinTool.cxx
  • :white_check_mark: CI Result SUCCESS (hash 50c2a86d)

    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 (remote access info)

  • All threads resolved and CI passed. Approving from L1 side (Fábio).

  • Tadej Novak
  • Elliot Lipeles added 1 commit

    added 1 commit

    • 1f2d6999 - renamed FPGATrackSimBinDescBase to IFPGATrackSimBinDesc

    Compare with previous version

  • This merge request affects 1 package:

    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning

    This merge request affects 5 files:

    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinStep.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/FPGATrackSimBinTool.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/FPGATrackSimBinning/IFPGATrackSimBinDesc.h
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/src/FPGATrackSimBinStep.cxx
    • Trigger/EFTracking/FPGATrackSim/FPGATrackSimBinning/src/FPGATrackSimBinTool.cxx
  • :white_check_mark: CI Result SUCCESS (hash 1f2d6999)

    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 (remote access info)

  • Lukas Kretschmann resolved all threads

    resolved all threads

  • Changes look fine and CI succeeds, approving for L1. -L1

  • mentioned in commit 9160d475

  • Please register or sign in to reply
    Loading