Merge branch 'master-dq-new-csc' into 'master'

Add CSC and MM new-style monitoring

See merge request atlas/athena!37077

MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py

@@ -16,6 +16,12 @@ def MuonDQAMonitoringConfig(flags):
             result.merge(MdtMonitoringConfig(flags))
             result.merge(RpcMonitoringConfig(flags))
             result.merge(TgcRawDataMonitoringConfig(flags))
+            if flags.Detector.GeometryCSC:
+                from CscRawDataMonitoring.CscMonitorAlgorithm import CscMonitoringConfig
+                result.merge(CscMonitoringConfig(flags))
+            if flags.Detector.GeometryMM:
+                from MMRawDataMonitoring.MMMonitorAlgorithm import MMMonitoringConfig
+                result.merge(MMMonitoringConfig(flags))
 
     if flags.DQ.Steering.Muon.doTrackMon:
         # do not run in RAW->ESD

MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/python/MMMonitorAlgorithm.py

@@ -4,7 +4,7 @@
 #
 
 from AthenaConfiguration.ComponentFactory import CompFactory
-from MMMonUtils import getMMLabel,getMMLabelY
+from .MMMonUtils import getMMLabel,getMMLabelY
 
 def MMMonitoringConfig(inputFlags):
     '''Function to configures some algorithms in the monitoring system.'''