From aa2bda04152c186256a44bc5804d90f89a996279 Mon Sep 17 00:00:00 2001 From: Rafal Bielski <rafal.bielski@cern.ch> Date: Mon, 14 Oct 2019 14:09:37 +0000 Subject: [PATCH] Data scouting for cost monitoring --- .../TrigPartialEventBuilding/CMakeLists.txt | 7 +- .../src/PEBInfoWriterAlg.cxx | 19 +--- .../TrigConfigSvc/src/HLTConfigSvc.cxx | 1 + .../TrigUpgradeTest/share/PEBDSTest.py | 3 - .../TrigUpgradeTest/share/full_menu.py | 99 ++++++++++++------- .../TrigUpgradeTest/share/full_menu_build.ref | 64 +++++++----- .../TrigEDMConfig/python/TriggerEDMRun3.py | 7 +- .../TrigEDMConfig/python/testEDMRun3.py | 6 +- .../GenerateMonitorChainDefs.py | 2 +- .../EventBuildingSequenceSetup.py | 10 +- .../HLTMenuConfig/Menu/DictFromChainName.py | 4 +- .../HLTMenuConfig/Menu/EventBuildingInfo.py | 18 ++-- .../python/HLTMenuConfig/Menu/LS2_v1.py | 2 +- 13 files changed, 138 insertions(+), 104 deletions(-) diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt index ee583fec418..58755dc51f6 100644 --- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt +++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt @@ -8,16 +8,13 @@ atlas_subdir( TrigPartialEventBuilding ) # Declare the package's dependencies atlas_depends_on_subdirs( PUBLIC Trigger/TrigSteer/DecisionHandling - Trigger/TrigEvent/TrigSteeringEvent - PRIVATE - Control/AthViews ) + Trigger/TrigEvent/TrigSteeringEvent ) # Component(s) in the package atlas_add_library( TrigPartialEventBuildingLib src/*.cxx PUBLIC_HEADERS TrigPartialEventBuilding - LINK_LIBRARIES DecisionHandlingLib TrigSteeringEvent - PRIVATE_LINK_LIBRARIES AthViews ) + LINK_LIBRARIES DecisionHandlingLib TrigSteeringEvent ) atlas_add_component( TrigPartialEventBuilding src/components/*.cxx diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx index 0f2134ffae7..28402562aeb 100644 --- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx +++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx @@ -6,9 +6,6 @@ #include "PEBInfoWriterAlg.h" #include "DecisionHandling/TrigCompositeUtils.h" -// Athena includes -#include "AthViews/View.h" - // TrigCompositeUtils types used here using TrigCompositeUtils::Decision; using TrigCompositeUtils::DecisionContainer; @@ -21,9 +18,9 @@ using TrigCompositeUtils::createAndStore; using TrigCompositeUtils::decisionIDs; using TrigCompositeUtils::linkToPrevious; using TrigCompositeUtils::newDecisionIn; -using TrigCompositeUtils::viewString; using TrigCompositeUtils::initialRoIString; using TrigCompositeUtils::featureString; +using TrigCompositeUtils::roiString; using TrigCompositeUtils::findLink; // ============================================================================= @@ -82,11 +79,6 @@ StatusCode PEBInfoWriterAlg::execute(const EventContext& eventContext) const { ATH_CHECK(roiEL.isValid()); const TrigRoiDescriptor* roi = *roiEL; - // Get View - auto viewELInfo = TrigCompositeUtils::findLink<ViewContainer>(previousDecision, viewString(), /*suppressMultipleLinksWarning*/ true ); - ATH_CHECK(viewELInfo.isValid()); - auto viewEL = viewELInfo.link; - // Create new decision Decision* newd = newDecisionIn(decisions); @@ -99,11 +91,10 @@ StatusCode PEBInfoWriterAlg::execute(const EventContext& eventContext) const { // Link to feature. Dummy link here ElementLink<DecisionContainer> dummyLink(*decisions, decisions->size()-1, eventContext); newd->setObjectLink(featureString(), dummyLink); - - ATH_MSG_DEBUG("REGTEST: View = " << (*viewEL)); - ATH_MSG_DEBUG("REGTEST: RoI = eta/phi = " << (*roiEL)->eta() << "/" << (*roiEL)->phi()); - ATH_MSG_DEBUG("Added view, roi, previous decision to new decision " << counter - << " for view " << (*viewEL)->name()); + newd->setObjectLink(roiString(), roiEL); + + ATH_MSG_DEBUG("RoI eta/phi = " << (*roiEL)->eta() << "/" << (*roiEL)->phi()); + ATH_MSG_DEBUG("Added RoI, previous decision and dummy feature to new decision " << counter); ++counter; } diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx index 253df7789f4..be0fc34a324 100644 --- a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx +++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx @@ -309,6 +309,7 @@ HLTConfigSvc::initialize() { dummyChains["HLT_tau25_idperf_tracktwo_L1TAU12IM"] = "L1_TAU12IM"; dummyChains["HLT_tau25_idperf_tracktwoEF_L1TAU12IM"] = "L1_TAU12IM"; dummyChains["HLT_tau25_idperf_tracktwoMVA_L1TAU12IM"] = "L1_TAU12IM"; + dummyChains["HLT_costmonitor_CostMonDS_L1TE5"] = "L1_TE5"; m_HLTFrame.setMergedHLT( m_setMergedHLT ); for (const auto& mapPair : dummyChains) { diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/PEBDSTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/PEBDSTest.py index b62c052effe..c14494ac1c2 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/PEBDSTest.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/PEBDSTest.py @@ -25,9 +25,6 @@ EventBuildingInfo.PartialEventBuildingIdentifiers.append('TestPEBThree') EventBuildingInfo.PartialEventBuildingIdentifiers.append('TestPEBFour') EventBuildingInfo.DataScoutingIdentifiers['ElectronDSTest'] = 3 EventBuildingInfo.DataScoutingIdentifiers['ElectronDSPEBTest'] = 3 -EventBuildingInfo.AllowedEventBuildingIdentifiers = [] -EventBuildingInfo.AllowedEventBuildingIdentifiers.extend(EventBuildingInfo.PartialEventBuildingIdentifiers) -EventBuildingInfo.AllowedEventBuildingIdentifiers.extend(EventBuildingInfo.DataScoutingIdentifiers.keys()) # Override the setupMenu function from LS2_v1 def myMenu(): diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py index 01b77080304..c29f9c16904 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py @@ -8,9 +8,67 @@ __log = logging.getLogger('full_menu') from TriggerJobOpts.TriggerFlags import TriggerFlags TriggerFlags.triggerMenuSetup = "LS2_v1" -include("TrigUpgradeTest/testHLT_MT.py") +################################################################## +# Functions creating EDM list for output writing +# TODO: Move to TriggerJobOpts +################################################################## +def getEDMListForPOOL(key, decObj): + # Get the list from TriggerEDM + from TrigEDMConfig.TriggerEDM import getTriggerEDMList + from TrigEDMConfig.TriggerEDMRun3 import persistent + TriggerFlags.EDMDecodingVersion = 3 + TriggerFlags.ESDEDMSet = key + edmList = getTriggerEDMList(TriggerFlags.ESDEDMSet(), TriggerFlags.EDMDecodingVersion()) + + # Build the output ItemList + ItemList = [] + for edmType, edmKeys in edmList.iteritems(): + ItemList.extend([edmType+'#'+collKey for collKey in edmKeys]) + + # Add decision containers (navigation) + for item in decObj: + ItemList.append( 'xAOD::TrigCompositeContainer#{:s}'.format(item) ) + ItemList.append( 'xAOD::TrigCompositeAuxContainer#{:s}Aux.-'.format(item) ) + + return list(set(ItemList)) + + +def getEDMDictForBS(decObj): + from TriggerMenuMT.HLTMenuConfig.Menu import EventBuildingInfo + from TrigEDMConfig.TriggerEDM import getTriggerEDMList + from TrigEDMConfig.TriggerEDMRun3 import persistent + TriggerFlags.EDMDecodingVersion = 3 + TriggerFlags.ESDEDMSet = 'BS' + + ItemListDict = {} + ItemModuleDict = {} + for key in ['BS'] + EventBuildingInfo.getAllDataScoutingIdentifiers(): + edmList = getTriggerEDMList(key, TriggerFlags.EDMDecodingVersion()) + moduleId = EventBuildingInfo.getFullHLTResultID() if key=='BS' else EventBuildingInfo.getDataScoutingResultID(key) + for edmType, edmKeys in edmList.iteritems(): + for collKey in edmKeys: + item = persistent(edmType)+'#'+collKey + if item not in ItemModuleDict.keys(): + ItemModuleDict[item] = [moduleId] + else: + ItemModuleDict[item].append(moduleId) + + # Add decision containers (navigation) + for item in decObj: + typeName = 'xAOD::TrigCompositeContainer#{:s}'.format(item) + typeNameAux = 'xAOD::TrigCompositeAuxContainer#{:s}Aux.-'.format(item) + if typeName not in ItemModuleDict.keys(): + ItemModuleDict[typeName] = [EventBuildingInfo.getFullHLTResultID()] + if typeNameAux not in ItemModuleDict.keys(): + ItemModuleDict[typeNameAux] = [EventBuildingInfo.getFullHLTResultID()] + + return ItemModuleDict +################################################################## +# Include the common configuration +################################################################## +include("TrigUpgradeTest/testHLT_MT.py") ################################################################## # Generate the menu @@ -82,42 +140,12 @@ else: __log.warning("Failed to find L1Decoder, cannot determine Decision names for output configuration") decObj = [] -# Get the EDM list -from TrigEDMConfig.TriggerEDM import getTriggerEDMList -from TrigEDMConfig.TriggerEDMRun3 import persistent -TriggerFlags.EDMDecodingVersion = 3 -TriggerFlags.ESDEDMSet = 'BS' if configureBSResult else 'ESD' -edmList = getTriggerEDMList(TriggerFlags.ESDEDMSet(), TriggerFlags.EDMDecodingVersion()) - -# Build the output ItemList -ItemList = [] -for edmType, edmKeys in edmList.iteritems(): - edmType = persistent(edmType) if configureBSResult else edmType - for key in edmKeys: - ItemList.append(edmType+'#'+key) - -if not configureBSResult: - # Do not serialise EventInfo into BS, as it is already represented by the BS event header - ItemList.append("xAOD::EventInfo#EventInfo") - ItemList.append("xAOD::EventAuxInfo#EventInfoAux.") - -for item in decObj: - typeName = 'xAOD::TrigCompositeContainer#{}'.format(item) - typeNameAux = 'xAOD::TrigCompositeAuxContainer#{}Aux.'.format(item) - ItemList.append(typeName) - # Temporary workaround for the case when item from decObj is explicitly in TriggerEDM list - # to avoid adding it twice - with and without dynamic variables - if typeNameAux+'-' not in ItemList: - ItemList.append(typeNameAux) - -ItemList = list(set(ItemList)) - # Configure ESD writing if opt.doWriteESD: import AthenaPoolCnvSvc.WriteAthenaPool from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream StreamESD=createOutputStream("StreamESD","myESD.pool.root",True) - StreamESD.ItemList = ItemList + StreamESD.ItemList = getEDMListForPOOL('ESD', decObj) ########################################## # HLT result configuration @@ -130,9 +158,10 @@ if configureBSResult: # Tool serialising EDM objects to fill the HLT result serialiser = TriggerEDMSerialiserToolCfg('Serialiser') - for item in ItemList: - __log.debug('adding to serialiser list: %s' % item) - serialiser.addCollectionToMainResult(item) + ItemDict = getEDMDictForBS(decObj) + for item, modules in ItemDict.iteritems(): + __log.debug('adding to serialiser list: %s, modules: %s', item, modules) + serialiser.addCollection(item, modules) # Tool adding stream tags to HLT result stmaker = StreamTagMakerTool() diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref index b83bd29de4a..6bb0e3179c4 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref @@ -2,11 +2,11 @@ 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 TriggerSummaryStep1 0 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554 +TriggerSummaryStep1 0 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -18,6 +18,7 @@ TriggerSummaryStep1 0 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 0 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 0 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 0 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 0 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 0 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 0 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203 TriggerSummaryStep2 0 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -34,11 +35,11 @@ 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 TriggerSummaryStep1 1 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554 +TriggerSummaryStep1 1 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -52,6 +53,7 @@ TriggerSummaryStep1 1 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 1 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 1 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 1 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 1 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 1 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203 TriggerSummaryStep2 1 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 @@ -71,8 +73,8 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -82,6 +84,7 @@ TriggerSummaryStep1 2 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 2 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 2 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 2 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 2 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 2 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 2 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -96,11 +99,11 @@ 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 TriggerSummaryStep1 3 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554 +TriggerSummaryStep1 3 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -114,6 +117,7 @@ TriggerSummaryStep1 3 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 3 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 3 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 3 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 3 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 3 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 3 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203 TriggerSummaryStep2 3 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 @@ -135,8 +139,8 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -146,6 +150,7 @@ TriggerSummaryStep1 4 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 4 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 4 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 4 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 4 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 4 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 4 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 4 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -161,12 +166,12 @@ 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 TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062 TriggerSummaryStep1 5 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554 +TriggerSummaryStep1 5 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -183,6 +188,7 @@ TriggerSummaryStep2 5 0 DEBUG +++ HLT_e5_etcut_L1EM3 TriggerSummaryStep2 5 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 5 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532 +TriggerSummaryStep2 5 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 5 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 5 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 5 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -201,7 +207,6 @@ 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 @@ -210,6 +215,7 @@ TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6Comb_L1MU6 I TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062 TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu60_0eta105_msonly_L1MU20 ID#1642591450 TriggerSummaryStep1 6 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554 +TriggerSummaryStep1 6 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -233,6 +239,7 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_idperf_L1MU TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590 TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062 TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu60_0eta105_msonly_L1MU20 ID#1642591450 +TriggerSummaryStep2 6 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526 TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253 @@ -261,8 +268,8 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -273,6 +280,7 @@ TriggerSummaryStep2 7 0 DEBUG +++ HLT_mu10_lateMu_L1M TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 7 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 7 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 7 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 7 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 7 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 7 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -287,9 +295,9 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -299,6 +307,7 @@ TriggerSummaryStep1 8 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 8 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 8 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 8 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 8 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 8 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 8 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 8 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -310,19 +319,20 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep1 9 0 DEBUG +++ HLT_beamspot_allTE_trkfast_L1J15 ID#2487298406 TriggerSummaryStep1 9 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792 +TriggerSummaryStep2 9 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep1 10 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639 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 +TriggerSummaryStep1 10 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -336,6 +346,7 @@ TriggerSummaryStep2 10 0 DEBUG +++ HLT_e5_etcut_L1EM3 TriggerSummaryStep2 10 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 10 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 TriggerSummaryStep2 10 0 DEBUG +++ HLT_e26_etcut_L1EM22VHI ID#1703681121 +TriggerSummaryStep2 10 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 10 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 10 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203 TriggerSummaryStep2 10 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 @@ -358,8 +369,8 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -367,6 +378,7 @@ TriggerSummaryStep1 11 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 11 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 11 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 11 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 11 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 11 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep3 11 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep3 11 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 @@ -378,9 +390,9 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -391,6 +403,7 @@ TriggerSummaryStep1 12 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 12 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 12 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 12 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 12 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 12 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 12 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 12 0 DEBUG +++ HLT_g20_etcut_LArPEB_L1EM15 ID#2706532790 @@ -408,8 +421,8 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -421,6 +434,7 @@ TriggerSummaryStep1 13 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 13 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 13 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 13 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 13 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 13 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 13 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 13 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -436,9 +450,9 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -446,6 +460,7 @@ TriggerSummaryStep1 14 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 14 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 14 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 14 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 14 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 14 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep3 14 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep3 14 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 @@ -456,13 +471,13 @@ 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 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590 TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062 +TriggerSummaryStep1 15 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -475,28 +490,30 @@ TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu10_lateMu_L1M TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909 TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu80_msonly_3layersEC_L1MU20 ID#761101109 TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532 +TriggerSummaryStep2 15 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032 TriggerSummaryStep3 15 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532 TriggerSummaryStep3 15 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032 TriggerSummaryStep4 15 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 +TriggerSummaryStep2 16 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep3 16 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 TriggerSummaryStep1 17 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639 TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -506,6 +523,7 @@ TriggerSummaryStep1 17 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 17 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 17 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 17 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 17 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 17 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 17 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 TriggerSummaryStep2 17 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -520,8 +538,8 @@ 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_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -529,6 +547,7 @@ TriggerSummaryStep1 18 0 DEBUG +++ HLT_g5_etcut_LArPEB TriggerSummaryStep1 18 0 DEBUG +++ HLT_xe30_mht_L1XE10 ID#3626903018 TriggerSummaryStep1 18 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792 TriggerSummaryStep2 18 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 +TriggerSummaryStep2 18 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 18 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 TriggerSummaryStep3 18 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep3 18 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698 @@ -538,10 +557,10 @@ 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 +TriggerSummaryStep1 19 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 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 @@ -555,6 +574,7 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_noalg_L1EM3 ID# TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483 TriggerSummaryStep2 19 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435 TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566 +TriggerSummaryStep2 19 0 DEBUG +++ HLT_costmonitor_CostMonDS_L1TE5 ID#1777097745 TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579 TriggerSummaryStep2 19 0 DEBUG +++ HLT_j35_gsc45_boffperf_split_L1J20 ID#2603162203 TriggerSummaryStep2 19 0 DEBUG +++ HLT_2e3_etcut_L12EM3 ID#2613484113 @@ -604,8 +624,8 @@ TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 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_costmonitor_CostMonDS_L1TE520 20 20 20 0 0 0 0 20 +TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1TE5 decisions 20 20 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/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index 4df37f49283..0d642b78cdb 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -14,6 +14,7 @@ from AthenaCommon.Logging import logging __log = logging.getLogger('TriggerEDMRun3Config') +from TriggerMenuMT.HLTMenuConfig.Menu import EventBuildingInfo def recordable( name ): """ @@ -51,6 +52,7 @@ def recordable( name ): # be stored in the specified format as well as the category # ------------------------------------------------------------ AllowedOutputFormats = ['BS', 'ESD', 'AODFULL', 'AODSLIM', 'AODVERYSLIM', 'AODBLSSLIM', 'AODLARGE', 'AODSMALL', ] +AllowedOutputFormats.extend(EventBuildingInfo.getAllDataScoutingIdentifiers()) JetVarsToKeep = ['ActiveArea', 'ActiveArea4vec_eta', 'ActiveArea4vec_m', 'ActiveArea4vec_phi', 'ActiveArea4vec_pt', 'AlgorithmType', 'DetectorEta', 'DetectorPhi', 'EMFrac', 'EnergyPerSampling', 'GhostTrack', 'HECFrac', 'InputType', @@ -84,8 +86,8 @@ TriggerHLTListRun3 = [ ('xAOD::TrigCompositeContainer#L1J', 'BS ESD AODFULL AODSLIM', 'Steer'), ('xAOD::TrigCompositeAuxContainer#L1JAux.', 'BS ESD AODFULL AODSLIM', 'Steer'), - ('xAOD::TrigCompositeContainer#HLT_TrigCostContainer', 'BS ESD', 'Steer'), - ('xAOD::TrigCompositeAuxContainer#HLT_TrigCostContainerAux.alg.store.view.thread.slot.roi.start.stop.', 'BS ESD', 'Steer'), + ('xAOD::TrigCompositeContainer#HLT_TrigCostContainer', 'CostMonDS ESD', 'Steer'), + ('xAOD::TrigCompositeAuxContainer#HLT_TrigCostContainerAux.alg.store.view.thread.slot.roi.start.stop.', 'CostMonDS ESD', 'Steer'), # Run-2 L1 (temporary) ('xAOD::MuonRoIContainer#LVL1MuonRoIs' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'), @@ -290,7 +292,6 @@ TriggerHLTListRun3 = [ ('xAOD::TrackParticleContainer#HLT_xAODTracks', 'BS ESD AODFULL', 'ID'), ('xAOD::TrackParticleAuxContainer#HLT_xAODTracksAux.', 'BS ESD AODFULL', 'ID'), - ('EventInfo#ByteStreamEventInfo', 'ESD', 'Misc'), ('ROIB::RoIBResult#*', 'ESD', 'Misc'), ('xAOD::TrigCompositeContainer#HLT_SpacePointCounts', 'BS ESD AODFULL AODSLIM', 'MinBias'), diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py index aca8f56a12b..a96c7839a2d 100755 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from TriggerEDMRun3 import TriggerHLTListRun3, EDMDetailsRun3 +from TriggerEDMRun3 import TriggerHLTListRun3, EDMDetailsRun3, AllowedOutputFormats from AthenaCommon.Logging import logging log = logging.getLogger('testEDMRun3') @@ -35,10 +35,8 @@ def main(): file_types = TriggerSerializable[1].split(" ") - allowed_file_types = ("", "BS", "DS", "ESD", "AODFULL", "AODSLIM", "AODVERYSLIM", "AODBLSSLIM") - for file_type in file_types: - if file_type not in allowed_file_types: + if file_type not in AllowedOutputFormats: log.error("unknown file type " + file_type + " for " + serializable_name) return 1 diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py index 791fc28670c..e116b00c2c8 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py @@ -14,7 +14,7 @@ log.info("Importing %s",__name__) def generateChainConfigs( chainDict ): listOfChainDicts = splitChainDict(chainDict) - log.debug("Will generate Config for streamer: ",chainDict['chainName']) + log.debug("Will generate Config for streamer: %s", chainDict['chainName']) listOfChainDefs = [] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py index 9b57229c1af..06d20f66a81 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py @@ -52,17 +52,17 @@ def pebInfoWriterTool(name, eventBuildType): elif 'RPCPEBSecondaryReadout' in eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.ROBList = [0x610080, 0x620080] + elif eventBuildType in EventBuildingInfo.getAllDataScoutingIdentifiers(): + # Pure DataScouting configuration + tool = StaticPEBInfoWriterToolCfg(name) + moduleId = EventBuildingInfo.getDataScoutingResultID(eventBuildType) + tool.addHLTResultToROBList(moduleId) # Name not matched if not tool: log.error('PEBInfoWriterTool configuration is missing for event building identifier \'%s\'', eventBuildType) return None - # Add Data Scouting HLT result ROB - if eventBuildType in EventBuildingInfo.getAllDataScoutingResultIDs(): - moduleId = EventBuildingInfo.getAllDataScoutingResultIDs()[eventBuildType] - tool.addHLTResultToROBList(moduleId) - return tool diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py index 45532fd9359..1e0481fa1a8 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py @@ -77,8 +77,8 @@ def getEBPartFromParts( chainName, chainParts ): Checks if there is only one identifier """ # ---- event building identifier ---- - from EventBuildingInfo import AllowedEventBuildingIdentifiers - eventBuildTypes = set( AllowedEventBuildingIdentifiers ).intersection( chainParts ) + from EventBuildingInfo import getAllEventBuildingIdentifiers + eventBuildTypes = set( getAllEventBuildingIdentifiers() ).intersection( chainParts ) assert len(eventBuildTypes) <= 1, 'Chain {} has more than one Event Building identifier: {}, that is not supported'.format( chainName, eventBuildTypes) if eventBuildTypes: return eventBuildTypes.pop() diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py index e97d11e3617..f125e83fbec 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py @@ -22,16 +22,12 @@ PartialEventBuildingIdentifiers = [ # Data scouting identifiers and the corresponding HLT result ROBFragment module IDs # WARNING: Never change the module IDs during data taking! +# WARNING: ID=0 is reserved for full HLT result DataScoutingIdentifiers = { - 'JetDS': 5, - 'PhotonDS': 6 + 'CostMonDS': 1, + 'JetDS': 5 } -# Add DS identifiers to the allowed names -AllowedEventBuildingIdentifiers = [] -AllowedEventBuildingIdentifiers.extend(PartialEventBuildingIdentifiers) -AllowedEventBuildingIdentifiers.extend(DataScoutingIdentifiers.keys()) - def getDataScoutingResultID(name): if name in DataScoutingIdentifiers: @@ -50,9 +46,13 @@ def getFullHLTResultID(): return 0 +def getAllDataScoutingIdentifiers(): + return DataScoutingIdentifiers.keys() + + def getAllPartialEventBuildingIdentifiers(): - return DataScoutingIdentifiers.values() + return PartialEventBuildingIdentifiers def getAllEventBuildingIdentifiers(): - return AllowedEventBuildingIdentifiers + return PartialEventBuildingIdentifiers + DataScoutingIdentifiers.keys() diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index f43fed36f31..6b34b17ccda 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -203,7 +203,7 @@ def setupMenu(): ChainProp(name='HLT_noalg_L1EM3', l1SeedThresholds=[''], stream=[PhysicsStream], groups=EgammaStreamersGroup), ] TriggerFlags.MonitorSlice.signatures = [ - ChainProp(name='HLT_costmonitor_L1TE5', l1SeedThresholds=[''], stream=['CostMonitoring'], groups=['RATE:Monitoring','BW:Other']), + ChainProp(name='HLT_costmonitor_CostMonDS_L1TE5', l1SeedThresholds=[''], stream=['CostMonitoring'], groups=['RATE:Monitoring','BW:Other']), ] # Random Seeded EB chains which select at the HLT based on L1 TBP bits -- GitLab