Merge branch 'PrivateToolFix/MuonCombinedTestTools' into 'master'

Private tool fix/muon combined test tools

See merge request !35660

Reconstruction/MuonIdentification/MuonCombinedTestTools/src/MuonTrackTagTestTool.h

@@ -7,51 +7,56 @@
 
 //#define MUONCOMBDEBUG
 
+#include <mutex>
+#include <string>
+
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
-#include <string>
-#include <mutex>
-#include "TrkExInterfaces/IExtrapolator.h"
+#include "MuonCombinedToolInterfaces/IMuonTrackTagTool.h"
 #include "TrkDetDescrInterfaces/ITrackingGeometrySvc.h"
+#include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkParameters/TrackParameters.h"
-#include "MuonCombinedToolInterfaces/IMuonTrackTagTool.h"
 
-namespace Trk{
-  class TrackingGeometry;
-  class TrackingVolume;
-}
+namespace Trk {
+class TrackingGeometry;
+class TrackingVolume;
+}  // namespace Trk
 
 namespace MuonCombined {
-  
-  class MuonTrackTagTestTool : public AthAlgTool, virtual public IMuonTrackTagTool {
-    
+
+class MuonTrackTagTestTool : public AthAlgTool, virtual public IMuonTrackTagTool {
+
   public:
-    
-    MuonTrackTagTestTool(const std::string& type,const std::string& name, const IInterface* parent);
+    MuonTrackTagTestTool(const std::string& type, const std::string& name, const IInterface* parent);
     ~MuonTrackTagTestTool() {}
-    
+
     StatusCode initialize();
     StatusCode finalize();
-    
-    double chi2(const Trk::TrackParameters& idParsAtEntry,const Trk::TrackParameters& msParsAtEntry) const;
+
+    double chi2(const Trk::TrackParameters& idParsAtEntry, const Trk::TrackParameters& msParsAtEntry) const;
     double chi2(const Trk::Track& id, const Trk::Track& ms) const;
 
   private:
+    ToolHandle<Trk::IExtrapolator> m_extrapolator{
+        this,
+        "ExtrapolatorTool",
+        "Trk::Extrapolator/AtlasExtrapolator",
+    };
+    mutable ServiceHandle<Trk::ITrackingGeometrySvc> m_trackingGeometrySvc
+        ATLAS_THREAD_SAFE;  // Services are assumed to be thread-safe
+    mutable const Trk::TrackingGeometry* m_trackingGeometry
+        ATLAS_THREAD_SAFE;  // Initialized with call_once, then used read-only
+    mutable const Trk::TrackingVolume* m_msEntrance
+                                              ATLAS_THREAD_SAFE;  // Initialized with call_once, then used read-only
+    mutable std::once_flag m_trackingOnceFlag ATLAS_THREAD_SAFE;
 
-    ToolHandle<Trk::IExtrapolator> m_extrapolator;
-    mutable ServiceHandle<Trk::ITrackingGeometrySvc> m_trackingGeometrySvc ATLAS_THREAD_SAFE; // Services are assumed to be thread-safe
-    mutable const Trk::TrackingGeometry*  m_trackingGeometry ATLAS_THREAD_SAFE; // Initialized with call_once, then used read-only
-    mutable const Trk::TrackingVolume*    m_msEntrance ATLAS_THREAD_SAFE; // Initialized with call_once, then used read-only
-    mutable std::once_flag                m_trackingOnceFlag ATLAS_THREAD_SAFE;
-    
     double m_chi2cut;
 #ifdef MUONCOMBDEBUG
     bool m_truth;
 #endif
-    
-  };
+};
 
-}
+}  // namespace MuonCombined
 
 
 #endif