Restructure HLTMenu JSON
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
Merge request reports
Activity
This merge request affects 5 packages:
- Trigger/TrigConfiguration/TrigConfData
- Trigger/TrigConfiguration/TrigConfigSvc
- Trigger/TrigMonitoring/TrigSteerMonitor
- Trigger/TrigSteer/TrigOutputHandling
- Trigger/TriggerCommon/TriggerMenuMT
Adding @tamartin ,@asonay ,@orlando ,@rbielski ,@cmorenom ,@mark as watchers
added DQ TriggerMenu labels
- Resolved by Mark Stockton
CI Result FAILURE (hash 42c6bae5)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 1, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 15312]
- Resolved by Mark Stockton
- Resolved by Mark Stockton
- Resolved by Mark Stockton
- Resolved by Mark Stockton
- Resolved by Mark Stockton
Thanks a lot for these updates! I made some small comments on my end, otherwise looks good to me.
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
- Resolved by Mark Stockton
Should not clash with in-file JSON update
CI Result SUCCESS (hash fd7f7131)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 15346]- Resolved by Mark Stockton
BTW, the MTCalibPeb options which write a dummy JSON file also have to be adapted:
https://gitlab.cern.ch/atlas/athena/-/blob/release/22.0.14/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py#L314I can take care of this if you prefer. What's the timescale of this MR? Do you plan to have this before next technical run?
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
added review-pending-level-1 label
CI Result SUCCESS (hash a6b5f75a)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 15735]added review-approved label and removed review-pending-level-1 label
@mark I can't auto squash this, do you want to squash it yourself or should I merge as separate commits.
mentioned in commit 33e32a04
added sweep:ignore label