Merge branch 'TMMT_ATR22206_Merging' into 'master' (4499ee8a) · Commits · Peter Sherwood / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

4499ee8a

Commit 4499ee8a authored 4 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'TMMT_ATR22206_Merging' into 'master'

ATR-22206, adding functionality for multi-leg merging

See merge request atlas/athena!39109

parents 296e1e34 359f13a4

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref 10 additions, 0 deletions

...n/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref 2 additions, 6 deletions

...TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py 217 additions, 63 deletions

...n/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py 1 addition, 1 deletion

...TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py 1 addition, 1 deletion

...rCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py 16 additions, 7 deletions

...TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py

with 247 additions and 78 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment