Merge branch 'TM-June1_MU21Fix_21.0Merge' into '21.0' (a5cc8a5e) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

a5cc8a5e

Commit a5cc8a5e authored 7 years ago by Hass AbouZeid

Downloads
- Plain Diff

Merge branch 'TM-June1_MU21Fix_21.0Merge' into '21.0'

ATR-16428, MU21 fix 21.0 merge

See merge request !2451

parents 5c664fbc 5d177db7

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py 3 additions, 3 deletions

Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py 9 additions, 0 deletions

Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py
Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py 46 additions, 46 deletions

Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py 106 additions, 104 deletions

...er/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml 6 additions, 15 deletions

...TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml 6 additions, 15 deletions

...erCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml

with 176 additions and 183 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