Use OldFlags2NewFlags in CombinedRec, muon combined and AthenaMonitoring.

This is to fix issues when new configuration did not match old.
Also fix logger of MuonConfig so it can turn CA debugging on

Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py

@@ -329,17 +329,11 @@ if DQMonFlags.doMonitoring():
 
    else:
       local_logger.info("DQ: setting up ConfigFlags")
+      from AthenaConfiguration.OldFlags2NewFlags import getNewConfigFlags
+      # Translate all needed flags from old jobProperties to a new AthConfigFlag Container
+      ConfigFlags = getNewConfigFlags()
       from AthenaConfiguration.AllConfigFlags import ConfigFlags
-      if globalflags.InputFormat() == 'bytestream':
-         ConfigFlags.Input.Files=athenaCommonFlags.BSRDOInput()
-      elif globalflags.InputFormat() == 'pool':
-         ConfigFlags.Input.Files=svcMgr.EventSelector.InputCollections
-
-      from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
-      ConfigFlags.GeoModel.Align.Dynamic=InDetGeometryFlags.useDynamicAlignFolders()
-      ConfigFlags.Detector.GeometryPixel=DetFlags.pixel_on()
-      ConfigFlags.Detector.GeometrySCT=DetFlags.SCT_on()
-      ConfigFlags.Detector.GeometryTRT=DetFlags.TRT_on()
+
       ConfigFlags.InDet.usePixelDCS=InDetFlags.usePixelDCS()
       ConfigFlags.InDet.doTIDE_Ambi=InDetFlags.doTIDE_Ambi()
 

Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py

@@ -24,11 +24,9 @@ if DQMonFlags.useTrigger():
       if rec.doTrigger():
          tdt_local_logger.error('DQ Monitoring is being asked to set up the TrigDecisionTool for some reason.  THIS IS A TERRIBLE IDEA AND SHOULD BE CONSIDERED A BUG!')
       from AthenaMonitoring.TriggerInterface import getTrigDecisionTool
-      from AthenaConfiguration.AllConfigFlags import ConfigFlags
-      if globalflags.InputFormat() == 'bytestream':
-         ConfigFlags.Input.Files=athenaCommonFlags.BSRDOInput()
-      elif globalflags.InputFormat() == 'pool':
-         ConfigFlags.Input.Files=svcMgr.EventSelector.InputCollections
+      from AthenaConfiguration.OldFlags2NewFlags import getNewConfigFlags
+      # Translate all needed flags from old jobProperties to a new AthConfigFlag Container
+      ConfigFlags = getNewConfigFlags()
 
       from AthenaConfiguration import ComponentAccumulator
       ComponentAccumulator.CAtoGlobalWrapper(getTrigDecisionTool, ConfigFlags)

Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_config.py

@@ -17,19 +17,16 @@ beamFlags = jobproperties.Beam
 muonCombinedRecFlags.setDefaults()
 
 if muonCombinedRecFlags.useNewConfig():
-    from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-    from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.ComponentAccumulator import CAtoGlobalWrapper
     from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedReconstructionCfg
 
-    ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
-    ConfigFlags.Detector.GeometryMDT   = True 
-    ConfigFlags.Detector.GeometryTGC   = True
-    ConfigFlags.Detector.GeometryCSC   = True     
-    ConfigFlags.Detector.GeometryRPC   = True     
+    from AthenaConfiguration.OldFlags2NewFlags import getNewConfigFlags
+    # Translate all needed flags from old jobProperties to a new AthConfigFlag Container
+    ConfigFlags = getNewConfigFlags()
+     
     # TODO Keep here for the moment, since we still have debugging to do.
     from AthenaCommon.Logging import logging
-    log = logging.getLogger( "conf2toConfigurable".ljust(30) )
+    log = logging.getLogger( "Py:conf2toConfigurable" )
     log.setLevel(DEBUG)
     CAtoGlobalWrapper(MuonCombinedReconstructionCfg,ConfigFlags)
 

Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py

@@ -139,20 +139,9 @@ if jetOK and rec.doBTagging() and  DetFlags.ID_on() and DetFlags.Muon_on():
     try:
         from AthenaCommon.Configurable import Configurable
         Configurable.configurableRun3Behavior=1
-        from AthenaConfiguration.AllConfigFlags import ConfigFlags
+        from AthenaConfiguration.OldFlags2NewFlags import getNewConfigFlags
         # Translate all needed flags from old jobProperties to a new AthConfigFlag Container
-        from AthenaCommon.AthenaCommonFlags import jobproperties as jps
-        ConfigFlags.Input.Files = jps.AthenaCommonFlags.FilesInput.get_Value()
-        ConfigFlags.IOVDb.GlobalTag=globalflags.ConditionsTag()
-        ConfigFlags.GeoModel.AtlasVersion = jps.Global.DetDescrVersion()
-        # Placeholder - to be replaced with a function to fill standard values.
-        ConfigFlags.Detector.GeometryPixel = DetFlags.geometry.pixel_on()
-        ConfigFlags.Detector.GeometrySCT = DetFlags.geometry.SCT_on()
-        ConfigFlags.Detector.GeometryTRT =  DetFlags.geometry.TRT_on()
-        ConfigFlags.Detector.RecoIBL = DetFlags.makeRIO.pixel_on()
-        ConfigFlags.Detector.RecoPixel = DetFlags.makeRIO.pixel_on()
-        ConfigFlags.Detector.RecoSCT = DetFlags.makeRIO.SCT_on()
-        ConfigFlags.Detector.RecoTRT = DetFlags.makeRIO.TRT_on()
+        ConfigFlags = getNewConfigFlags()
         # Additional b-tagging related flags
         ConfigFlags.BTagging.SaveSV1Probabilities = True
         ConfigFlags.BTagging.RunJetFitterNN = True