Merge branch 'ExtrapolatorCfg' into 'master'

Add MuonGeoModelCfg to the tracking geometry svc

See merge request !38814

Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py

@@ -242,6 +242,9 @@ def TrackingGeometrySvcCfg( flags , name = 'AtlasTrackingGeometrySvc', doMateria
 
     if flags.Detector.GeometryMuon:
       # Copied from from MuonTrackingGeometry.ConfiguredMuonTrackingGeometry import MuonTrackingGeometryBuilder
+      # Add the muon geometry model to the CA
+      from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
+      result.merge(MuonGeoModelCfg(flags))
       Muon__MuonStationTypeBuilder=CompFactory.Muon.MuonStationTypeBuilder
       muonStationTypeBuilder= Muon__MuonStationTypeBuilder(name = 'MuonStationTypeBuilder')