Merge branch 'CaloBCIDAvgAlgToBeginSeq2' into 'master'

Fix for BCIDAvgAlg sequence

See merge request !41427

Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py

@@ -56,7 +56,7 @@ class TrigCaloDataAccessSvc(_TrigCaloDataAccessSvc):
                 from AthenaCommon.AlgSequence import AlgSequence
                 topSequence = AlgSequence()
                 from AthenaCommon.CFElements import findSubSequence
-                hltBeginSeq = findSubSequence(topSequence, 'HltBeginSeq')
+                hltBeginSeq = findSubSequence(topSequence, 'HLTBeginSeq')
                 from CaloRec.CaloBCIDAvgAlgDefault import CaloBCIDAvgAlgDefault
                 bcidAvgAlg = CaloBCIDAvgAlgDefault(sequence=hltBeginSeq)
 

Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py

@@ -276,6 +276,17 @@ include.block("RecExCond/RecExCommon_flags.py")
 from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg
 CAtoGlobalWrapper(IOVDbSvcCfg, ConfigFlags)
 
+# ---------------------------------------------------------------
+# Create main sequences
+# ---------------------------------------------------------------
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+from AthenaCommon.CFElements import seqOR,parOR
+hltTop = seqOR("HLTTop")
+hltBeginSeq = parOR("HLTBeginSeq")
+hltTop += hltBeginSeq
+topSequence += hltTop
+
 #-------------------------------------------------------------
 # Setting DetFlags
 #-------------------------------------------------------------
@@ -322,10 +333,6 @@ rec.doTruth = False
 for mod in modifierList:
     mod.preSetup()
 
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
 #--------------------------------------------------------------
 # Increase scheduler checks and verbosity
 #--------------------------------------------------------------
@@ -405,15 +412,6 @@ createL1PrescalesFileFromMenu(ConfigFlags)
 from TrigConfigSvc.TrigConfigSvcCfg import L1ConfigSvcCfg
 CAtoGlobalWrapper(L1ConfigSvcCfg,ConfigFlags)
 
-# ---------------------------------------------------------------
-# Create main sequences
-# ---------------------------------------------------------------
-from AthenaCommon.CFElements import seqOR,parOR
-hltTop = seqOR("HLTTop")
-hltBeginSeq = parOR("HLTBeginSeq")
-hltTop += hltBeginSeq
-topSequence += hltTop
-
 # ---------------------------------------------------------------
 # Event Info setup
 # ---------------------------------------------------------------