TrackingGeometryCondAlg : Clean up more references to the AtlasTrackingGeometry

InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/ElectronEoverPTracking.py

@@ -65,9 +65,7 @@ import MagFieldServices.SetupField
 #
 
 #
-print (' == ElectronEoverPTracking.py == setting up geometry (new cond alg, rel22)')  
-geom_svc=None
-geom_cond_key=''
+print (' == ElectronEoverPTracking.py == setting up geometry')  
 cond_alg = TrackingCommon.createAndAddCondAlg(TrackingCommon.getTrackingGeometryCondAlg, "AtlasTrackingGeometryCondAlg", name="AtlasTrackingGeometryCondAlg")
 geom_cond_key = cond_alg.TrackingGeometryWriteKey
 
@@ -88,10 +86,8 @@ ToolSvc += ElectronTrkStepPropagator
 #
 from TrkExTools.TrkExToolsConf import Trk__Navigator
 ElectronTrkNavigator = Trk__Navigator(name = 'ElectronTrkNavigator',
-                                      TrackingGeometrySvc = geom_svc,
                                       TrackingGeometryKey = geom_cond_key
-                                      #TrackingGeometrySvc = AtlasTrackingGeometrySvc
-                                  )
+                                      )
 ToolSvc += ElectronTrkNavigator
 #
 # Setup the MaterialEffectsUpdator

Tracking/TrkFitter/TrkiPatFitter/TrkiPatFitter/MaterialAllocator.h

@@ -12,7 +12,7 @@
 #ifndef TRKIPATFITTER_MATERIALALLOCATOR_H
 #define TRKIPATFITTER_MATERIALALLOCATOR_H
 
-//<<<<<< INCLUDES                                                       >>>>>>
+//<<<<<< INCLUDES a>>>>>>
 
 #include <memory>
 #include <mutex>
@@ -32,7 +32,7 @@
 #include "TrkParameters/TrackParameters.h"
 #include "TrkiPatFitterUtils/IMaterialAllocator.h"
 
-//<<<<<< CLASS DECLARATIONS                                             >>>>>>
+//<<<<<< CLASS DECLARATIONS >>>>>>
 
 class MessageHelper;
 namespace Trk {
@@ -144,8 +144,7 @@ class MaterialAllocator : public AthAlgTool, virtual public IMaterialAllocator {
       this, "Intersector", "Trk::RungeKuttaIntersector/RungeKuttaIntersector",
       ""};
   ServiceHandle<ITrackingGeometrySvc> m_trackingGeometrySvc{
-      this, "TrackingGeometrySvc",
-      "TrackingGeometrySvc/AtlasTrackingGeometrySvc", ""};
+      this, "TrackingGeometrySvc","", ""};
   ServiceHandle<ITrackingVolumesSvc> m_trackingVolumesSvc{
       this, "TrackingVolumesSvc", "Trk::TrackingVolumesSvc/TrackingVolumesSvc",
       ""};
@@ -153,7 +152,7 @@ class MaterialAllocator : public AthAlgTool, virtual public IMaterialAllocator {
       this, "STEP_Propagator", "Trk::STEP_Propagator/AtlasSTEP_Propagator", ""};
 
   SG::ReadCondHandleKey<TrackingGeometry> m_trackingGeometryReadKey{
-      this, "TrackingGeometryReadKey", "",
+      this, "TrackingGeometryReadKey", "AtlasTrackingGeometry",
       "Key of the TrackingGeometry conditions data."};
 
   inline const Trk::TrackingVolume* getSpectrometerEntrance() const {