Merge branch 'step_align2' into 'master' (57171502) · 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

57171502

Commit 57171502 authored 4 years ago by Edward Moyse

Downloads
- Plain Diff

Merge branch 'step_align2' into 'master'

HLT Menu&CF: fix ERROR on duplicated sequences when using EmptyMenuSequences

See merge request atlas/athena!34827

parents 291a5dbb bc44bf3c

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py 1 addition, 1 deletion

...Validation/TrigUpgradeTest/share/EmuStepProcessingTest.py
Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref 5 additions, 7 deletions

...dation/TrigUpgradeTest/share/emu_step_menu_processing.ref
Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py 1 addition, 1 deletion

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py 21 additions, 17 deletions

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

...mon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py 5 additions, 9 deletions

...TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/GenerateTestChainDefs.py 0 additions, 3 deletions

...MenuMT/python/HLTMenuConfig/Test/GenerateTestChainDefs.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py 26 additions, 23 deletions

...Common/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py

with 60 additions and 62 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