Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

d3797684

Commit d3797684 authored 6 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'removeEBstepFromTMMT' into 'master'

Added new menu (LS2_emu_v1) and electron chain, removed EBstep and fix of TMMT compilation warning

See merge request atlas/athena!22148

parents e38325ed 0f75913a

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref 3 additions, 1 deletion

Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref
Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py 2 additions, 2 deletions

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py 6 additions, 2 deletions

.../TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py 5 additions, 45 deletions

...ggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py 97 additions, 0 deletions

...mon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py 8 additions, 8 deletions

...rCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py 19 additions, 2 deletions

...gerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py
Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuMT.sh 11 additions, 7 deletions

...r/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuMT.sh
Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py 1 addition, 1 deletion

...TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py

with 152 additions and 68 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