Merge branch 'rm-no-LHCb' into 'master'

Use HLTControlFlowMgr instead of Online's AlgFlowManager

See merge request !444

Rich/Panoptes/options/RichCommissioning-Online.py

@@ -23,9 +23,7 @@ import Configurables
 import Gaudi.Configuration as Gaudi
 import GaudiOnline
 import OnlineEnvBase as OnlineEnv
-from Configurables import ExecutionReportsWriter, HLTControlFlowMgr, LHCbApp
 from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
-from Configurables import Online__AlgFlowManager as AlgFlowManager
 from Moore import options
 from Panoptes.commissioning import daq_commissioning
 from RecoConf.config import run_reconstruction
@@ -72,8 +70,6 @@ application = GaudiOnline.Application(
 # application.setup_fifolog(format='%-8LEVEL %-24SOURCE', device='fifo')
 
 application.setup_mbm_access("Events", True)
-cfm = HLTControlFlowMgr("HLTControlFlowMgr")
-application.setup_hive(cfm, 44)
 
 application.setup_monitoring("RichMon")
 application.monSvc.DimUpdateInterval = 1

Rich/Panoptes/options/RichPhotonCounting-Online.py

@@ -23,9 +23,8 @@ import Configurables
 import Gaudi.Configuration as Gaudi
 import GaudiOnline
 import OnlineEnvBase as OnlineEnv
-from Configurables import ExecutionReportsWriter, HLTControlFlowMgr, LHCbApp
 from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
-from Configurables import Online__AlgFlowManager as AlgFlowManager
+from Configurables import LHCbApp
 from GaudiKernel.SystemOfUnits import GeV
 from Moore import options
 from RecoConf.config import run_reconstruction
@@ -133,19 +132,6 @@ application = GaudiOnline.Application(
 # abort. So comment out for now..
 # application.setup_fifolog()
 
-application.setup_mbm_access("Events", True)
-flow = AlgFlowManager("EventLoop")
-application.setup_hive(flow, 44)
-
-# see https://gitlab.cern.ch/lhcb/MooreOnline/-/blob/15bc29016c0132f9a6034078471d857d568867da/MooreOnlineConf/options/online.py
-# HACK: transfer options from HLTControlFlowMgr
-cfm = HLTControlFlowMgr("HLTControlFlowMgr")
-flow.CompositeCFNodes = cfm.CompositeCFNodes
-flow.BarrierAlgNames = cfm.BarrierAlgNames
-# HACK: tell the HltDecReports creator to use the online scheduler
-# only works because there is exactly one instance of ExecutionReportsWriter
-# ExecutionReportsWriter().Scheduler = flow
-
 application.setup_monitoring("RichPhotonCounting")
 application.monSvc.DimUpdateInterval = 1
 application.config.burstPrintCount = 30000

Rich/Panoptes/options/RichRefIndexCalib-Online.py

@@ -23,9 +23,8 @@ import Configurables
 import Gaudi.Configuration as Gaudi
 import GaudiOnline
 import OnlineEnvBase as OnlineEnv
-from Configurables import ExecutionReportsWriter, HLTControlFlowMgr, LHCbApp
 from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
-from Configurables import Online__AlgFlowManager as AlgFlowManager
+from Configurables import LHCbApp
 from GaudiKernel.SystemOfUnits import GeV
 from Moore import options
 from RecoConf.config import run_reconstruction
@@ -148,17 +147,6 @@ application = GaudiOnline.Application(
 # application.setup_fifolog()
 
 application.setup_mbm_access("Events", True)
-flow = AlgFlowManager("EventLoop")
-application.setup_hive(flow, 44)
-
-# see https://gitlab.cern.ch/lhcb/MooreOnline/-/blob/15bc29016c0132f9a6034078471d857d568867da/MooreOnlineConf/options/online.py
-# HACK: transfer options from HLTControlFlowMgr
-cfm = HLTControlFlowMgr("HLTControlFlowMgr")
-flow.CompositeCFNodes = cfm.CompositeCFNodes
-flow.BarrierAlgNames = cfm.BarrierAlgNames
-# HACK: tell the HltDecReports creator to use the online scheduler
-# only works because there is exactly one instance of ExecutionReportsWriter
-# ExecutionReportsWriter().Scheduler = flow
 
 application.setup_monitoring("RichRefIndexCal")
 application.monSvc.DimUpdateInterval = 1