[ATR-21373] Trigger JSON menu metadata storage and access
Squash of !32844 (closed)
This MR populates and propagates new xAOD::TriggerMenuJsonContainer
branches into the POOL metadata collection.
There are separate branches for the L1 menus, HLT menus, L1 PS sets, HLT PS sets and bunchgroups - though bunchgroup JSON are not yet ready, this is commented out.
These work together to replace the xAOD::TriggerMenu
branch which was used throughout R2.
Both the xAOD::TrigConfSvc and xAOD::TrigConfTool are able to decode and serve configuration data from either the R2 xAOD::TriggerMenu
or the R3 xAOD::TriggerMenuJsonContainer
. With xAOD::TrigConfSvc doing so fully thread-safely. For R3 AOD, the ptree corresponding to the JSON data structure are accessible and the full content may be explored.
For R3 and R2 AOD, the existing legacy interface (originating back from R1) continues to be supported, allowing old code to continue to function when running on files which only store the JSON payload.
The xAOD::TriggerMenu
writing is not yet disabled, hence for a while we will write the data in both formats. We will move to switch this off once everything is confirmed OK.
Merge request reports
Activity
This merge request affects 7 packages:
- Projects/AnalysisBase
- Reconstruction/RecExample/RecExPers
- Trigger/TrigConfiguration/TrigConfData
- Trigger/TrigConfiguration/TrigConfxAOD
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigSteer/L1Decoder
- Trigger/TriggerCommon/TriggerJobOpts
Adding @goetz ,@krumnack ,@orlando ,@cmorenom ,@mark ,@tamartin ,@akraszna ,@asonay ,@rbianchi as watchers
added Build DQ Egamma Reconstruction Trigger master review-pending-level-1 labels
CI Result FAILURE (hash 60e2ac95)Athena AthSimulation AthGeneration AnalysisBase 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
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 21716]added review-user-action-required label and removed review-pending-level-1 label
added 866 commits
-
60e2ac95...2dff6d62 - 864 commits from branch
atlas:master
- 9a0c0580 - Merge remote-tracking branch 'upstream/master' into triggerJsonPayload_2
- e88355f2 - Add L1PS set creation to new JO, move L1PS conditions from L1Decoder to...
-
60e2ac95...2dff6d62 - 864 commits from branch
This merge request affects 7 packages:
- Projects/AnalysisBase
- Reconstruction/RecExample/RecExPers
- Trigger/TrigConfiguration/TrigConfData
- Trigger/TrigConfiguration/TrigConfxAOD
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigSteer/L1Decoder
- Trigger/TriggerCommon/TriggerJobOpts
Adding @goetz ,@krumnack ,@orlando ,@cmorenom ,@mark ,@tamartin ,@akraszna ,@asonay ,@rbianchi as watchers
added review-pending-level-1 label and removed review-user-action-required label
CI Result SUCCESS (hash e88355f2)Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22254]This merge request affects 7 packages:
- Projects/AnalysisBase
- Reconstruction/RecExample/RecExPers
- Trigger/TrigConfiguration/TrigConfData
- Trigger/TrigConfiguration/TrigConfxAOD
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigSteer/L1Decoder
- Trigger/TriggerCommon/TriggerJobOpts
Adding @goetz ,@krumnack ,@orlando ,@cmorenom ,@mark ,@tamartin ,@akraszna ,@asonay ,@rbianchi as watchers
CI Result SUCCESS (hash 4c0afdf9)Athena AthSimulation AthGeneration AnalysisBase 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
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22293]- Resolved by Tadej Novak
- Resolved by Tim Martin
- Resolved by Tim Martin
added review-pending-level-2 label and removed review-pending-level-1 label
added 1 commit
- 0d98d03b - Bug fix in xAOD name and pushing back of prescales
This merge request affects 7 packages:
- Projects/AnalysisBase
- Reconstruction/RecExample/RecExPers
- Trigger/TrigConfiguration/TrigConfData
- Trigger/TrigConfiguration/TrigConfxAOD
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigSteer/L1Decoder
- Trigger/TriggerCommon/TriggerJobOpts
Adding @goetz ,@krumnack ,@orlando ,@cmorenom ,@mark ,@tamartin ,@akraszna ,@asonay ,@rbianchi as watchers
added review-pending-level-1 label and removed review-pending-level-2 label
This merge request affects 7 packages:
- Projects/AnalysisBase
- Reconstruction/RecExample/RecExPers
- Trigger/TrigConfiguration/TrigConfData
- Trigger/TrigConfiguration/TrigConfxAOD
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigSteer/L1Decoder
- Trigger/TriggerCommon/TriggerJobOpts
Adding @goetz ,@krumnack ,@orlando ,@cmorenom ,@mark ,@tamartin ,@akraszna ,@asonay ,@rbianchi as watchers
added review-pending-level-2 label and removed review-pending-level-1 label
CI Result SUCCESS (hash 08a63966)Athena AthSimulation AthGeneration AnalysisBase 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
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22337]added review-approved label and removed review-pending-level-2 label
mentioned in commit 8a8f6871
added sweep:ignore label
mentioned in merge request !32844 (closed)
mentioned in merge request !37632 (merged)
mentioned in merge request !37691 (merged)
mentioned in merge request !37533 (merged)
mentioned in merge request !38226 (merged)