Merge branch 'clang.TrkVertexFitterUtils-20201208' into 'master'

TrkVertexFitterUtils+MuonCablingServers+TileTrackingGeometry: Fix clang warnings.

See merge request !38951

MuonSpectrometer/MuonCablings/MuonCablingServers/MuonCablingServers/RPCcablingServerSvc.h

@@ -32,13 +32,13 @@ class RPCcablingServerSvc : public AthService,
     RPCcablingServerSvc(const std::string& name, ISvcLocator* svc);
     virtual ~RPCcablingServerSvc() {}
   
-    virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF);
-    virtual StatusCode initialize(void);
-    virtual StatusCode finalize(void);
+    virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF) override;
+    virtual StatusCode initialize(void) override;
+    virtual StatusCode finalize(void) override;
 
     // Interface implementation
-    virtual StatusCode giveCabling(const IRPCcablingSvc*&) const;
-    virtual bool isAtlas(void) const;
+    virtual StatusCode giveCabling(const IRPCcablingSvc*&) const override;
+    virtual bool isAtlas(void) const override;
     // ITagInfoMgr callback
     virtual void tagInfoUpdated() override final { compareTags().ignore(); }
 

TileCalorimeter/TileTrackingGeometry/TileTrackingGeometry/TileVolumeBuilder.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -72,7 +72,6 @@ namespace Tile {
 
       const TileDetDescrManager*                        m_tileMgr;                        //!< Calo DetDescrMgr
       std::string                                       m_tileMgrLocation;                //!< Location of the CaloDetDescrMgr
-      const CaloDetDescrManager*                        m_calo_dd;
        
       ToolHandle<Trk::ITrackingVolumeHelper>            m_trackingVolumeHelper;           //!< Helper Tool to create TrackingVolumes
       ToolHandle<Trk::ITrackingVolumeCreator>           m_trackingVolumeCreator;          //!< Second helper for volume creation

TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx

@@ -62,7 +62,6 @@ Tile::TileVolumeBuilder::TileVolumeBuilder(const std::string& t, const std::stri
   AthAlgTool(t,n,p),
   m_tileMgr(0),
   m_tileMgrLocation("Tile"),
-  m_calo_dd(0),
   m_trackingVolumeHelper("Trk::TrackingVolumeHelper/TrackingVolumeHelper"),
   m_trackingVolumeCreator("Trk::CylinderVolumeCreator/TrackingVolumeCreator"),
   m_tileBarrelEnvelope(25.*mm),

Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h

@@ -77,23 +77,25 @@ namespace Trk
     *  Produces a new PerigeeLinearizedState and stores its pointer as a private  
     *  member of VxTrackAtVertex
     */
-    void linearize(VxTrackAtVertex & theTrack,const Amg::Vector3D & linPoint) const;
+    virtual void linearize(VxTrackAtVertex & theTrack,const Amg::Vector3D & linPoint) const override;
     
     /**
      * Linearization method:
      * Takes a MeasuredPerigee and a LinearizationPoint.
      * Creates a new PerigeeLinearizedTrackState and returns its pointer.
      */
+    virtual
     LinearizedTrack * linearizedTrack(const TrackParameters *param, 
-			              const Amg::Vector3D & linPoint) const;
+			              const Amg::Vector3D & linPoint) const override;
 
     /**
       * Linearization method:
       * Takes a MeasuredPerigee and a LinearizationPoint.
       * Creates a new PerigeeLinearizedTrackState and returns its pointer.
       */
+    virtual
     LinearizedTrack * linearizedTrack(const NeutralParameters *param,
-                                      const Amg::Vector3D & linPoint) const;
+                                      const Amg::Vector3D & linPoint) const override;
     
     
   private:

Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexTrackUpdator.h

@@ -56,7 +56,7 @@ namespace Trk
 /**
  * Update method  
  */ 
-   void  update(VxTrackAtVertex& trk, const xAOD::Vertex& vtx) const;
+   virtual void  update(VxTrackAtVertex& trk, const xAOD::Vertex& vtx) const override;
     
   private:
   

Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/KalmanVertexUpdator.h

@@ -51,29 +51,29 @@ namespace Trk
 /**
  * Method adding a single track to the vertex estimate
  */
-   xAOD::Vertex * add(xAOD::Vertex& vtx, VxTrackAtVertex& trk) const;
+   virtual xAOD::Vertex * add(xAOD::Vertex& vtx, VxTrackAtVertex& trk) const override;
 
 /**
  * Method removing already added track from the vertex estimate
  */
-   xAOD::Vertex * remove(xAOD::Vertex& vtx,  VxTrackAtVertex& trk) const;
+   virtual xAOD::Vertex * remove(xAOD::Vertex& vtx,  VxTrackAtVertex& trk) const override;
 
 /**
  * Position update method. The 'mode' parameter is used to indicate whether we want to add or remove a track. 
  */
-  IVertexUpdator::positionUpdateOutcome positionUpdate (const xAOD::Vertex& vtx, const LinearizedTrack * trk, double trackWeight, IVertexUpdator::updateMode mode) const;
+  virtual IVertexUpdator::positionUpdateOutcome positionUpdate (const xAOD::Vertex& vtx, const LinearizedTrack * trk, double trackWeight, IVertexUpdator::updateMode mode) const override;
 
 /**
  * Method calculating the interstep Chi2 increment
  */ 
-  float trackParametersChi2(const xAOD::Vertex& new_vtx, const LinearizedTrack * trk) const;
-  float trackParametersChi2(const IVertexUpdator::positionUpdateOutcome& new_vtx, const LinearizedTrack * trk) const;
+  virtual float trackParametersChi2(const xAOD::Vertex& new_vtx, const LinearizedTrack * trk) const override;
+  virtual float trackParametersChi2(const IVertexUpdator::positionUpdateOutcome& new_vtx, const LinearizedTrack * trk) const override;
 
 /** 
  * Method calculating the vertex displacement-related part of the chi2   
  */
-  float vertexPositionChi2(const xAOD::Vertex& old_vtx, const xAOD::Vertex& new_vtx) const;
-  float vertexPositionChi2(const xAOD::Vertex& old_vtx, const IVertexUpdator::positionUpdateOutcome& new_vtx) const;
+  virtual float vertexPositionChi2(const xAOD::Vertex& old_vtx, const xAOD::Vertex& new_vtx) const override;
+  virtual float vertexPositionChi2(const xAOD::Vertex& old_vtx, const IVertexUpdator::positionUpdateOutcome& new_vtx) const override;
 
   private:
 

Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/TrackToVertexIPEstimator.h

@@ -92,41 +92,47 @@ namespace Trk
  * Estimate methods returning a d0 and its calculated sigma.
  * All  methods do check whether a track is actually fitted to a vertex
  */  
-   const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const;
-   const  ImpactParametersAndSigma * estimate(const TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const;
+   virtual const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx, bool doRemoval) const override;
+   virtual const  ImpactParametersAndSigma * estimate(const TrackParameters * track, const xAOD::Vertex * vtx, bool doRemoval) const override;
 
-   const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track,const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const;
-   const  ImpactParametersAndSigma * estimate(const TrackParameters * track, const TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const;
+   virtual const  ImpactParametersAndSigma * estimate(const xAOD::TrackParticle * track,const xAOD::TrackParticle * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const override;
+   virtual const  ImpactParametersAndSigma * estimate(const TrackParameters * track, const TrackParameters * newtrack, const xAOD::Vertex * vtx, bool doRemoval) const override;
 
-   virtual const xAOD::Vertex *   getUnbiasedVertex(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx ) const ;
-   virtual const xAOD::Vertex *   getUnbiasedVertex(const TrackParameters * track, const xAOD::Vertex * vtx ) const ;
+   virtual const xAOD::Vertex *   getUnbiasedVertex(const xAOD::TrackParticle * track, const xAOD::Vertex * vtx ) const override;
+   virtual const xAOD::Vertex *   getUnbiasedVertex(const TrackParameters * track, const xAOD::Vertex * vtx ) const override;
   
 
-   virtual const ImpactParametersAndSigma  * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex* vtx)const;
-   virtual const ImpactParametersAndSigma  * estimate(const TrackParameters * track, const xAOD::Vertex* vtx)const;
+   virtual const ImpactParametersAndSigma  * estimate(const xAOD::TrackParticle * track, const xAOD::Vertex* vtx)const override;
+   virtual const ImpactParametersAndSigma  * estimate(const TrackParameters * track, const xAOD::Vertex* vtx)const override;
    
 
    /* Methods which provide the lifetime Sign for the Impact Parameter (2D, Z, 3D)  */
+   virtual
    double get3DLifetimeSignOfTrack(const TrackParameters & track,
                                    const Amg::Vector3D & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const;
+                                   const xAOD::Vertex & primaryVertex) const override;
+   virtual
    double get3DLifetimeSignOfTrack(const TrackParameters & track,
                                    const CLHEP::Hep3Vector & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const;
+                                   const xAOD::Vertex & primaryVertex) const override;
 
+   virtual
    double get2DLifetimeSignOfTrack(const TrackParameters & track,
                                    const Amg::Vector3D & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const;
+                                   const xAOD::Vertex & primaryVertex) const override;
+   virtual
    double get2DLifetimeSignOfTrack(const TrackParameters & track,
                                    const CLHEP::Hep3Vector & jetDirection,
-                                   const xAOD::Vertex & primaryVertex) const;
+                                   const xAOD::Vertex & primaryVertex) const override;
 
+   virtual
    double getZLifetimeSignOfTrack(const TrackParameters & track,
                                   const Amg::Vector3D & jetDirection,
-                                  const xAOD::Vertex & primaryVertex) const;
+                                  const xAOD::Vertex & primaryVertex) const override;
+   virtual
    double getZLifetimeSignOfTrack(const TrackParameters & track,
                                   const CLHEP::Hep3Vector & jetDirection,
-                                  const xAOD::Vertex & primaryVertex) const;
+                                  const xAOD::Vertex & primaryVertex) const override;
 
 
 

Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.h

@@ -58,7 +58,7 @@ namespace Trk
    /**
     * method that makes the parameters of a V0 or photon before decay to two tracks
     */
-    NeutralPerigee* createNeutralTrackFromVertex(const xAOD::Vertex& ) const;
+    virtual NeutralPerigee* createNeutralTrackFromVertex(const xAOD::Vertex& ) const override;
 
   private: