Synatx adjustments for GaudiConfig2: Reconstruction

Reconstruction/MissingETMonitoring/python/METMonitorAlgorithm.py

@@ -146,8 +146,7 @@ def METMonitoringConfig(inputFlags):
         defineHistograms(METEMTopo_METCut_MonAlg, METEMTopo_METCut_group,helper,mets)    
 # Jet cleaning
 
-    from AthenaCommon import CfgMgr
-    jetCleaningTool = CfgMgr.JetCleaningTool()
+    jetCleaningTool = CompFactory.JetCleaningTool()
     jetCleaningTool.CutLevel = "LooseBad"       
 #    jetCleaningTool.CutLevel = "TightBad"       
     jetCleaningTool.DoUgly = False

Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py

@@ -121,9 +121,9 @@ def MuonCombinedInDetCandidateAlg(flags, name="MuonCombinedInDetCandidateAlg",**
     extrapolator = acc.getPrimary()
     result.merge(acc)
 
-    muon_particle_extension_tool = CompFactory.Trk__ParticleCaloExtensionTool(Extrapolator=extrapolator)
+    muon_particle_extension_tool = CompFactory.Trk.ParticleCaloExtensionTool(Extrapolator=extrapolator)
 
-    muon_ext_tool = CompFactory.Muon__MuonSystemExtensionTool(ParticleCaloExtensionTool = muon_particle_extension_tool, Extrapolator = extrapolator)
+    muon_ext_tool = CompFactory.Muon.MuonSystemExtensionTool(ParticleCaloExtensionTool = muon_particle_extension_tool, Extrapolator = extrapolator)
     kwargs.setdefault("MuonSystemExtensionTool", muon_ext_tool)
     
     alg = CompFactory.MuonCombinedInDetCandidateAlg(name,**kwargs)
@@ -198,8 +198,7 @@ def MuonCombinedReconstructionCfg(flags):
     from AtlasGeoModel.GeoModelConfig import GeoModelCfg
     result.merge( GeoModelCfg(flags) )
 
-    Muon__MuonEDMHelperSvc=CompFactory.Muon__MuonEDMHelperSvc
-    muon_edm_helper_svc = Muon__MuonEDMHelperSvc("MuonEDMHelperSvc")
+    muon_edm_helper_svc = CompFactory.Muon.MuonEDMHelperSvc("MuonEDMHelperSvc")
     result.addService( muon_edm_helper_svc )
 
     result.merge( MuonCombinedInDetCandidateAlg(flags) )

Reconstruction/RecoTools/TrackToCalo/python/CaloExtensionBuilderAlgCfg.py

@@ -3,14 +3,14 @@ from AthenaConfiguration.ComponentFactory import CompFactory
 
 def getCaloExtenstionBuilderAlgorithm(inputFlags, cutLevel = "TightPrimary", minPT = 100.0):
     from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg    
-    Trk__ParticleCaloExtensionTool = CompFactory.Trk__ParticleCaloExtensionTool
+    Trk__ParticleCaloExtensionTool = CompFactory.Trk.ParticleCaloExtensionTool
     extrapPFlowCfg = AtlasExtrapolatorCfg(inputFlags)
     pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = extrapPFlowCfg.popPrivateTools())
         
-    CaloExtensionBuilderAlg = CompFactory.Trk__CaloExtensionBuilderAlg 
+    CaloExtensionBuilderAlg = CompFactory.Trk.CaloExtensionBuilderAlg 
     CaloExtensionBuilderAlg = CaloExtensionBuilderAlg(LastCaloExtentionTool = pcExtensionTool)
 
-    InDet__InDetTrackSelectionTool = CompFactory.InDet__InDetTrackSelectionTool    
+    InDet__InDetTrackSelectionTool = CompFactory.InDet.InDetTrackSelectionTool    
     TrackSelectionToolHC = InDet__InDetTrackSelectionTool(name = "CaloExtensionBuilderTrackSelectionTool",minPt = minPT, CutLevel = cutLevel, minNSiHits = 7) # SiHits = PixelHits + SCTHits + PixelDeadSensors + SCTDeadSensors    
     CaloExtensionBuilderAlg.TrkSelection = TrackSelectionToolHC
      

Reconstruction/RecoTools/TrackToCalo/python/TrackToCaloConfig.py

@@ -7,7 +7,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
 from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
-Trk__ParticleCaloExtensionTool, Rec__ParticleCaloCellAssociationTool=CompFactory.getComps("Trk__ParticleCaloExtensionTool","Rec__ParticleCaloCellAssociationTool",)
+Trk__ParticleCaloExtensionTool, Rec__ParticleCaloCellAssociationTool=CompFactory.getComps("Trk::ParticleCaloExtensionTool","Rec::ParticleCaloCellAssociationTool")
 
 def ParticleCaloExtensionToolCfg(flags, **kwargs):
     acc=ComponentAccumulator()

Reconstruction/eflowRec/python/PFCfg.py

@@ -6,7 +6,7 @@ def getPFTrackSelectorAlgorithm(inputFlags,algName,useCaching=True):
     PFTrackSelector=PFTrackSelector(algName)
 
     from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg    
-    Trk__ParticleCaloExtensionTool=CompFactory.Trk__ParticleCaloExtensionTool
+    Trk__ParticleCaloExtensionTool=CompFactory.Trk.ParticleCaloExtensionTool
     extrapCfg = AtlasExtrapolatorCfg(inputFlags)
     pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = extrapCfg.popPrivateTools())
 
@@ -17,7 +17,7 @@ def getPFTrackSelectorAlgorithm(inputFlags,algName,useCaching=True):
 
     PFTrackSelector.trackExtrapolatorTool = TrackCaloExtensionTool
 
-    InDet__InDetTrackSelectionTool=CompFactory.InDet__InDetTrackSelectionTool
+    InDet__InDetTrackSelectionTool=CompFactory.InDet.InDetTrackSelectionTool
     TrackSelectionTool = InDet__InDetTrackSelectionTool("PFTrackSelectionTool")
 
     TrackSelectionTool.CutLevel = "TightPrimary"

Reconstruction/eflowRec/python/PFRun3Config.py

@@ -39,16 +39,8 @@ def PFCfg(inputFlags,**kwargs):
     result.merge(InputRenameCfg("xAOD::CaloClusterContainer","CaloCalTopoClusters",""))
     
     #Setup up general geometry
-    from AtlasGeoModel.GeoModelConfig import GeoModelCfg
-    result.merge(GeoModelCfg(inputFlags))
-
-    #Setup Pixel geometry including IBL and /Indet(/Onl)/Align folders
-    from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
-    result.merge(PixelGeometryCfg(inputFlags))
-
-    #Setup TRT geometry including /TRT/Align folders                                                                                      
-    from TRT_GeoModel.TRT_GeoModelConfig import TRT_GeometryCfg
-    result.merge(TRT_GeometryCfg(inputFlags))
+    from AtlasGeoModel.InDetGMConfig import InDetGeometryCfg
+    result.merge(InDetGeometryCfg(inputFlags))
 
     #Setup TRT conditions                                                                                                                                  
     TRTAlignCondAlg=CompFactory.TRTAlignCondAlg
@@ -71,9 +63,9 @@ def PFCfg(inputFlags,**kwargs):
     GeometryDBSvc=CompFactory.GeometryDBSvc
     result.addService(GeometryDBSvc("InDetGeometryDBSvc"))
     
-    from AthenaCommon import CfgGetter
-    result.getService("GeoModelSvc").DetectorTools += [ CfgGetter.getPrivateTool("PixelDetectorTool", checkType=True) ]
-    result.getService("GeoModelSvc").DetectorTools += [ CfgGetter.getPrivateTool("SCT_DetectorTool", checkType=True) ]
+    #from AthenaCommon import CfgGetter
+    #result.getService("GeoModelSvc").DetectorTools += [ CfgGetter.getPrivateTool("PixelDetectorTool", checkType=True) ]
+    #result.getService("GeoModelSvc").DetectorTools += [ CfgGetter.getPrivateTool("SCT_DetectorTool", checkType=True) ]
 
     #Setup TRT geometry
     TRT_DetectorTool=CompFactory.TRT_DetectorTool

Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py

@@ -6,6 +6,7 @@
 @author B. Laforge
 @brief Example python configuration for the Run III AthenaMonitoring package
 '''
+from AthenaConfiguration.ComponentFactory import CompFactory
 
 def BookHistogramPerRegion(groupe,name,particletype,title,path,xbins,xmin,xmax,nregions=3):
     '''
@@ -95,8 +96,7 @@ def MonitorElectronConfig(inputFlags):
     # helper. Then, the helper will instantiate an instance and set up the
     # base class configuration following the inputFlags. The returned object
     # is the algorithm.
-    from egammaPerformance.egammaPerformanceConf import MonitorElectronAlgorithm
-
+    MonitorElectronAlgorithm=CompFactory.MonitorElectronAlgorithm
     elLHTightMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elLHTightMonAlg')
     elLHTightTrigMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elLHTightTrigMonAlg')
 
@@ -250,8 +250,8 @@ def MonitorPhotonConfig(inputFlags):
     # helper. Then, the helper will instantiate an instance and set up the
     # base class configuration following the inputFlags. The returned object
     # is the algorithm.
-    from egammaPerformance.egammaPerformanceConf import MonitorPhotonAlgorithm
 
+    MonitorPhotonAlgorithm=CompFactory.MonitorPhotonAlgorithm
     phCBTightMonAlg = helper.addAlgorithm(MonitorPhotonAlgorithm,'phCBTightMonAlg')
     phCBTightTrigMonAlg = helper.addAlgorithm(MonitorPhotonAlgorithm,'phCBTightTrigMonAlg')