Skip to content
Snippets Groups Projects

[ATR-21373] Trigger JSON menu metadata storage and access

Merged [ATR-21373] Trigger JSON menu metadata storage and access
All threads resolved!
Merged Tim Martin requested to merge tamartin/athena:triggerJsonPayload_2 into master
All threads resolved!

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.

Edited by Tim Martin

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
  • Bumping to L2 given huge MR size --L1

  • Tim Martin added 1 commit

    added 1 commit

    • 0d98d03b - Bug fix in xAOD name and pushing back of prescales

    Compare with previous version

  • Tim Martin added 1 commit

    added 1 commit

    Compare with previous version

  • 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

  • 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

  • :white_check_mark: CI Result SUCCESS (hash 08a63966)

    Athena AthSimulation AthGeneration AnalysisBase
    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: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22337]

  • Tadej Novak resolved all threads

    resolved all threads

  • Looks OK from L2 point of view, approving.

    Tadej (L2)

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

  • mentioned in commit 8a8f6871

  • Tim Martin mentioned in merge request !32844 (closed)

    mentioned in merge request !32844 (closed)

  • Tim Martin mentioned in merge request !37632 (merged)

    mentioned in merge request !37632 (merged)

  • Tim Martin mentioned in merge request !37691 (merged)

    mentioned in merge request !37691 (merged)

  • Tim Martin mentioned in merge request !37533 (merged)

    mentioned in merge request !37533 (merged)

  • Tim Martin mentioned in merge request !38226 (merged)

    mentioned in merge request !38226 (merged)

  • Please register or sign in to reply
    Loading