diff --git a/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py b/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
index 9c854445096763bcec5177899b96a83ecd7b0c7c..ecc1ad066dd116f1468cbeaebf18daea1e6ba82f 100644
--- a/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
+++ b/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
@@ -13,7 +13,7 @@ def DumpEventDataToJSONAlgCfg(configFlags, doExtrap=False, **kwargs):
gmsAcc=GeoModelCfg( configFlags )
result.merge(gmsAcc)
- from TrkExEngine.AtlasExtrapolationEngineConfig import AtlasExtrapolationEngineCfg
+ from TrkConfig.AtlasExtrapolationEngineConfig import AtlasExtrapolationEngineCfg
extrapAcc = AtlasExtrapolationEngineCfg(configFlags)
extrapolationEngine = extrapAcc.getPrimary()
result.merge(extrapAcc)
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelMonitoringConfig.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelMonitoringConfig.py
index ab5f95f1798ba732d5113bfe93817a2dce2c018e..b0f6b099019f36fb04609af9c08b1585fc35c1f1 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelMonitoringConfig.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelMonitoringConfig.py
@@ -67,9 +67,9 @@ def PixelMonitoringConfig(flags):
# Taken from InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
InDetPixelConditionsSummaryTool = acc.popToolsAndMerge(PixelConditionsSummaryCfg(flags))
- # Taken from Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
+ # Taken from Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
# AtlasExtrapolatorConfig can give only private extrapolator. We need public extrapolator.
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
trackGeomCfg = TrackingGeometrySvcCfg(flags)
geom_svc = trackGeomCfg.getPrimary()
geom_svc.GeometryBuilder.Compactify = False ######## To avoid crash ########
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py
index 44d6000e4b135eeda142b354b735373f7f2c7f8b..fe7a3e296fe26de5c0d2809175aa40db884aa7f6 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTLorentzMonAlg.py
@@ -49,9 +49,9 @@ def SCTLorentzMonAlgConfig(inputFlags):
from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
InDetPixelConditionsSummaryTool = result.popToolsAndMerge(PixelConditionsSummaryCfg(inputFlags))
- # Taken from Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
+ # Taken from Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
# AtlasExtrapolatorConfig can give only private extrapolator. We need public extrapolator.
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
trackGeomCfg = TrackingGeometrySvcCfg(inputFlags)
geom_svc = trackGeomCfg.getPrimary()
geom_svc.GeometryBuilder.Compactify = False ######## To avoid crash ########
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTTracksMonAlg.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTTracksMonAlg.py
index 73d1c49c16edd48c7cd5234b5fbf0ba1bf79c355..74ff779515d060fd8be55dd467d186ce5f7a9aee 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTTracksMonAlg.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTTracksMonAlg.py
@@ -47,9 +47,9 @@ def SCTTracksMonAlgConfig(inputFlags):
from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
InDetPixelConditionsSummaryTool = result.popToolsAndMerge(PixelConditionsSummaryCfg(inputFlags))
- # Taken from Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
+ # Taken from Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
# AtlasExtrapolatorConfig can give only private extrapolator. We need public extrapolator.
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
trackGeomCfg = TrackingGeometrySvcCfg(inputFlags)
geom_svc = trackGeomCfg.getPrimary()
geom_svc.GeometryBuilder.Compactify = False ######## To avoid crash ########
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
index ee683864e97aabc0ceb9e6cec30e8ee339639f55..e2c798345a389b60c6fe8be574a4cab2dbb5b5c7 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
@@ -6,7 +6,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
# Tracking
-from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
def MuonTrackToSegmentToolCfg(flags,name="MuonTrackToSegmentTool", **kwargs):
Muon__MuonTrackToSegmentTool=CompFactory.Muon__MuonTrackToSegmentTool
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index dd80a139214250b13614b198a7ff35dfe3b39752..5160e68e176d51cf848a4405b8a8f2bc3635bc43 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -198,7 +198,7 @@ def MuonSegmentMatchingToolCfg(flags, name="MuonSegmentMatchingTool", **kwargs):
def MooCandidateMatchingToolCfg(flags, name="MooCandidateMatchingTool", doSegmentPhiMatching=True, **kwargs):
Muon__MooCandidateMatchingTool=CompFactory.Muon__MooCandidateMatchingTool
- from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+ from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
from MuonConfig.MuonRecToolsConfig import MuonExtrapolatorCfg
result = ComponentAccumulator()
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
index ea8b44f1a53aa8a34532f4506e91e6b48b95a560..956c7f499653623af6ec5001d39f1eda9c54a57b 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
@@ -128,7 +128,7 @@ def BTagCfg(inputFlags,**kwargs):
release = kwargs.get('Release', None)
if release: del kwargs['Release']
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
acc = TrackingGeometrySvcCfg(inputFlags)
result.merge(acc)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py
index 0eb8730a127e8caa6fd672d67352a05a6c6b6f5e..2cd65c1654d0637493dc338cc259285fb1e65576 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py
@@ -3,7 +3,7 @@
from JetTagTools.BTagFullLinearizedTrackFactoryConfig import BTagFullLinearizedTrackFactoryCfg
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
# importi the FullLinearizedTrackFactory configurable
InDet__InDetJetFitterUtils=CompFactory.InDet__InDetJetFitterUtils
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/NewJetFitterVxFinderConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/NewJetFitterVxFinderConfig.py
index e6fe80e0a87581a199145a7d4fc73a7007c7c40c..bb168bd405a9701da1fb58dd77bd06d50f085e31 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/NewJetFitterVxFinderConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/NewJetFitterVxFinderConfig.py
@@ -7,7 +7,7 @@ from BTagging.InDetJetFitterUtilsConfig import InDetJetFitterUtilsCfg
from BTagging.JetFitterSequentialVertexFitterConfig import JetFitterSequentialVertexFitterCfg
from BTagging.VxInternalEdmFactoryConfig import VxInternalEdmFactoryCfg
from BTagging.ImprovedJetFitterRoutinesConfig import ImprovedJetFitterRoutinesCfg
-from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
from BTagging.JetFitterMode3dTo1dFinderConfig import JetFitterMode3dTo1dFinderCfg
from BTagging.InDetImprovedJetFitterTrackSelectorToolConfig import InDetImprovedJetFitterTrackSelectorToolCfg
from BTagging.ImprovedJetFitterInitializationHelperConfig import ImprovedJetFitterInitializationHelperCfg
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagFullLinearizedTrackFactoryConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagFullLinearizedTrackFactoryConfig.py
index eb3466d57015a955496aacbfffa67e79916bb0f1..7ab2e655e401f38657b255c4fc259ef2097effa8 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagFullLinearizedTrackFactoryConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagFullLinearizedTrackFactoryConfig.py
@@ -2,7 +2,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
# import the FullLinearizedTrackFactory configurable
Trk__FullLinearizedTrackFactory=CompFactory.Trk__FullLinearizedTrackFactory
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexIPEstimatorConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexIPEstimatorConfig.py
index c4c92a291633d63d3e695de3083552b7493cf101..5d026699729e84b10bf266304c6dfcab25dbac1c 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexIPEstimatorConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexIPEstimatorConfig.py
@@ -3,7 +3,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from JetTagTools.BTagFullLinearizedTrackFactoryConfig import BTagFullLinearizedTrackFactoryCfg
-from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
# import the TrackToVertexIPEstimator configurable
Trk__TrackToVertexIPEstimator=CompFactory.Trk__TrackToVertexIPEstimator
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py
index dfed4a562d3440143dba68d871afd225876a7a85..2a06e24a2bfe147aa79736b78a696d6ca1913ccb 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py
@@ -2,7 +2,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
# import the TrackToVertexIPEstimator configurable
Reco__TrackToVertex=CompFactory.Reco__TrackToVertex
diff --git a/Reconstruction/RecoTools/TrackToCalo/python/TrackToCaloConfig.py b/Reconstruction/RecoTools/TrackToCalo/python/TrackToCaloConfig.py
index dc5ad8479fd6571f0cf24b5300dc17dcb17c431f..1455771affe52bafb717d9a26cc2de30592cbf7b 100644
--- a/Reconstruction/RecoTools/TrackToCalo/python/TrackToCaloConfig.py
+++ b/Reconstruction/RecoTools/TrackToCalo/python/TrackToCaloConfig.py
@@ -6,7 +6,7 @@ __doc__ = "Tool configuration for the track to calo tools."
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
Trk__ParticleCaloExtensionTool, Rec__ParticleCaloCellAssociationTool=CompFactory.getComps("Trk__ParticleCaloExtensionTool","Rec__ParticleCaloCellAssociationTool",)
def ParticleCaloExtensionToolCfg(flags, **kwargs):
diff --git a/Reconstruction/eflowRec/python/PFHLTConfig.py b/Reconstruction/eflowRec/python/PFHLTConfig.py
index b268c0eda6456f6790f861c79563251087780723..5418811360ade7130071b88efbf5d8cc4d7c42dc 100644
--- a/Reconstruction/eflowRec/python/PFHLTConfig.py
+++ b/Reconstruction/eflowRec/python/PFHLTConfig.py
@@ -15,7 +15,7 @@ def TrackingGeoCfg(inputFlags):
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
result.merge(MuonGeoModelCfg(inputFlags))
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
acc, geom_svc = TrackingGeometrySvcCfg(inputFlags)
result.merge(acc)
@@ -44,7 +44,7 @@ def CaloGeoAndNoiseCfg(inputFlags):
# PFlow track selection
def getPFTrackSelector(inputFlags,tracksin,verticesin):
- from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+ from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
extrapcfg = AtlasExtrapolatorCfg(inputFlags)
extrapolator = extrapcfg.popPrivateTools()
diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py
index 10a7534fef69050787b0feed596177c232a8a28d..0ef741f4836879c5410d473157856615beda52b3 100644
--- a/Reconstruction/eflowRec/python/PFRun3Config.py
+++ b/Reconstruction/eflowRec/python/PFRun3Config.py
@@ -6,7 +6,7 @@ def getPFTrackSelectorAlgorithm(inputFlags):
PFTrackSelector=CompFactory.PFTrackSelector
PFTrackSelector=PFTrackSelector("PFTrackSelector")
- from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+ from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
Trk__ParticleCaloExtensionTool=CompFactory.Trk__ParticleCaloExtensionTool
extrapCfg = AtlasExtrapolatorCfg(inputFlags)
pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = extrapCfg.popPrivateTools())
@@ -202,7 +202,7 @@ def PFCfg(inputFlags,**kwargs):
result.getService("GeoModelSvc").DetectorTools += [ InDetServMatTool() ]
#Setup up tracking geometry
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
acc = TrackingGeometrySvcCfg(inputFlags)
result.merge(acc)
diff --git a/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py b/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
index 15b04b408f39c54c216a1e0949f8cb401739f551..ecd2d788313fcbf3352662e32b4be86b2c531097 100644
--- a/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
+++ b/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
@@ -5,7 +5,7 @@ __doc__ = "Tool configuration to instantiate all egammaCaloTools with default co
from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
from TrackToCalo.TrackToCaloConfig import ParticleCaloExtensionToolCfg
EMExtrapolationTools=CompFactory.EMExtrapolationTools
diff --git a/Tracking/TrkConfig/CMakeLists.txt b/Tracking/TrkConfig/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4aeff8adbbfc28240c7e771964b7c208e87fbbc8
--- /dev/null
+++ b/Tracking/TrkConfig/CMakeLists.txt
@@ -0,0 +1,18 @@
+################################################################################
+# Package: TrkConfig
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrkConfig )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py)
+atlas_install_joboptions( share/*.py )
+atlas_install_data( share/*.ref )
+
+
+atlas_add_test( TrackCollectionReadConfig_test
+ SCRIPT python -m TrkConfig.TrackCollectionReadConfig
+ EXTRA_PATTERNS "-s ComponentAccumulator|^---" )
+
+atlas_add_test( AtlasTrackingGeometrySvcCfgTest SCRIPT python -m TrkConfig.AtlasTrackingGeometrySvcConfig POST_EXEC_SCRIPT nopost.sh )
diff --git a/Tracking/TrkExtrapolation/TrkExEngine/python/AtlasExtrapolationEngineConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolationEngineConfig.py
similarity index 97%
rename from Tracking/TrkExtrapolation/TrkExEngine/python/AtlasExtrapolationEngineConfig.py
rename to Tracking/TrkConfig/python/AtlasExtrapolationEngineConfig.py
index 924ea53ccb178b7d568ce8d2d847c9b917ff3970..c0e41a6f992791a387d326420f1ed3ba367c63ed 100644
--- a/Tracking/TrkExtrapolation/TrkExEngine/python/AtlasExtrapolationEngineConfig.py
+++ b/Tracking/TrkConfig/python/AtlasExtrapolationEngineConfig.py
@@ -18,7 +18,7 @@ def AtlasExtrapolationEngineCfg( flags, name = 'Extrapolation', nameprefix='Atla
result.merge(acc)
# get the correct TrackingGeometry setup
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
acc = TrackingGeometrySvcCfg(flags)
trackingGeomSvc = acc.getPrimary()
result.merge(acc)
diff --git a/Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
similarity index 98%
rename from Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
rename to Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
index c5f4386fbea4e55e510a3ed4624390c8b5f8167d..6f48ebae1d2e76bc9383342fb52a464b52eecb36 100644
--- a/Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
+++ b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
@@ -18,7 +18,7 @@ def AtlasExtrapolatorCfg( flags, name = 'AtlasExtrapolator' ):
result.merge(acc)
# get the correct TrackingGeometry setup
- from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
acc = TrackingGeometrySvcCfg(flags)
geom_svc = acc.getPrimary()
result.merge(acc)
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvcConfig.py b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
similarity index 100%
rename from Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvcConfig.py
rename to Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/python/TrackCollectionReadConfig.py b/Tracking/TrkConfig/python/TrackCollectionReadConfig.py
similarity index 100%
rename from Tracking/TrkEventCnv/TrkEventAthenaPool/python/TrackCollectionReadConfig.py
rename to Tracking/TrkConfig/python/TrackCollectionReadConfig.py
diff --git a/Tracking/TrkConfig/python/__init__.py b/Tracking/TrkConfig/python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrackCollectionReadConfig_test.ref b/Tracking/TrkConfig/share/TrackCollectionReadConfig_test.ref
similarity index 100%
rename from Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrackCollectionReadConfig_test.ref
rename to Tracking/TrkConfig/share/TrackCollectionReadConfig_test.ref
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt
index 537450ba474dccc0f57dbdbc40939aa9ba86a039..ccef88c661d0162d7c874769f6a61f31176097cb 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt
@@ -36,6 +36,3 @@ atlas_add_component( TrkDetDescrSvc
# Install files from the package:
atlas_install_python_modules( python/*.py )
-
-atlas_add_test( AtlasTrackingGeometrySvcCfgTest SCRIPT python -m TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig POST_EXEC_SCRIPT nopost.sh )
-
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
index 0bf9ccc5758fc489451d32d22bb9f5b3f1f6dc23..5d3530aac6594f7124b48465576cab784df2094f 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
@@ -69,7 +69,3 @@ else()
message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
endif()
-atlas_add_test( TrackCollectionReadConfig_test
- SCRIPT python -m TrkEventAthenaPool.TrackCollectionReadConfig
- EXTRA_PATTERNS "-s ComponentAccumulator|^---" )
-