Merge remote-tracking branch 'upstream/21.3' into NSWMMFastDigi0313 (3a8349ad) · Commits · Kin Yip Fung / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

3a8349ad

Commit 3a8349ad authored 6 years ago by Jing Chen

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/21.3' into NSWMMFastDigi0313

parents b43bf604 1e66c999

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v8.py 1 addition, 12 deletions

.../TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v8.py
Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py 54 additions, 58 deletions

Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py
Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt 1 addition, 1 deletion

Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v8.xml 9 additions, 65 deletions

...TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v8.xml
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v8.xml 9 additions, 65 deletions

...erCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v8.xml

with 74 additions and 201 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