Skip to content
Snippets Groups Projects

Restructure HLTMenu JSON

Merged Mark Stockton requested to merge mark/athena:master-hltjson into master
All threads resolved!

Neaten HLTMenu JSON structure for better readability and splitting out streams information. Full example of change to the file on ATR-19837

  • HLTMenuJSON.py -> Split Stream information (saves ~1000lines from LS2 MenuJson)
  • HLTChain:streams -> now a list of strings
  • HLTMenu:streams -> adds access to the properties of all streams
  • StreamTagMakerTool and TrigSignatureMoniMT (cc @rbielski ) updated to use the new/changed functions
  • TrigConfIO for C++ test and also added streams to python access
  • TriggerMenuMT test to new ordered dictionary JSON format (and bug in reporting failures of tests)
  • MTCalibPebConfig.py to write in the new HLT Menu format

Separate MR to update the rulebook to be able to read from the updated format: atlas-trigger-menu/TrigMenuRulebook!534

Removing WIP after confirmed there aren't conflicts with work from @tamartin or other suggestions from @tbold

For future MR: add a HLTStream class to TrigConfData, but implementation here to focus on having updated JSON format for next tests at Point1

Edited by Mark Stockton

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
  • Mark Stockton added 2 commits

    added 2 commits

    • 174c9986 - Updates to TrigConfIO for updated HLTMenu JSON structure
    • fd7f7131 - fix failure reporting and update to new HLTMenu JSON format

    Compare with previous version

  • Rafal Bielski
  • Author Contributor

    Jenkins please retry a build

  • This merge request affects 6 packages:

    • Trigger/TrigConfiguration/TrigConfData
    • Trigger/TrigConfiguration/TrigConfIO
    • Trigger/TrigConfiguration/TrigConfigSvc
    • Trigger/TrigMonitoring/TrigSteerMonitor
    • Trigger/TrigSteer/TrigOutputHandling
    • Trigger/TriggerCommon/TriggerMenuMT

    Adding @tamartin ,@asonay ,@orlando ,@rbielski ,@cmorenom ,@mark as watchers

  • :white_check_mark: CI Result SUCCESS (hash fd7f7131)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 15346]

  • Mark Stockton added 2 commits

    added 2 commits

    • a176a039 - Follow-ups for StreamTagMakerTool
    • a6b5f75a - Updates to MTCalibPebConfig.py for new HLTMenu JSON structure

    Compare with previous version

  • Mark Stockton unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Mark Stockton changed the description

    changed the description

  • Mark Stockton resolved all threads

    resolved all threads

  • This merge request affects 7 packages:

    • HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB
    • Trigger/TrigConfiguration/TrigConfData
    • Trigger/TrigConfiguration/TrigConfIO
    • Trigger/TrigConfiguration/TrigConfigSvc
    • Trigger/TrigMonitoring/TrigSteerMonitor
    • Trigger/TrigSteer/TrigOutputHandling
    • Trigger/TriggerCommon/TriggerMenuMT

    Adding @wiedenma ,@asonay ,@orlando ,@cmorenom ,@mark ,@tamartin ,@fwinkl ,@bernius ,@rbielski as watchers

  • :white_check_mark: CI Result SUCCESS (hash a6b5f75a)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 15735]

  • @mark I can't auto squash this, do you want to squash it yourself or should I merge as separate commits.

  • AFAIK Mark is away today and on Monday and we'd rather have this sooner than later. I would say to go ahead with individual commits.

  • mentioned in commit 33e32a04

  • Please register or sign in to reply
    Loading