From 9af87d206eb2e6dfee486f8f797e0981b2606b11 Mon Sep 17 00:00:00 2001
From: Per Alexander Ekman <per.alexander.ekman@cern.ch>
Date: Tue, 8 Oct 2019 14:59:25 +0000
Subject: [PATCH] Changed Luminosity block dependence of costmonitor,LArCells,
RPCSecondaryReadout to False. Cleaned up unused imports for costmonitor.
Turned all the slices back on.
---
.../TrigUpgradeTest/share/full_menu_build.ref | 22 ++++++++
.../TrigUpgradeTest/share/testHLT_MT.py | 1 +
.../GenerateMonitorChainDefs.py | 38 ++++++++++++++
.../MonitorChainConfiguration.py | 50 +++++++++++++++++++
.../HLTMenuConfig/Menu/DictFromChainName.py | 4 +-
.../HLTMenuConfig/Menu/GenerateMenuMT.py | 39 +++++++--------
.../python/HLTMenuConfig/Menu/LS2_v1.py | 4 +-
.../HLTMenuConfig/Menu/MenuComponents.py | 2 +-
.../HLTMenuConfig/Menu/SignatureDicts.py | 8 +--
.../python/HLTMenuConfig/Menu/StreamInfo.py | 7 +--
10 files changed, 144 insertions(+), 31 deletions(-)
create mode 100644 Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py
create mode 100644 Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 0c4fc2f7bf5..4372f8a562f 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -2,6 +2,7 @@ TriggerSummaryStep1 0 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 0 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 0 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 0 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
TriggerSummaryStep1 0 0 DEBUG +++ HLT_xe30_tcpufit_L1XE10 ID#1583719916
@@ -32,6 +33,7 @@ TriggerSummaryStep1 1 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 1 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 1 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 1 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
TriggerSummaryStep1 1 0 DEBUG +++ HLT_xe30_tcpufit_L1XE10 ID#1583719916
@@ -67,6 +69,7 @@ TriggerSummaryStep1 2 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 2 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+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_2e3_etcut_L12EM3 ID#2613484113
@@ -90,6 +93,7 @@ TriggerSummaryStep1 3 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 3 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 3 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 3 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
TriggerSummaryStep1 3 0 DEBUG +++ HLT_xe30_tcpufit_L1XE10 ID#1583719916
@@ -127,6 +131,7 @@ TriggerSummaryStep1 4 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 4 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+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_2e3_etcut_L12EM3 ID#2613484113
@@ -151,6 +156,7 @@ TriggerSummaryStep1 5 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_mu6noL1_L1MU6 ID#451489897
TriggerSummaryStep1 5 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 5 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590
@@ -189,6 +195,7 @@ TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_mu6noL1_L1M
TriggerSummaryStep1 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu80_msonly_3layersEC_L1MU20 ID#761101109
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu50_RPCPEBSecondaryReadout_L1MU20 ID#827327262
TriggerSummaryStep1 6 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
@@ -247,6 +254,7 @@ TriggerSummaryStep1 7 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+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_2e3_etcut_L12EM3 ID#2613484113
@@ -271,6 +279,7 @@ TriggerSummaryStep1 8 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 8 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 8 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
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
@@ -292,6 +301,7 @@ TriggerSummaryStep3 8 0 DEBUG +++ HLT_2e3_etcut_L12EM
TriggerSummaryStep3 8 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep4 8 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 9 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639
+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_noalg_L1EM3 ID#4169267792
@@ -299,6 +309,7 @@ TriggerSummaryStep1 10 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 10 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 10 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 10 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e26_etcut_L1EM22VHI ID#1703681121
@@ -336,6 +347,7 @@ TriggerSummaryStep1 11 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 11 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
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_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 11 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018
@@ -354,6 +366,7 @@ TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep1 12 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 12 0 DEBUG +++ HLT_xe65_cell_L1XE50 ID#531141817
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
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
@@ -382,6 +395,7 @@ TriggerSummaryStep1 13 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 13 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+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_j35_gsc45_boffperf_split_L1J20 ID#2603162203
@@ -408,6 +422,7 @@ TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep1 14 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe65_cell_L1XE50 ID#531141817
TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+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_g5_etcut_LArPEB_L1EM3 ID#3486231698
@@ -426,6 +441,7 @@ TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu10_lateMu_L1M
TriggerSummaryStep1 15 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_mu6noL1_L1MU6 ID#451489897
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909
+TriggerSummaryStep1 15 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu80_msonly_3layersEC_L1MU20 ID#761101109
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu50_RPCPEBSecondaryReadout_L1MU20 ID#827327262
TriggerSummaryStep1 15 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
@@ -448,6 +464,7 @@ TriggerSummaryStep3 15 0 DEBUG +++ HLT_mu6_idperf_L1MU
TriggerSummaryStep3 15 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
TriggerSummaryStep1 16 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639
TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+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_xe30_mht_L1XE10 ID#3626903018
@@ -459,6 +476,7 @@ TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep1 17 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe65_cell_L1XE50 ID#531141817
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
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
@@ -483,6 +501,7 @@ TriggerSummaryStep1 18 0 DEBUG +++ HLT_noalg_L1RD0_FIL
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 18 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+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_2e3_etcut_L12EM3 ID#2613484113
@@ -499,6 +518,7 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep1 19 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j85_L1J20 ID#510475538
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_costmonitor_L1TE5 ID#732706776
TriggerSummaryStep1 19 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j45_L1J15 ID#1364976160
TriggerSummaryStep1 19 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
@@ -561,6 +581,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_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
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI decisions 1 6 1 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU1020 20 10 0 0 0 0 0 1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
index 5f6a5ee6211..20b2586e156 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
@@ -45,6 +45,7 @@ class opt:
doCombinedSlice = True
doBphysicsSlice = True
doStreamingSlice = True
+ doMonitorSlice = True
reverseViews = False
enabledSignatures = []
disabledSignatures = []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py
new file mode 100644
index 00000000000..791fc28670c
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py
@@ -0,0 +1,38 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
+from TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.MonitorChainConfiguration import MonitorChainConfiguration as MonitorChainConfiguration
+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 ):
+
+ 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:
+
+ Monitor = MonitorChainConfiguration(subChainDict).assembleChain()
+
+ listOfChainDefs += [Monitor]
+ 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/CalibCosmicMon/MonitorChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
new file mode 100644
index 00000000000..5531b43ffb8
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
@@ -0,0 +1,50 @@
+# 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.MonitorChainConfiguration")
+
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
+
+#----------------------------------------------------------------
+# fragments generating configuration will be functions in New JO,
+# so let's make them functions already now
+#----------------------------------------------------------------
+
+#----------------------------------------------------------------
+# Class to configure chain
+#----------------------------------------------------------------
+class MonitorChainConfiguration(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 = {
+ "costmonitor":[self.getNoalgStep()],
+ }
+
+ #key = self.chainPart['EFrecoAlg']
+ key = 'costmonitor'
+ steps=stepDictionary[key]
+ for step in steps:
+ chainSteps+=[step]
+
+ myChain = self.buildChain(chainSteps)
+ return myChain
+
+ # --------------------
+ # Configuration of costmonitor
+ # --------------------
+ def getNoalgStep(self):
+ from TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.StreamingChainConfiguration import StreamingSequenceCfg
+ return self.getStep(1,"noalg", [StreamingSequenceCfg] )
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
index 67a118d2e37..45532fd9359 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
@@ -235,7 +235,7 @@ def analyseChainName(chainName, L1thresholds, L1item):
(['hi'], 'HeavyIon', 'mb'),
(AllowedCosmicChainIdentifiers, 'Cosmic', 'cosmic'),
(AllowedCalibChainIdentifiers, 'Calibration', 'calib'),
- (AllowedMonitorChainIdentifiers, 'Monitoring', 'calib'),
+ (AllowedMonitorChainIdentifiers, 'Monitor', 'calib'),
(AllowedBeamspotChainIdentifiers, 'Beamspot', 'beamspot'),
(['eb'], 'EnhancedBias', 'eb') ]:
if cpart in chainCatrgory[0]:
@@ -323,7 +323,7 @@ def analyseChainName(chainName, L1thresholds, L1item):
& (chainProperties['signature'] != 'Calibration')\
& (chainProperties['signature'] != 'Streaming') \
& (chainProperties['signature'] != 'Beamspot') \
- & (chainProperties['signature'] != 'Monitoring') :
+ & (chainProperties['signature'] != 'Monitor') :
parts.pop(0)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index 597356c02e9..30c72488853 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -48,27 +48,27 @@ class GenerateMenuMT(object):
self.allSignatures = ['Egamma', 'Muon', 'Jet', 'Bjet', 'Bphysics', 'MET', 'Tau',
'HeavyIon', 'Beamspot', 'Cosmic', 'EnhancedBias',
'Monitor', 'Calib', 'Streaming', 'Combined'] #, AFP
- self.calibCosmicMonSigs = ['Streaming'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
+ self.calibCosmicMonSigs = ['Streaming','Monitor'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
# flags
- self.doEgammaChains = True
- self.doJetChains = True
- self.doBjetChains = True
- self.doMuonChains = True
- self.doBphysicsChains = True
- self.doMETChains = True
- self.doTauChains = True
- self.doAFPChains = True
- self.doMinBiasChains = True
- self.doHeavyIonChains = True
- self.doCosmicChains = True
- self.doCalibrationChains = True
- self.doStreamingChains = True
- self.doMonitorChains = True
- self.doBeamspotChains = True
- self.doEnhancedBiasChains = True
- self.doTestChains = True
- self.doCombinedChains = True
+ self.doEgammaChains = True
+ self.doJetChains = True
+ self.doBjetChains = True
+ self.doMuonChains = True
+ self.doBphysicsChains = True
+ self.doMETChains = True
+ self.doTauChains = True
+ self.doAFPChains = True
+ self.doMinBiasChains = True
+ self.doHeavyIonChains = True
+ self.doCosmicChains = True
+ self.doCalibrationChains = True
+ self.doStreamingChains = True
+ self.doMonitorChains = True
+ self.doBeamspotChains = True
+ self.doEnhancedBiasChains = True
+ self.doTestChains = True
+ self.doCombinedChains = True
def setTriggerConfigHLT(self):
@@ -217,7 +217,6 @@ class GenerateMenuMT(object):
else:
sigFolder = sig
subSigs = [sig]
-
for ss in subSigs:
if sigFolder == 'Combined':
continue
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 2b739022afd..fe0d4c24406 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -198,7 +198,9 @@ def setupMenu():
ChainProp(name='HLT_noalg_L1RD0_FILLED', l1SeedThresholds=[''], stream=[PhysicsStream, 'BeamSpot'], groups=MinBiasGroup), # FIXME: BeamSpot stream added just for testing, to be removed
ChainProp(name='HLT_noalg_L1EM3', l1SeedThresholds=[''], stream=[PhysicsStream], groups=EgammaStreamersGroup),
]
- TriggerFlags.MonitorSlice.signatures = []
+ TriggerFlags.MonitorSlice.signatures = [
+ ChainProp(name='HLT_costmonitor_L1TE5', l1SeedThresholds=[''], stream=['CostMonitoring'], groups=['RATE:Monitoring','BW:Other']),
+ ]
# Random Seeded EB chains which select at the HLT based on L1 TBP bits
TriggerFlags.EnhancedBiasSlice.signatures = [ ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index fea6ea42614..d62ab8c069e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -365,7 +365,7 @@ class MenuSequence(object):
self.hypo.setPreviousDecision( input_maker_output)
hypo_output = CFNaming.hypoAlgOutName(self.hypo.Alg.name(), input_maker_output)
if len(self.hypo.getOutputList()):
- log.error("Hypo " + self.hypo.name() +" has already an output configured: you may want to duplicate the Hypo!")
+ log.error("Hypo " + self.hypo.Alg.name() +" has already an output configured: you may want to duplicate the Hypo!")
self.hypo.addOutput(hypo_output)
# needed for drawing
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 6ff90e43609..41cb71f9938 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -23,7 +23,7 @@ SliceIDDict = {
'Cosmic' : 'cosmic',
'Calibration' : 'calib',
'Streaming' : 'streamer',
- 'Monitoring' : 'mon',
+ 'Monitor' : 'mon',
'Beamspot' : 'beamspot',
'EnhancedBias' : 'eb',
'Test' : 'TestChain',
@@ -634,7 +634,7 @@ AllowedMonitorChainIdentifiers = ['robrequest', 'timeburner', 'costmonitor',
# ---- Monitor Chain Dictinary of all allowed Values ----
MonitorChainParts = {
- 'signature' : ['Monitoring'],
+ 'signature' : ['Monitor'],
'chainPartName' : '',
'L1threshold' : '',
'monType' : AllowedMonitorChainIdentifiers,
@@ -647,7 +647,7 @@ MonitorChainParts = {
# ---- Monitor Chain Default Dictinary of all allowed Values ----
MonitorChainParts_Default = {
- 'signature' : ['Monitoring'],
+ 'signature' : ['Monitor'],
'chainPartName' : '',
'L1threshold' : '',
'monType' : [],
@@ -802,7 +802,7 @@ def getSignatureInformation(signature):
return [CalibChainParts_Default, CalibChainParts]
if signature == "Streaming":
return [StreamingChainParts_Default, StreamingChainParts]
- if signature == "Monitoring":
+ if signature == "Monitor":
return [MonitorChainParts_Default, MonitorChainParts]
if signature == "Beamspot":
return [BeamspotChainParts_Default, BeamspotChainParts]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py
index b8fd32544fe..9621de71e0f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py
@@ -31,9 +31,10 @@ _all_streams = [
# EXPRESS STREAM
StreamInfo('express', 'express', True, True),
# CALIBRATION STREAMS
- StreamInfo('BeamSpot', 'calibration', False, False),
- StreamInfo('LArCells', 'calibration', True, False),
- StreamInfo('RPCSecondaryReadout', 'calibration', True, False),
+ StreamInfo('BeamSpot', 'calibration', True, False),
+ StreamInfo('LArCells', 'calibration', False, False),
+ StreamInfo('RPCSecondaryReadout', 'calibration', False, False),
+ StreamInfo('CostMonitoring','calibration', False, False)
]
--
GitLab