Respect OnlineEnv.OutputLevel in HLT1

AllenOnline/options/AllenConfig.py

@@ -9,6 +9,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
+import logging
 import os
 import socket
 from itertools import chain
@@ -17,7 +18,7 @@ from PyConf.application import (ApplicationOptions, ComponentConfig,
                                 setup_component, configure)
 from PyConf.control_flow import CompositeNode, NodeLogic
 from PyConf.Algorithms import LHCb__IOVReset as IOVReset
-from Gaudi.Configuration import importOptions, allConfigurables
+from Gaudi.Configuration import importOptions, allConfigurables, WARNING, INFO
 from Configurables import ApplicationMgr, OnlMonitorSink
 from Configurables import AllenConfiguration
 from Configurables import MonitorSvc
@@ -43,7 +44,7 @@ try:
     initial_tck = getattr(OnlineEnv, "InitialTCK", 0)
 except ImportError:
     run_online = False
-    output_level = 3
+    output_level = INFO
     partition = 'Allen'
     partition_id = 0
     allen_sequence = 'hlt1_pp_no_ut'
@@ -54,6 +55,8 @@ except ImportError:
 integration_test = False
 
 options = ApplicationOptions(_enabled=False)
+options.output_level = output_level
+options.python_logging_level = (logging.WARNING if output_level >= WARNING else logging.INFO)
 options.simulation = not UseDD4Hep
 options.data_type = 'Upgrade'
 options.input_type = 'MDF'
@@ -125,8 +128,8 @@ online_conf.autoStart = False
 online_conf.monitorType = 'MonitorSvc'
 online_conf.logDeviceType = 'RTL::Logger::LogDevice'
 online_conf.logDeviceFormat = '%TIME%LEVEL%-8NODE: %-32PROCESS %-20SOURCE'
-online_conf.OutputLevel = 3
-online_conf.IOOutputLevel = output_level
+# online_conf.OutputLevel = output_level
+# online_conf.IOOutputLevel = output_level
 
 if run_online:
     import fifo_log
@@ -176,7 +179,6 @@ allen_conf.EnableRunChanges = True
 if run_online:
     from Configurables import Allen__MBMOutput as MBMOutput
     output_svc = MBMOutput("MBMOutput")
-    output_svc.OutputLevel = 2
     # FIXME: checksums disabled until performance is improved
     output_svc.Checksum = False
     output_svc.BufferName = mbm_setup.Allen_Output
@@ -193,7 +195,6 @@ mep_provider = MEPProvider()
 mep_provider.NSlices = 24
 # Events per slice should be set, and memory reserved per thread as well
 mep_provider.EventsPerSlice = events_per_slice
-mep_provider.OutputLevel = 3
 # Number of MEP buffers and number of transpose/offset/input threads
 mep_provider.BufferConfig = (10, 4)
 mep_provider.TransposeMEPs = False
@@ -248,10 +249,8 @@ monSvc.PartitionName = partition
 monSvc.DimUpdateInterval = 5
 
 appMgr.MessageSvcType = 'MessageSvc'
-appMgr.OutputLevel = 3
 messageSvc = MessageSvc('MessageSvc')
 messageSvc.Format = '% F%8W%L%T %25W%L%S %0W%M'
-messageSvc.OutputLevel = 3
 
 # Add the services that will produce the non-event-data
 monSink = OnlMonitorSink(

MooreScripts/tests/options/HLT1Slim/OnlineEnvBase.py

@@ -15,4 +15,4 @@ HltArchitecture = "dummy"
 OnlineVersion = "v0"
 MooreVersion = "v0"
 MooreOnlineVersion = "v0"
-OutputLevel = 3
+OutputLevel = 4