Merge branch 'master-SyncL1Menu-Part2' into 'master' (584a4ef4) · Commits · Peter Sherwood / athena

Commit 584a4ef4 authored 4 years ago by Adam Edward Barton

Merge branch 'master-SyncL1Menu-Part2' into 'master'

Master sync l1 menu part2

See merge request atlas/athena!36821

parents f536859c 014e4526

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigConfiguration/TrigConfIO/python/L1TriggerConfigAccess.py 1 addition, 1 deletion

...gConfiguration/TrigConfIO/python/L1TriggerConfigAccess.py
Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt 1 addition, 0 deletions

Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py 16 additions, 19 deletions

Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py 4 additions, 1 deletion

...TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py 1 addition, 1 deletion

...r/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py 102 additions, 0 deletions

...mon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py 324 additions, 362 deletions

...iggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py 35 additions, 36 deletions

...ger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py 25 additions, 14 deletions

...iggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py 67 additions, 84 deletions

...mmon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py 68 additions, 62 deletions

...iggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py
Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoMenu.py 1 addition, 1 deletion

.../TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoMenu.py
Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/Menu_LS2_v1.py 1 addition, 1 deletion

...gerMenuMT/python/LVL1MenuConfig/L1TopoMenu/Menu_LS2_v1.py
Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py 85 additions, 245 deletions

...gerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py 18 additions, 18 deletions

...n/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py
Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/Menu_LS2_v1.py 3 additions, 3 deletions

...iggerMenuMT/python/LVL1MenuConfig/LVL1Menu/Menu_LS2_v1.py
Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ThresholdDef.py 7 additions, 3 deletions

...ggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ThresholdDef.py
Trigger/TriggerCommon/TriggerMenuMT/scripts/trigCompareOldandNewL1Menus.py 263 additions, 20 deletions

...mmon/TriggerMenuMT/scripts/trigCompareOldandNewL1Menus.py
Trigger/TriggerCommon/TriggerMenuMT/scripts/trigL1MenuMigrationCheck.sh 47 additions, 0 deletions

...rCommon/TriggerMenuMT/scripts/trigL1MenuMigrationCheck.sh

with 1069 additions and 871 deletions

Please register or to comment