diff --git a/HLT/Trigger/TrigControl/TrigExamples/python/MTCalibPebConfig.py b/HLT/Trigger/TrigControl/TrigExamples/python/MTCalibPebConfig.py index 254cb57870f212f2136972c966551bdb726254ba..bae8fac6802bf5b77be6e7e2bd8255a53ce64b32 100644 --- a/HLT/Trigger/TrigControl/TrigExamples/python/MTCalibPebConfig.py +++ b/HLT/Trigger/TrigControl/TrigExamples/python/MTCalibPebConfig.py @@ -131,6 +131,10 @@ def set_flags(flags, options=default_options): flags.Trigger.doID = False flags.Trigger.doCalo = False flags.Trigger.doMuon = False + # Disable L1 data decoding (except for CTP) + flags.Trigger.L1.doMuon = False + flags.Trigger.L1.doCalo = False + flags.Trigger.L1.doTopo = False def l1_seq_cfg(flags, options=default_options): diff --git a/HLT/Trigger/TrigControl/TrigExamples/share/MTCalibPebConfigTest.ref b/HLT/Trigger/TrigControl/TrigExamples/share/MTCalibPebConfigTest.ref index 3d29c8a67b39a0d82428ceb4debe32cd25fdb1c4..e76433bdc9d4e02bc2ad3ccf0958642f1919158e 100644 --- a/HLT/Trigger/TrigControl/TrigExamples/share/MTCalibPebConfigTest.ref +++ b/HLT/Trigger/TrigControl/TrigExamples/share/MTCalibPebConfigTest.ref @@ -16,18 +16,14 @@ Py:ComponentAccumulator INFO \__ TriggerSummaryAlg/TriggerSummaryAlg Py:ComponentAccumulator INFO \__ DecisionSummaryMakerAlg/DecisionSummaryMakerAlg (alg) Py:ComponentAccumulator INFO \__ SGInputLoader/SGInputLoader (alg) Py:ComponentAccumulator INFO Condition Algorithms -Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg) -Py:ComponentAccumulator INFO \__ RpcCablingCondAlg (cond alg) -Py:ComponentAccumulator INFO \__ MuonAlignmentCondAlg (cond alg) -Py:ComponentAccumulator INFO \__ MuonDetectorCondAlg (cond alg) Py:ComponentAccumulator INFO \__ TrigConf__BunchGroupCondAlg (cond alg) +Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg) Py:ComponentAccumulator INFO \__ HLTPrescaleCondAlg (cond alg) Py:ComponentAccumulator INFO Services -Py:ComponentAccumulator INFO ['IOVDbSvc', 'PoolSvc', 'CondSvc', 'ProxyProviderSvc', 'DBReplicaSvc', 'TagInfoMgr', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'AthenaPoolCnvSvc', 'EventPersistencySvc', 'DetDescrCnvSvc', 'GeoModelSvc', 'AGDDtoGeoSvc', 'MuonIdHelperSvc', 'MuonTGC_CablingSvc', 'TGCcablingServerSvc', 'ByteStreamCnvSvc', 'ByteStreamInputSvc', 'EventSelectorByteStream', 'ByteStreamAddressProviderSvc', 'LVL1ConfigSvc', 'HLTConfigSvc', 'ROBDataProviderSvc', 'HltEventLoopMgr'] +Py:ComponentAccumulator INFO ['ByteStreamCnvSvc', 'ByteStreamInputSvc', 'EventSelectorByteStream', 'EventPersistencySvc', 'ByteStreamAddressProviderSvc', 'ProxyProviderSvc', 'LVL1ConfigSvc', 'HLTConfigSvc', 'IOVDbSvc', 'PoolSvc', 'CondSvc', 'DBReplicaSvc', 'TagInfoMgr', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'AthenaPoolCnvSvc', 'ROBDataProviderSvc', 'HltEventLoopMgr'] Py:ComponentAccumulator INFO Public Tools Py:ComponentAccumulator INFO [ Py:ComponentAccumulator INFO IOVDbMetaDataTool/IOVDbMetaDataTool, -Py:ComponentAccumulator INFO TGCCablingDbTool/TGCCablingDbTool, Py:ComponentAccumulator INFO ] Py:ComponentAccumulator INFO Private Tools Py:ComponentAccumulator INFO [ diff --git a/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingConfig.py b/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingConfig.py index c475533e7a8d1fac819f17087c7c4d30b6fcbf5c..39925bb66c18ca6a19cde595812d2199b9cdbbbb 100644 --- a/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingConfig.py +++ b/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingConfig.py @@ -223,15 +223,15 @@ def L1TriggerResultMakerCfg(flags): l1trMaker = CompFactory.L1TriggerResultMaker() # Muon RoIs - if flags.Trigger.enableL1MuonPhase1: - l1trMaker.MuRoIKey = "LVL1MuonRoIs" - from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import TrigThresholdDecisionToolCfg - l1trMaker.ThresholdPatternTools += [acc.popToolsAndMerge(TrigThresholdDecisionToolCfg(flags))] + if flags.Trigger.L1.doMuon and flags.Trigger.enableL1MuonPhase1: + l1trMaker.MuRoIKey = "LVL1MuonRoIs" + from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import TrigThresholdDecisionToolCfg + l1trMaker.ThresholdPatternTools += [acc.popToolsAndMerge(TrigThresholdDecisionToolCfg(flags))] else: - l1trMaker.MuRoIKey = "" + l1trMaker.MuRoIKey = "" # L1Calo RoIs - if flags.Trigger.enableL1CaloPhase1: + if flags.Trigger.L1.doCalo and flags.Trigger.enableL1CaloPhase1: l1trMaker.eFexEMRoIKey = "L1_eEMRoI" l1trMaker.eFexTauRoIKey = "L1_eTauRoI" l1trMaker.jFexTauRoIKey = "L1_jFexTauRoI" @@ -252,15 +252,15 @@ def L1TriggerResultMakerCfg(flags): CompFactory.gFexLRJetRoIThresholdsTool(), ] else: - l1trMaker.eFexEMRoIKey = "" - l1trMaker.eFexTauRoIKey = "" - l1trMaker.jFexTauRoIKey = "" - l1trMaker.jFexSRJetRoIKey = "" - l1trMaker.jFexLRJetRoIKey = "" - l1trMaker.gFexSRJetRoIKey = "" - l1trMaker.gFexLRJetRoIKey = "" - l1trMaker.cTauRoIKey = "" - l1trMaker.cjTauLinkKey = "" + l1trMaker.eFexEMRoIKey = "" + l1trMaker.eFexTauRoIKey = "" + l1trMaker.jFexTauRoIKey = "" + l1trMaker.jFexSRJetRoIKey = "" + l1trMaker.jFexLRJetRoIKey = "" + l1trMaker.gFexSRJetRoIKey = "" + l1trMaker.gFexLRJetRoIKey = "" + l1trMaker.cTauRoIKey = "" + l1trMaker.cjTauLinkKey = "" # Placeholder for other L1 xAOD outputs: # - CTP result @@ -290,14 +290,14 @@ class HLTSeeding(CompFactory.HLTSeeding) : Decisions=mapThresholdToL1DecisionCollection("FSNOSEED"), OutputTrigRoIs = recordable(mapThresholdToL1RoICollection("FSNOSEED") )) ] # EM unpacker - if flags.Trigger.doID or flags.Trigger.doCalo: + if flags.Trigger.L1.doCalo: if flags.Trigger.enableL1CaloPhase1: self.xAODRoIUnpackers += createCaloRoIUnpackers(flags) if flags.Trigger.enableL1CaloLegacy: self.RoIBRoIUnpackers += createLegacyCaloRoIUnpackers() # MU unpacker - if flags.Trigger.doMuon: + if flags.Trigger.L1.doMuon: if flags.Trigger.enableL1MuonPhase1: self.xAODRoIUnpackers += createMuonRoIUnpackers(flags) else: @@ -348,13 +348,13 @@ def HLTSeedingCfg(flags, seqName = None): CompFactory.FSRoIsUnpackingTool("FSRoIsUnpackingTool", Decisions=mapThresholdToL1DecisionCollection("FSNOSEED"), OutputTrigRoIs = recordable(mapThresholdToL1RoICollection("FSNOSEED")) ) ] - if flags.Trigger.doCalo: + if flags.Trigger.L1.doCalo: if flags.Trigger.enableL1CaloPhase1: decoderAlg.xAODRoIUnpackers += createCaloRoIUnpackers(flags) if flags.Trigger.enableL1CaloLegacy: decoderAlg.RoIBRoIUnpackers += createLegacyCaloRoIUnpackers() - if flags.Trigger.doMuon: + if flags.Trigger.L1.doMuon: if flags.Trigger.enableL1MuonPhase1: decoderAlg.xAODRoIUnpackers += createMuonRoIUnpackers(flags) else: