Skip to content
Snippets Groups Projects

Add new parallel HLTBeginSeq for L1Decoder and CacheCreators, add HLTEndSeq for summary algorithms

Merged Stewart Martin-Haugh requested to merge smh/athena:new_HLT_bootstrap_sequence into master
2 files
+ 24
20
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -433,13 +433,6 @@ createL1PrescalesFileFromMenu()
from TrigConfigSvc.TrigConfigSvcCfg import L1ConfigSvcCfg
CAtoGlobalWrapper(L1ConfigSvcCfg,None)
# ---------------------------------------------------------------
# Level 1 simulation
# ---------------------------------------------------------------
if opt.doL1Sim:
from TriggerJobOpts.Lvl1SimulationConfig import Lvl1SimulationSequence
topSequence += Lvl1SimulationSequence(ConfigFlags)
# ---------------------------------------------------------------
# HLT prep: RoIBResult and L1Decoder
# ---------------------------------------------------------------
@@ -447,8 +440,8 @@ if opt.doL1Sim:
# main HLT top sequence
from AthenaCommon.CFElements import seqOR,parOR
hltTop = seqOR("HLTTop")
hltBootstrap = parOR("HLTBootstrap")
hltTop += hltBootstrap
hltBeginSeq = parOR("HLTBeginSeq")
hltTop += hltBeginSeq
l1decoder = None
if opt.doL1Unpacking:
@@ -465,18 +458,26 @@ if opt.doL1Unpacking:
l1decoder.L1TriggerResult = "L1TriggerResult" if opt.enableL1Phase1 else ""
if opt.enableL1Phase1:
from L1Decoder.L1DecoderConfig import getL1TriggerResultMaker
topSequence += conf2toConfigurable(getL1TriggerResultMaker())
hltBeginSeq += conf2toConfigurable(getL1TriggerResultMaker())
if TriggerFlags.doTransientByteStream():
transTypeKey = ("TransientBSOutType","StoreGateSvc+TransientBSOutKey")
l1decoder.ExtraInputs += [transTypeKey]
hltBootstrap += conf2toConfigurable(l1decoder)
hltBeginSeq += conf2toConfigurable(l1decoder)
else:
from TrigUpgradeTest.TestUtils import L1EmulationTest
topSequence += L1EmulationTest()
hltBeginSeq += L1EmulationTest()
topSequence += hltTop
# ---------------------------------------------------------------
# Level 1 simulation
# ---------------------------------------------------------------
if opt.doL1Sim:
from TriggerJobOpts.Lvl1SimulationConfig import Lvl1SimulationSequence
hltBeginSeq += Lvl1SimulationSequence(ConfigFlags)
# ---------------------------------------------------------------
# HLT generation
# ---------------------------------------------------------------
@@ -569,7 +570,7 @@ if opt.doWriteBS:
#-------------------------------------------------------------
ConfigFlags.lock()
from TriggerJobOpts.TriggerConfig import triggerIDCCacheCreatorsCfg
CAtoGlobalWrapper(triggerIDCCacheCreatorsCfg, ConfigFlags, seqName="HLTBootstrap")
CAtoGlobalWrapper(triggerIDCCacheCreatorsCfg, ConfigFlags, seqName="HLTBeginSeq")
#-------------------------------------------------------------
# Output configuration
Loading