diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 4a9b1b7c00968e03fdb470d65330602eba430473..ecb86115ccd3ebef3a52ed1a5fb427d42a9bde42 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -9,6 +9,16 @@ atlas_add_component( TrigUpgradeTest
LINK_LIBRARIES AthenaBaseComps TrigSteeringEvent DecisionHandlingLib TrigCompositeUtilsLib
)
+atlas_add_test( emu_step_processing
+ SCRIPT test/test_emu_step_processing.sh
+ LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
+ )
+
+atlas_add_test( emu_step_menu_processing
+ SCRIPT test/test_emu_step_menu_processing.sh
+ LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
+ )
+
# Install files from the package:
atlas_install_joboptions( share/*.py )
atlas_install_data( share/*.ref share/*.conf )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
index 8990dd80e54fb34fd4d958e7d8a8e8798012ce95..fce3e553d3932d6f96650980a98e8b2fe32473e4 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
@@ -31,14 +31,14 @@ from TriggerMenuMT.HLTMenuConfig.Menu.HLTMenuJSON import generateJSON
# inputMakers: one per each first RecoAlg in a step (so one per step), one input per chain that needs that step
log = logging.getLogger('EmuStepProcessingTest.py')
-log.info('Setup options:')
-defaultOptions = [a for a in dir(opt)]
+
+defaultOptions = [a for a in dir(opt) if not a.startswith('__')]
for option in defaultOptions:
if option in globals():
setattr(opt, option, globals()[option])
- print(' %20s = %s' % (option, getattr(opt, option)))
+ log.info(' %20s = %s' % (option, getattr(opt, option)))
else:
- print(' %20s = (Default) %s' % (option, getattr(opt, option)))
+ log.info(' %20s = (Default) %s' % (option, getattr(opt, option)))
TriggerFlags.generateMenuDiagnostics=True
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
index a81860b7412a01ba01f9c6c032debb3f98c34321..2042cd0163a73b87c138fa9a5d4313031592b3de 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
@@ -1,3 +1,5 @@
+Py:Configurable ERROR attempt to add a duplicate (merged_Step3_Step3_1mu31_leg1_EmptySeqStep3.IMmerged_Step3_Step3_1mu31_leg1_EmptySeqStep3) ... dupe ignored
+Py:Configurable ERROR attempt to add a duplicate (merged_Step4_Step4_1mu11_leg1_EmptySeqStep4.IMmerged_Step4_Step4_1mu11_leg1_EmptySeqStep4) ... dupe ignored
TriggerSummaryStep1 1 0 DEBUG In summary 4 chains passed:
TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
@@ -10,23 +12,19 @@ TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain5_ev3
TriggerSummaryStep3 1 0 DEBUG In summary 2 chains passed:
TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG In summary 23 chains passed:
-TriggerSummaryStep1 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
+TriggerSummaryStep1 2 0 DEBUG In summary 19 chains passed:
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3196402061
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain10_muv2_L1MU10 ID#3482819675
@@ -34,40 +32,40 @@ TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv
TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3844733695
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep2 2 0 DEBUG In summary 19 chains passed:
-TriggerSummaryStep2 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
+TriggerSummaryStep2 2 0 DEBUG In summary 15 chains passed:
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2764921170
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 2 0 DEBUG In summary 5 chains passed:
+TriggerSummaryStep3 2 0 DEBUG In summary 10 chains passed:
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep3 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
+TriggerSummaryStep3 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
TriggerSummaryStep3 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep4 2 0 DEBUG In summary 4 chains passed:
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
+TriggerSummaryStep3 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
+TriggerSummaryStep4 2 0 DEBUG In summary 5 chains passed:
TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
TriggerSummaryStep4 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
+TriggerSummaryStep4 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
TriggerSummaryStep4 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep1 3 0 DEBUG In summary 10 chains passed:
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
+TriggerSummaryStep1 3 0 DEBUG In summary 8 chains passed:
TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
@@ -83,10 +81,13 @@ TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain8_ev1
TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
TriggerSummaryStep2 3 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 3 0 DEBUG In summary 3 chains passed:
+TriggerSummaryStep3 3 0 DEBUG In summary 6 chains passed:
TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
+TriggerSummaryStep3 3 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
+TriggerSummaryStep3 3 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
TriggerSummaryStep4 3 0 DEBUG In summary 2 chains passed:
TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
@@ -97,8 +98,8 @@ TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty
TrigSignatureMoniMT INFO -- #2176116418 Events 1 1 0 1 - - 1
TrigSignatureMoniMT INFO -- #2176116418 Features 0 6 - -
TrigSignatureMoniMT INFO HLT_2TestChain6_muv1_L12MU6 #1408409992
-TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 - - 1
-TrigSignatureMoniMT INFO -- #1408409992 Features 6 6 - -
+TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 1 1 1
+TrigSignatureMoniMT INFO -- #1408409992 Features 6 6 6 6
TrigSignatureMoniMT INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170
TrigSignatureMoniMT INFO -- #2764921170 Events 1 1 0 1 - - 1
TrigSignatureMoniMT INFO -- #2764921170 Features 0 3 - -
@@ -111,12 +112,9 @@ TrigSignatureMoniMT INFO -- #356594709 Features
TrigSignatureMoniMT INFO HLT_TestChain5_ev1_L1EM3 #1756953305
TrigSignatureMoniMT INFO -- #1756953305 Events 3 3 2 2 2 - 2
TrigSignatureMoniMT INFO -- #1756953305 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 #1820214917
-TrigSignatureMoniMT INFO -- #1820214917 Events 1 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #1820214917 Features 2 2 - -
TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009
-TrigSignatureMoniMT INFO -- #2709794009 Events 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2709794009 Features 0 0 - -
+TrigSignatureMoniMT INFO -- #2709794009 Events 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2709794009 Features 0 0 0 -
TrigSignatureMoniMT INFO HLT_TestChain5_ev2_L1EM7 #1760405581
TrigSignatureMoniMT INFO -- #1760405581 Events 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #1760405581 Features 0 0 - -
@@ -130,17 +128,17 @@ TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty2
TrigSignatureMoniMT INFO -- #2511524900 Events 1 1 1 0 1 1 1
TrigSignatureMoniMT INFO -- #2511524900 Features 3 0 3 3
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772
-TrigSignatureMoniMT INFO -- #64374772 Events 2 2 2 1 0 1 1
-TrigSignatureMoniMT INFO -- #64374772 Features 4 3 0 3
+TrigSignatureMoniMT INFO -- #64374772 Events 2 2 1 1 1 1 1
+TrigSignatureMoniMT INFO -- #64374772 Features 3 3 3 3
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061
-TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 - - 0
-TrigSignatureMoniMT INFO -- #3196402061 Features 3 0 - -
+TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #3196402061 Features 3 0 0 0
TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6 #3205587050
-TrigSignatureMoniMT INFO -- #3205587050 Events 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3205587050 Features 0 0 - -
+TrigSignatureMoniMT INFO -- #3205587050 Events 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3205587050 Features 0 0 0 0
TrigSignatureMoniMT INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373
-TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 - - 2
-TrigSignatureMoniMT INFO -- #3476793373 Features 4 4 - -
+TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 2 - 2
+TrigSignatureMoniMT INFO -- #3476793373 Features 4 4 4 -
TrigSignatureMoniMT INFO HLT_TestChain8_ev1_L1EM5 #1677577445
TrigSignatureMoniMT INFO -- #1677577445 Events 4 4 3 3 3 - 3
TrigSignatureMoniMT INFO -- #1677577445 Features 4 4 4 -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_menu_processing.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_menu_processing.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2b42b6743d9ce9b9610c6ec213ae1c75340ae520
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_menu_processing.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# This is not an ART test, but a unit test
+
+# This is a unit test of HLT Control Flow and should be moved to TriggerMenuMT
+
+athena.py -l DEBUG --imf --threads=1 -c "doMenu=True" TrigUpgradeTest/EmuStepProcessingTest.py
+
+
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_processing.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_processing.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c2bd92730f8c6c10fdb79d7438f590a68bef9fbd
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_processing.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# This is not an ART test, but a unit test
+
+# This is a unit test of HLT Control Flow and should be moved to TriggerMenuMT
+
+athena.py -l DEBUG --imf --threads=1 -c "doMenu=False" TrigUpgradeTest/EmuStepProcessingTest.py
+
+
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_step_menu_processing_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_step_menu_processing_build.sh
deleted file mode 100755
index 47c1dc8522cb2baec6d7abe6d10ed149ce38ced6..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_step_menu_processing_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# art-description: athenaMT HLT emulation test
-# art-type: build
-# art-include: master/Athena
-
-# This is a unit test of HLT Control Flow and should be moved to TriggerMenuMT
-
-export THREADS=1
-export EVENTS=4
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/EmuStepProcessingTest.py"
-export REGTESTEXP="TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
-export DOPERFMON=0
-export ATHENAOPTS=' -l DEBUG -c "DoMenu=True"'
-export REGTESTREF=`find_data.py TrigUpgradeTest/emu_step_menu_processing.ref`
-
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_step_processing_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_step_processing_build.sh
deleted file mode 100755
index f2397e8f3e380069d8011905f9a734af2a205158..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_emu_step_processing_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# art-description: athenaMT HLT emulation test
-# art-type: build
-# art-include: master/Athena
-
-# This is a unit test of HLT Control Flow and should be moved to TriggerMenuMT
-
-export THREADS=1
-export EVENTS=4
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/EmuStepProcessingTest.py"
-export REGTESTEXP="TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
-export DOPERFMON=0
-export ATHENAOPTS=' -l DEBUG -c "DoMenu=False"'
-export REGTESTREF=`find_data.py TrigUpgradeTest/emu_step_processing.ref`
-
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
index 1a23c5bb63ea542b2fb7d9383d613de3edff4356..1772c38bdca29466955d561a8f4ac9a1e49e5d4b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
@@ -131,6 +131,18 @@ atlas_add_test( generateMenuMT SCRIPT bash test_HLTmenu.sh
PROPERTIES TIMEOUT 4000
)
+# prparing to move the emulation tests from TUT
+#atlas_add_test( emu_step_processing
+# SCRIPT scripts/test_emu_step_processing.sh
+# LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
+# )
+
+#atlas_add_test( emu_step_menu_processing
+# SCRIPT scripts/test_emu_step_menu_processing.sh
+# LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
+# )
+
+
#----------------------------------
# List of menus to be created:
atlas_build_lvl1_trigger_menu( LS2_v1 )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
index 8a87f2bf4d4aae94fa1ea806ea55f15b835dd623..e5be9d3736c24ba29ed21a25a9f0e7953110dd65 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
@@ -54,7 +54,7 @@ class ChainConfigurationBase(object):
def getEmptyStep(self, stepID, stepPartName):
stepName = 'Step%d'%stepID + '_%d'%self.mult + stepPartName
log.debug("Configuring empty step " + stepName)
- return ChainStep(stepName, [], multiplicity=[] )
+ return ChainStep(stepName, Sequences=[], multiplicity=[] ,chainDicts=[self.dict])
def buildChain(self, chainSteps):
myChain = Chain(name = self.chainName,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
index b2880c39d274e41e5e9dd341cced03cc2190f6bd..4e4e30eeae9a48a1f76e638c105f34bebc915298 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
@@ -46,7 +46,7 @@ def setupMenu():
ChainProp(name='HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5', stream=['Main'], groups=['RATE:Test','BW:Other'] ), #serial
ChainProp(name='HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_TestChain5_ev1_TestChain8_ev1_L12EM3', stream=['Main'], groups=['RATE:Test','BW:Other']),
- ChainProp(name='HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
+# ChainProp(name='HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_2TestChain6_muv1_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_TestChain6_muv1_TestChain10_muv1_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other'] ),
ChainProp(name='HLT_2TestChain6_muEmpty1_L12MU6', stream=['Main'], groups=['RATE:Test','BW:Other']), #may differ from manual
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index dde45d1fcb9bbc56f1471c50cb002646a6623b52..5c82972d645ede5ac961e4875ac125e65e5bf130 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -841,6 +841,10 @@ class ChainStep(object):
"""Class to describe one step of a chain; if multiplicity is greater than 1, the step is combo/combined. Set one multiplicity value per sequence"""
def __init__(self, name, Sequences=[], multiplicity=[1], chainDicts=[], comboHypoCfg=ComboHypoCfg, comboToolConfs=[]):
+ # include cases of emtpy steps with multiplicity = [] or multiplicity=[0,0,0///]
+ if sum(multiplicity)==0:
+ multiplicity=[]
+
# sanity check on inputs
if len(Sequences) != len(multiplicity):
raise RuntimeError("Tried to configure a ChainStep %s with %i Sequences and %i multiplicities. These lists must have the same size" % (name, len(Sequences), len(multiplicity)) )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
index 589c9ca420f480334301de0e0d87fbebe949502b..8222c2b8ceaf6159afb724191dba549ae281ec67 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
@@ -89,6 +89,7 @@ class TestChainConfiguration(ChainConfigurationBase):
'muv1': ['Step_mu11', 'Step_mu21', 'Step_mu31', 'Step_mu41'],
'muv2': ['Step_mu11', 'Step_mu22', 'Step_mu31'],
'muEmpty1': ['Step_empty1', 'Step_mu21'],
+ #'muEmpty1': ['Step_empty1', 'Step_mu11'], # try to break 'Step_mu21'],
'muEmpty2': ['Step_mu11' ,'Step_empty2' ,'Step_mu32', 'Step_mu41'],
'muv1dr' : ['Step_mu11Dr', 'Step_mu21'],
#egamma