diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index ae4496e6fe03a038f0e35335ad5d27268c742a5a..b83bd29de4a83893de8fedc7f0ea8c6eba9abc4b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -8,6 +8,7 @@ TriggerSummaryStep1 0 0 DEBUG +++ HLT_j45_L1J15 ID#13
TriggerSummaryStep1 0 0 DEBUG +++ HLT_xe30_tcpufit_L1XE10 ID#1583719916
TriggerSummaryStep1 0 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 0 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203
TriggerSummaryStep1 0 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 0 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -39,6 +40,7 @@ TriggerSummaryStep1 1 0 DEBUG +++ HLT_j45_L1J15 ID#13
TriggerSummaryStep1 1 0 DEBUG +++ HLT_xe30_tcpufit_L1XE10 ID#1583719916
TriggerSummaryStep1 1 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 1 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203
TriggerSummaryStep1 1 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 1 0 DEBUG +++ HLT_g20_etcut_LArPEB_L1EM15 ID#2706532790
@@ -72,6 +74,7 @@ TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 2 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 2 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 2 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 2 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 2 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -99,6 +102,7 @@ TriggerSummaryStep1 3 0 DEBUG +++ HLT_j45_L1J15 ID#13
TriggerSummaryStep1 3 0 DEBUG +++ HLT_xe30_tcpufit_L1XE10 ID#1583719916
TriggerSummaryStep1 3 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 3 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203
TriggerSummaryStep1 3 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 3 0 DEBUG +++ HLT_g20_etcut_LArPEB_L1EM15 ID#2706532790
@@ -134,6 +138,7 @@ TriggerSummaryStep1 4 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 4 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 4 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 4 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 4 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 4 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 4 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -165,6 +170,7 @@ TriggerSummaryStep1 5 0 DEBUG +++ HLT_xe30_cell_L1XE1
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 ID#2086577378
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep1 5 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 5 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
@@ -206,6 +212,7 @@ TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu60_0eta105_ms
TriggerSummaryStep1 6 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu26_ivarmedium_L1MU20 ID#3411723090
TriggerSummaryStep1 6 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
@@ -257,6 +264,7 @@ TriggerSummaryStep1 7 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 7 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 7 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 7 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 7 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 7 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -283,6 +291,7 @@ TriggerSummaryStep1 8 0 DEBUG +++ HLT_costmonitor_L1T
TriggerSummaryStep1 8 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 8 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 8 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 8 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 8 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 8 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -304,6 +313,7 @@ TriggerSummaryStep1 9 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 9 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 9 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 9 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
+TriggerSummaryStep1 9 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 9 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792
TriggerSummaryStep1 10 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
@@ -314,6 +324,7 @@ TriggerSummaryStep1 10 0 DEBUG +++ HLT_noalg_L1RD0_EMP
TriggerSummaryStep1 10 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e26_etcut_L1EM22VHI ID#1703681121
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 10 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203
TriggerSummaryStep1 10 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 10 0 DEBUG +++ HLT_g20_etcut_LArPEB_L1EM15 ID#2706532790
@@ -349,6 +360,7 @@ TriggerSummaryStep1 11 0 DEBUG +++ HLT_g5_etcut_L1EM3
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep1 11 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 11 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
+TriggerSummaryStep1 11 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 11 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 11 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
TriggerSummaryStep1 11 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792
@@ -370,6 +382,7 @@ TriggerSummaryStep1 12 0 DEBUG +++ HLT_costmonitor_L1T
TriggerSummaryStep1 12 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 12 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 12 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 12 0 DEBUG +++ HLT_g20_etcut_LArPEB_L1EM15 ID#2706532790
TriggerSummaryStep1 12 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
@@ -398,6 +411,7 @@ TriggerSummaryStep1 13 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 13 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 13 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 13 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 13 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203
TriggerSummaryStep1 13 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 13 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
@@ -425,6 +439,7 @@ TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 14 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 14 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
+TriggerSummaryStep1 14 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 14 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
TriggerSummaryStep1 14 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792
@@ -449,6 +464,7 @@ TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_idperf_L1MU
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
+TriggerSummaryStep1 15 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu26_ivarmedium_L1MU20 ID#3411723090
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6fast_L1MU6 ID#3518031697
@@ -468,6 +484,7 @@ TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 16 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 16 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 16 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
+TriggerSummaryStep1 16 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 16 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
TriggerSummaryStep1 16 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792
TriggerSummaryStep2 16 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
@@ -481,6 +498,7 @@ TriggerSummaryStep1 17 0 DEBUG +++ HLT_costmonitor_L1T
TriggerSummaryStep1 17 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 17 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 17 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -505,6 +523,7 @@ TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep1 18 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 18 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 18 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 18 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 18 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 18 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -524,6 +543,7 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_noalg_L1RD0_EMP
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
TriggerSummaryStep1 19 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203
TriggerSummaryStep1 19 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113
TriggerSummaryStep1 19 0 DEBUG +++ HLT_g20_etcut_LArPEB_L1EM15 ID#2706532790
@@ -553,7 +573,7 @@ TriggerSummaryStep4 19 0 DEBUG +++ HLT_g5_etcut_LArPEB
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH 20 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 20 20 13 12 12 0 0 0 12
-TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 decisions 49 213 88 0 0 0
+TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 decisions 49 210 88 0 0 0
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH 20 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J10020 20 0 0 0 0 0 0 0
@@ -582,6 +602,8 @@ TrigSignatureMoniMT INFO HLT_4mu4_L14MU4
TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 20 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 decisions 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_L1J1520 20 20 0 0 0 0 0 20
+TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_L1J15 decisions 20 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_costmonitor_L1TE5 20 20 20 0 0 0 0 0 20
TrigSignatureMoniMT INFO HLT_costmonitor_L1TE5 decisions 20 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI 20 20 1 1 1 0 0 0 1
@@ -589,11 +611,11 @@ TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU1020 20 10 0 0 0 0 0 1
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 decisions 17 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 17 0 0 0 17
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 221 96 0 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 218 96 0 0 0
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 16 0 0 0 16
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 215 55 0 0 0
+TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 212 55 0 0 0
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 12 0 0 0 12
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 178 29 0 0 0
+TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 176 29 0 0 0
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI 20 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 20 20 5 5 3 3 0 0 3
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
index 095ae562ca6d1b50817ec6446a0f98953387b908..256c41d997047af03aeeab39933c193325d0844e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
@@ -46,6 +46,7 @@ class opt:
doBphysicsSlice = True
doStreamingSlice = True
doMonitorSlice = True
+ doBeamspotSlice = True
reverseViews = False
enabledSignatures = []
disabledSignatures = []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
new file mode 100644
index 0000000000000000000000000000000000000000..c4edbd907ffd0895ad08c781a2b33ce0b1a443cc
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
@@ -0,0 +1,82 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.Logging import logging
+logging.getLogger().info("Importing %s",__name__)
+log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.BeamspotChainConfiguration")
+
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
+from TrigStreamerHypo.TrigStreamerHypoConfigMT import StreamerHypoToolMTgenerator
+from TrigStreamerHypo.TrigStreamerHypoConf import TrigStreamerHypoAlgMT
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
+from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+from AthenaCommon.CFElements import seqAND
+
+
+#----------------------------------------------------------------
+# fragments generating configuration will be functions in New JO,
+# so let's make them functions already now
+#----------------------------------------------------------------
+
+
+
+def allTE_trkfast_Cfg( flags ):
+ return allTE_trkfast()
+
+def allTE_trkfast():
+
+ inputMakerAlg = InputMakerForRoI("IM_beamspotInputMaker", mergeOutputs=False)
+ inputMakerAlg.RoIs="beamspotInputRoIs"
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
+ (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='FS', rois=inputMakerAlg.RoIs)
+ from TrigT2BeamSpot.T2VertexBeamSpotConfig import T2VertexBeamSpot_activeAllTE
+ #beamspotSequence = seqAND("beamspotSequence",viewAlgs+[inputMakerAlg,T2VertexBeamSpot_activeAllTE()])
+ beamspotSequence = seqAND("beamspotSequence",[inputMakerAlg]+viewAlgs+[T2VertexBeamSpot_activeAllTE()])
+
+ #hypo
+ beamspotHypoAlg = TrigStreamerHypoAlgMT("BeamspotHypoAlg")
+ beamspotHypoAlg.RuntimeValidation = False #Needed to avoid the ERROR ! Decision has no 'feature' ElementLink
+ beamspotHypoToolGen= StreamerHypoToolMTgenerator
+
+ return MenuSequence( Sequence = beamspotSequence,
+ Maker = inputMakerAlg,
+ Hypo = beamspotHypoAlg,
+ HypoToolGen = beamspotHypoToolGen )
+
+# Class to configure chain
+#----------------------------------------------------------------
+class BeamspotChainConfiguration(ChainConfigurationBase):
+
+ def __init__(self, chainDict):
+ ChainConfigurationBase.__init__(self,chainDict)
+
+
+ # ----------------------
+ # Assemble the chain depending on information from chainName
+ # ----------------------
+ def assembleChain(self):
+ chainSteps = []
+ log.debug("Assembling chain for " + self.chainName)
+ # --------------------
+ # define here the names of the steps and obtain the chainStep configuration
+ # --------------------
+ stepDictionary = {
+ "allTE_trkfast":[self.getAllTEStep()]
+ #"activeTE_trkfast":[self.activeTE_trkfast()],
+ #"trkFS_trkfast":[self.trkFS_trkfast()],
+ }
+
+ #key = self.chainPart['EFrecoAlg']
+ key = self.chainPart['addInfo'][0] + "_" + self.chainPart['l2IDAlg'][0]#TODO: hardcoded index
+ steps=stepDictionary[key]
+ for step in steps:
+ chainSteps+=[step]
+
+ myChain = self.buildChain(chainSteps)
+ return myChain
+
+
+ # --------------------
+ # Configuration of costmonitor
+ # --------------------
+ def getAllTEStep(self):
+ return self.getStep(1,"allTE_trkfast",[allTE_trkfast_Cfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py
new file mode 100644
index 0000000000000000000000000000000000000000..68859d2c7225a5de0c209b06b128ffb0f8ff28e0
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py
@@ -0,0 +1,41 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
+from TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.BeamspotChainConfiguration import BeamspotChainConfiguration as BeamspotChainConfiguration
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
+
+
+from AthenaCommon.Logging import logging
+log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log.info("Importing %s",__name__)
+
+
+
+def generateChainConfigs( chainDict ):
+
+ import pprint
+ pprint.pprint( chainDict )
+
+ listOfChainDicts = splitChainDict(chainDict)
+ log.debug("Will generate Config for streamer: ",chainDict['chainName'])
+
+ listOfChainDefs = []
+
+ #streamers will never have more than one chainPart but this is still
+ #needed to move to the correct format [{}]->{}
+ for subChainDict in listOfChainDicts:
+
+ Beamspot = BeamspotChainConfiguration(subChainDict).assembleChain()
+
+ listOfChainDefs += [Beamspot]
+ log.debug('length of chaindefs %s', len(listOfChainDefs) )
+
+ if len(listOfChainDefs)>1:
+ log.warning("This is a streamer with more than one chainPart, is this really intended?")
+ theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
+ else:
+ theChainDef = listOfChainDefs[0]
+
+ log.debug("theChainDef %s" , theChainDef)
+
+ return theChainDef
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index 30c724888534c2d0a21b9b0582d131b07c7aab09..0f89aed9ecda600b062b6dea08c25f1aff148325 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -48,7 +48,7 @@ class GenerateMenuMT(object):
self.allSignatures = ['Egamma', 'Muon', 'Jet', 'Bjet', 'Bphysics', 'MET', 'Tau',
'HeavyIon', 'Beamspot', 'Cosmic', 'EnhancedBias',
'Monitor', 'Calib', 'Streaming', 'Combined'] #, AFP
- self.calibCosmicMonSigs = ['Streaming','Monitor'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
+ self.calibCosmicMonSigs = ['Streaming','Monitor','Beamspot'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
# flags
self.doEgammaChains = True
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index fe0d4c24406f7ac5da6e775528d3f2ad8edd0a94..f43fed36f31f0e00b2af7dc82822d379ca515cac 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -189,8 +189,12 @@ def setupMenu():
#ChainProp(name='HLT_e8_etcut1step_j85_L1EM3_J20', l1SeedThresholds=['EM3', 'J20'], stream=[PhysicsStream], groups=MultiElectronGroup),
]
TriggerFlags.HeavyIonSlice.signatures = []
- TriggerFlags.BeamspotSlice.signatures = []
- TriggerFlags.MinBiasSlice.signatures = []
+ TriggerFlags.BeamspotSlice.signatures = [
+ ChainProp(name='HLT_beamspot_allTE_trkfast_L1J15', l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot', 'BW:BeamSpot']),
+ #ChainProp(name='HLT_beamspot_activeTE_trkfast_L1J15', l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot', 'BW:BeamSpot']),
+ #ChainProp(name='HLT_beamspot_trkFS_trkfast_L1J15', l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot', 'BW:BeamSpot']),
+ ]
+ TriggerFlags.MinBiasSlice.signatures = []
TriggerFlags.CalibSlice.signatures = []
TriggerFlags.CosmicSlice.signatures = []
TriggerFlags.StreamingSlice.signatures = [