Add new parallel HLTBootstrap sequence for L1Decoder and CacheCreators.

Also put L1Decoder into the sequence at the correct point already in
runHLT_standalone.py. Addresses ATR-21657

Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt

@@ -9,15 +9,17 @@ atlas_add_component( TrigUpgradeTest
                      LINK_LIBRARIES AthenaBaseComps TrigSteeringEvent DecisionHandlingLib TrigCompositeUtilsLib
                      )
 
-atlas_add_test( emu_step_processing
-		SCRIPT test/test_emu_step_processing.sh
+foreach(test emu_step_processing emu_step_menu_processing)
+    set( rundir ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_${test} )
+    file( REMOVE_RECURSE ${rundir} )
+    file( MAKE_DIRECTORY ${rundir} )
+    atlas_add_test( ${test}
+		SCRIPT test/test_${test}.sh
 		LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
+    PROPERTIES WORKING_DIRECTORY ${rundir}
 		)
+endforeach()
 
-atlas_add_test( emu_step_menu_processing
-		SCRIPT test/test_emu_step_menu_processing.sh
-		LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
-		) 
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py

@@ -21,8 +21,13 @@ def thresholdToChains( chains ):
 ###########################################################################    
 def generateL1DecoderAndChainsManually(topSequence):
     generateEmuEvents()
+    from AthenaCommon.CFElements import seqOR,parOR
+    hltTop = seqOR("HLTTop")
+    hltBeginSeq = parOR("HLTBeginSeq")
+    hltTop += hltBeginSeq
+    topSequence += hltTop
     l1Decoder = generateL1Decoder()
-    topSequence += l1Decoder
+    hltBeginSeq += l1Decoder
     generateChainsManually()
     from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import makeHLTTree
     from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
@@ -32,8 +37,14 @@ def generateL1DecoderAndChainsManually(topSequence):
 ###########################################################################    
 def generateL1DecoderAndChainsByMenu(topSequence):
     generateEmuEvents()
+    from AthenaCommon.CFElements import seqOR,parOR
+    hltTop = seqOR("HLTTop")
+    hltBeginSeq = parOR("HLTBeginSeq")
+    hltTop += hltBeginSeq
+    topSequence += hltTop
+    l1Decoder = generateL1Decoder()
+    hltBeginSeq += l1Decoder
     l1Decoder = generateL1Decoder()
-    topSequence += l1Decoder
     generateEmuMenu()
 
 

Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py

@@ -43,6 +43,7 @@ for option in defaultOptions:
 TriggerFlags.generateMenuDiagnostics=True
 
 topSequence = AlgSequence()
+
 if opt.doMenu is True:
     generateL1DecoderAndChainsByMenu(topSequence)
 else:

Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py

@@ -63,7 +63,7 @@ acc.merge(TriggerHistSvcConfig( flags ))
 
 from TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT_newJO import generateMenu as generateHLTMenu
 from TriggerJobOpts.TriggerConfig import triggerRunCfg
-acc.merge( triggerRunCfg( flags, menu=generateHLTMenu ) )
+acc.merge( triggerRunCfg( flags, seqName = "AthMasterSeq", menu=generateHLTMenu ) )
 
 from RegionSelector.RegSelConfig import regSelCfg
 acc.merge( regSelCfg( flags ) )

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py

@@ -506,7 +506,7 @@ def triggerMergeViewsAndAddMissingEDMCfg( edmSet, hypos, viewMakers, decObj, dec
 
 
 
-def triggerRunCfg( flags, menu=None ):
+def triggerRunCfg( flags, seqName = None, menu=None ):
     """
     top of the trigger config (for real triggering online or on MC)
     Returns: ca only
@@ -518,7 +518,7 @@ def triggerRunCfg( flags, menu=None ):
 
     acc.merge( L1ConfigSvcCfg(flags) )
 
-    acc.merge( triggerIDCCacheCreatorsCfg( flags ) )
+    acc.merge( triggerIDCCacheCreatorsCfg( flags, seqName ) )
 
     from L1Decoder.L1DecoderConfig import L1DecoderCfg
     l1DecoderAcc, l1DecoderAlg = L1DecoderCfg( flags )
@@ -571,19 +571,19 @@ def triggerRunCfg( flags, menu=None ):
 
     return acc
 
-def triggerIDCCacheCreatorsCfg(flags):
+def triggerIDCCacheCreatorsCfg(flags, seqName = None):
     """
     Configures IDC cache loading, for now unconditionally, may make it menu dependent in future
     """
-    acc = ComponentAccumulator()
+    acc = ComponentAccumulator(sequenceName = seqName)
     from MuonConfig.MuonBytestreamDecodeConfig import MuonCacheCfg
-    acc.merge( MuonCacheCfg() )
+    acc.merge( MuonCacheCfg(), sequenceName = seqName )
 
     from MuonConfig.MuonRdoDecodeConfig import MuonPrdCacheCfg
-    acc.merge( MuonPrdCacheCfg() )
+    acc.merge( MuonPrdCacheCfg(), sequenceName = seqName )
 
     from TrigInDetConfig.TrigInDetConfig import InDetIDCCacheCreatorCfg
-    acc.merge( InDetIDCCacheCreatorCfg() )
+    acc.merge( InDetIDCCacheCreatorCfg(), sequenceName = seqName )
 
     return acc
 
@@ -613,7 +613,7 @@ if __name__ == "__main__":
         return menuCA
 
         
-    acc = triggerRunCfg( ConfigFlags, testMenu )
+    acc = triggerRunCfg( ConfigFlags, seqName = None, menu = testMenu )
     Configurable.configurableRun3Behavior=0
     from AthenaConfiguration.ComponentAccumulator import appendCAtoAthena
     appendCAtoAthena( acc )

Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py

@@ -439,16 +439,16 @@ 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
 # ---------------------------------------------------------------
+
+# main HLT top sequence
+from AthenaCommon.CFElements import seqOR,parOR
+hltTop = seqOR("HLTTop")
+hltBeginSeq = parOR("HLTBeginSeq")
+hltTop += hltBeginSeq
+
 l1decoder = None
 if opt.doL1Unpacking:
     if globalflags.InputFormat.is_bytestream():
@@ -464,15 +464,25 @@ 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]
 
-        topSequence += 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
@@ -566,7 +576,7 @@ if opt.doWriteBS:
 #-------------------------------------------------------------
 ConfigFlags.lock()
 from TriggerJobOpts.TriggerConfig import triggerIDCCacheCreatorsCfg
-CAtoGlobalWrapper(triggerIDCCacheCreatorsCfg,ConfigFlags)
+CAtoGlobalWrapper(triggerIDCCacheCreatorsCfg, ConfigFlags, seqName="HLTBeginSeq")
 
 
 # B-jet output

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py

@@ -31,7 +31,7 @@ from builtins import map
 from builtins import range
 from collections import OrderedDict
 # Classes to configure the CF graph, via Nodes
-from AthenaCommon.CFElements import parOR, seqAND, seqOR
+from AthenaCommon.CFElements import parOR, seqAND
 from AthenaCommon.AlgSequence import dumpSequence
 from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFDot import  stepCF_DataFlow_to_dot, stepCF_ControlFlow_to_dot, all_DataFlow_to_dot, create_dot
 from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
@@ -126,24 +126,19 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None):
     topSequence = AlgSequence()
 
 
-    # connect to L1Decoder
-    l1decoder = [ d for d in topSequence.getChildren() if d.getType() == "L1Decoder" ]
-    if len(l1decoder)  != 1 :
-        raise RuntimeError(" Can't find 1 instance of L1Decoder in topSequence, instead found this in topSequence "+str(topSequence.getChildren()) )
-
-    # take L1Decoder out of topSeq
-    topSequence.remove( l1decoder )
-
-    # main HLT top sequence
-    hltTop = seqOR("HLTTop")
-
-    # put L1Decoder here
-    hltTop += l1decoder
+    # find main HLT top sequence (already set up in runHLT_standalone)
+    from AthenaCommon.CFElements import findSubSequence
+    hltBeginSeq = findSubSequence(topSequence, "HLTBeginSeq")
+    l1decoder = [ d for d in hltBeginSeq.getChildren() if d.getType() == "L1Decoder" ]
 
     # add the HLT steps Node
     steps = seqAND("HLTAllSteps")
+    hltTop = findSubSequence(topSequence, "HLTTop")
     hltTop +=  steps
 
+    hltEndSeq = parOR("HLTEndSeq")
+    hltTop += hltEndSeq
+
     # make DF and CF tree from chains
     finalDecisions = decisionTreeFromChains(steps, triggerConfigHLT.configsList(), triggerConfigHLT.dictsList(), newJO)
 
@@ -151,8 +146,8 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None):
     for step in finalDecisions:
         flatDecisions.extend (step)
 
-    summary= makeSummary("Final", flatDecisions)
-    hltTop += summary
+    summary = makeSummary("Final", flatDecisions)
+    hltEndSeq += summary
 
     # TODO - check we are not running things twice. Once here and once in TriggerConfig.py
 
@@ -168,7 +163,7 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None):
     Configurable.configurableRun3Behavior=1
     summaryAcc, summaryAlg = triggerSummaryCfg( ConfigFlags, hypos )
     Configurable.configurableRun3Behavior=0
-    hltTop += conf2toConfigurable( summaryAlg )
+    hltEndSeq += conf2toConfigurable( summaryAlg )
     appendCAtoAthena( summaryAcc )
     decObj = collectDecisionObjects( hypos, filters, l1decoder[0], summaryAlg )
     decObjHypoOut = collectHypoDecisionObjects(hypos, inputs=False, outputs=True)
@@ -176,17 +171,17 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None):
     monAcc, monAlg = triggerMonitoringCfg( ConfigFlags, hypos, filters, l1decoder[0] )
     edmAlg = triggerMergeViewsAndAddMissingEDMCfg(['AOD', 'ESD'], hypos, viewMakers, decObj, decObjHypoOut)
     Configurable.configurableRun3Behavior=0
-    hltTop += conf2toConfigurable( monAlg )
+    hltEndSeq += conf2toConfigurable( monAlg )
     appendCAtoAthena( monAcc )
 
     # this is a shotcut for now, we always assume we may be writing ESD & AOD outputs, so all gaps will be filled
-    hltTop += conf2toConfigurable(edmAlg)
+
+    hltEndSeq += conf2toConfigurable(edmAlg)
 
     # Test the configuration
     from TriggerMenuMT.HLTMenuConfig.Menu.CFValidation import testHLTTree
     testHLTTree( hltTop )
 
-    topSequence += hltTop
 
 def matrixDisplayOld( allCFSeq ):
     from collections import defaultdict