diff --git a/.static_analysis_limits.yml b/.static_analysis_limits.yml
index 804400d1b6856529613b43d32d0c7300bc7655eb..c170d4724e7060eb65e8337700aea8787c77e5be 100644
--- a/.static_analysis_limits.yml
+++ b/.static_analysis_limits.yml
@@ -1,6 +1,7 @@
limits:
"modernize-use-using": 0
"readability-braces-around-statements": 0
+ "modernize-use-override": 0
ignore:
- cppcoreguidelines-pro-type-vararg
diff --git a/Core/include/Acts/Detector/TrackingVolume.hpp b/Core/include/Acts/Detector/TrackingVolume.hpp
index da0be42a40e8e79acd1be2bceb6227a4c4d5fbd2..a0298689fe4403271970b071240950bbbd0c4c3e 100644
--- a/Core/include/Acts/Detector/TrackingVolume.hpp
+++ b/Core/include/Acts/Detector/TrackingVolume.hpp
@@ -80,7 +80,7 @@ class TrackingVolume : public Volume
public:
/// Destructor
- ~TrackingVolume();
+ ~TrackingVolume() override;
/// Factory constructor for a conatiner TrackingVolume
/// - by definition a Vacuum volume
diff --git a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
index 1f92530dcb07aec9451d6b1777cdbdb0546cf4c9..2c603db81292299b6357ad1e7b8f12781bf89138 100644
--- a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
@@ -169,7 +169,7 @@ public:
/// @brief desctructor - charged/neutral
/// checks if the surface is free and in such a case deletes it
- virtual ~SingleBoundTrackParameters()
+ ~SingleBoundTrackParameters() override
{
if (m_pSurface && m_pSurface->isFree()) {
delete m_pSurface;
@@ -218,7 +218,7 @@ public:
/// @brief clone - charged/netural
/// virtual constructor for type creation without casting
- virtual SingleBoundTrackParameters<ChargePolicy>*
+ SingleBoundTrackParameters<ChargePolicy>*
clone() const override
{
return new SingleBoundTrackParameters<ChargePolicy>(*this);
@@ -235,8 +235,8 @@ public:
}
/// @brief access method to the reference surface
- virtual const Surface&
- referenceSurface() const final override
+ const Surface&
+ referenceSurface() const final
{
return *m_pSurface;
}
@@ -249,8 +249,8 @@ public:
/// surface frame, for measurements with respect to a line this has to be
/// constructed by the point of clostest approach to the line, for
/// cylindrical surfaces this is (by convention) the tangential plane.
- virtual RotationMatrix3D
- referenceFrame() const final override
+ RotationMatrix3D
+ referenceFrame() const final
{
return std::move(
m_pSurface->referenceFrame(this->position(), this->momentum()));
diff --git a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
index 3480eecd14d91ce339b400aa85ae71b156d49489..28d724a52ca0c14cd44dab7402b7cf1b214097de 100644
--- a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
@@ -96,7 +96,7 @@ public:
}
/// @brief desctructor
- virtual ~SingleCurvilinearTrackParameters() = default;
+ ~SingleCurvilinearTrackParameters() override = default;
/// @brief copy assignment operator - charged/netural
/// virtual constructor for type creation without casting
@@ -126,7 +126,7 @@ public:
/// @brief clone - charged/netural
/// virtual constructor for type creation without casting
- virtual SingleTrackParameters<ChargePolicy>*
+ SingleTrackParameters<ChargePolicy>*
clone() const override
{
return new SingleCurvilinearTrackParameters<ChargePolicy>(*this);
@@ -180,8 +180,8 @@ public:
}
/// @brief access to the reference surface
- virtual const Surface&
- referenceSurface() const final override
+ const Surface&
+ referenceSurface() const final
{
return m_upSurface;
}
@@ -192,8 +192,8 @@ public:
///
/// For a curvilinear track parameterisation this is identical to the
/// rotation matrix of the intrinsic planar surface.
- virtual RotationMatrix3D
- referenceFrame() const final override
+ RotationMatrix3D
+ referenceFrame() const final
{
return m_upSurface.transform().linear();
}
diff --git a/Core/include/Acts/EventData/SingleTrackParameters.hpp b/Core/include/Acts/EventData/SingleTrackParameters.hpp
index ab54ce7a0b87df486ab51bf0570b8d91ff6f6967..378e543dba32f82c1d2f41954aa93030d4821ecf 100644
--- a/Core/include/Acts/EventData/SingleTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleTrackParameters.hpp
@@ -52,21 +52,21 @@ public:
using CovPtr_t = std::unique_ptr<const CovMatrix_t>;
/// @brief default virtual destructor
- virtual ~SingleTrackParameters() = default;
+ ~SingleTrackParameters() override = default;
/// @brief virtual constructor
- virtual SingleTrackParameters<ChargePolicy>*
+ SingleTrackParameters<ChargePolicy>*
clone() const override = 0;
/// @copydoc TrackParametersBase::position
- virtual ActsVectorD<3>
+ ActsVectorD<3>
position() const final
{
return m_vPosition;
}
/// @copydoc TrackParametersBase::momentum
- virtual ActsVectorD<3>
+ ActsVectorD<3>
momentum() const final
{
return m_vMomentum;
@@ -76,7 +76,7 @@ public:
///
/// @return @c true of both objects have the same charge policy, parameter
/// values, position and momentum, otherwise @c false
- virtual bool
+ bool
operator==(const TrackParametersBase& rhs) const override
{
auto casted = dynamic_cast<decltype(this)>(&rhs);
@@ -91,14 +91,14 @@ public:
}
/// @copydoc TrackParametersBase::charge
- virtual double
+ double
charge() const final
{
return m_oChargePolicy.getCharge();
}
/// @copydoc TrackParametersBase::getParameterSet
- virtual const FullParameterSet&
+ const FullParameterSet&
getParameterSet() const final
{
return m_oParameters;
diff --git a/Core/include/Acts/Layers/ConeLayer.hpp b/Core/include/Acts/Layers/ConeLayer.hpp
index 5934328de68a37e5fdaa3713a54d4091aa92673b..8a1a8ac905a6e64c934320d241c8c2558bb59b87 100644
--- a/Core/include/Acts/Layers/ConeLayer.hpp
+++ b/Core/include/Acts/Layers/ConeLayer.hpp
@@ -69,7 +69,7 @@ public:
= delete;
/// Destructor
- virtual ~ConeLayer() {}
+ ~ConeLayer() override {}
/// Transforms the layer into a Surface representation for extrapolation
const ConeSurface&
diff --git a/Core/include/Acts/Layers/CylinderLayer.hpp b/Core/include/Acts/Layers/CylinderLayer.hpp
index e388d524e82e5030c9d76bc92c6e405643224d37..3415b23ea8caaeb2c76e85f86c7d425d46b288f0 100644
--- a/Core/include/Acts/Layers/CylinderLayer.hpp
+++ b/Core/include/Acts/Layers/CylinderLayer.hpp
@@ -83,7 +83,7 @@ public:
CylinderLayer() = delete;
/// Destructor
- virtual ~CylinderLayer() {}
+ ~CylinderLayer() override {}
/// Transforms the layer into a Surface representation
/// This is for positioning and extrapolation
diff --git a/Core/include/Acts/Layers/DiscLayer.hpp b/Core/include/Acts/Layers/DiscLayer.hpp
index 1d38681dc96e25ff4577a17387d8484bdae32072..77048b2b0ce99412ac916d343ba0776147af207e 100644
--- a/Core/include/Acts/Layers/DiscLayer.hpp
+++ b/Core/include/Acts/Layers/DiscLayer.hpp
@@ -79,7 +79,7 @@ public:
= delete;
/// Destructor
- virtual ~DiscLayer() {}
+ ~DiscLayer() override {}
/// Transforms the layer into a Surface representation for extrapolation
/// @return This method returns a surface reference
diff --git a/Core/include/Acts/Layers/GenericApproachDescriptor.hpp b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
index ac4b6c3ef5924a37ac3d41a3dc67d0979a518925..519a678288c27334bbc2e15664c2175848cc6592 100644
--- a/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
+++ b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
@@ -58,7 +58,7 @@ public:
}
/// A generic approach descriptor with n surfaces to test
- ~GenericApproachDescriptor() {}
+ ~GenericApproachDescriptor() override {}
/// register the Layer to the surfaces
///
/// @param lay is the layer to be registerd
diff --git a/Core/include/Acts/Layers/NavigationLayer.hpp b/Core/include/Acts/Layers/NavigationLayer.hpp
index 34d13e7786f53e35aae72c29b5041aa7bb2a5ddf..9214a4f580eeb6ba9962f89e191ab753bbc05220 100644
--- a/Core/include/Acts/Layers/NavigationLayer.hpp
+++ b/Core/include/Acts/Layers/NavigationLayer.hpp
@@ -48,13 +48,13 @@ public:
create(const variant_data& data);
/// Destructor
- virtual ~NavigationLayer();
+ ~NavigationLayer() override;
/// The binning position method
/// - as default the center is given, but may be overloaded
/// @return The return vector can be used for binning in a TrackingVolume
- virtual const Vector3D
- binningPosition(BinningValue bValue) const final override;
+ const Vector3D
+ binningPosition(BinningValue bValue) const final;
/// Default Constructor - deleted
NavigationLayer() = delete;
@@ -70,11 +70,11 @@ public:
/// Transforms the layer into a Surface representation for extrapolation
/// In general, extrapolation to a surface should be avoided
const Surface&
- surfaceRepresentation() const final override;
+ surfaceRepresentation() const final;
// Non-const version
Surface&
- surfaceRepresentation() final override;
+ surfaceRepresentation() final;
/// Geometric isOnLayer() method
/// using isOnSurface() with Layer specific tolerance
@@ -85,7 +85,7 @@ public:
/// @return boolean that indicates if the position is on surface
bool
isOnLayer(const Vector3D& gpos,
- const BoundaryCheck& bcheck = true) const final override;
+ const BoundaryCheck& bcheck = true) const final;
/// Accept layer according to the following colelction directives
///
@@ -97,7 +97,7 @@ public:
///
/// @return a boolean whether the layer is accepted for processing
bool
- resolve(bool, bool, bool) const final override;
+ resolve(bool, bool, bool) const final;
/// Produce a @c variant_data representation of this object
/// @return The representation
diff --git a/Core/include/Acts/Layers/PlaneLayer.hpp b/Core/include/Acts/Layers/PlaneLayer.hpp
index 29cdff078e9cac9c9b6d5cdd2c7dea7260877eee..cc68fcbdd8868cf162e769f496cc2f439137fbb5 100644
--- a/Core/include/Acts/Layers/PlaneLayer.hpp
+++ b/Core/include/Acts/Layers/PlaneLayer.hpp
@@ -65,7 +65,7 @@ public:
= delete;
/// Destructor
- virtual ~PlaneLayer() {}
+ ~PlaneLayer() override {}
/// Transforms the layer into a Surface representation for extrapolation
/// @return returns a reference to a PlaneSurface
diff --git a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
index e01588321118ff19d47ee35871e20820ea44eed3..08d715dd9933d45e9f7e13381b6f1ee1b8997868 100644
--- a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
@@ -70,11 +70,11 @@ public:
BinnedSurfaceMaterial(const BinnedSurfaceMaterial& bsm);
/// Destructor
- virtual ~BinnedSurfaceMaterial();
+ ~BinnedSurfaceMaterial() override;
/// Pseudo-Constructor clone()
BinnedSurfaceMaterial*
- clone() const final override;
+ clone() const final;
/// Assignment operator
BinnedSurfaceMaterial&
@@ -84,7 +84,7 @@ public:
///
/// @param scale is the scale factor for the full material
BinnedSurfaceMaterial&
- operator*=(double scale) final override;
+ operator*=(double scale) final;
/// Return the BinUtility
const BinUtility&
@@ -96,15 +96,15 @@ public:
/// @copydoc SurfaceMaterial::material(const Vector2D&)
const MaterialProperties*
- material(const Vector2D& lp) const final override;
+ material(const Vector2D& lp) const final;
/// @copydoc SurfaceMaterial::material(const Vector3D&)
const MaterialProperties*
- material(const Vector3D& gp) const final override;
+ material(const Vector3D& gp) const final;
/// @copydoc SurfaceMaterial::material(size_t, size_t)
const MaterialProperties*
- material(size_t bin0, size_t bin1) const final override;
+ material(size_t bin0, size_t bin1) const final;
/// access to the entries
/// this is needed for averageing mapps
@@ -113,7 +113,7 @@ public:
/// Output Method for std::ostream, to be overloaded by child classes
std::ostream&
- dump(std::ostream& sl) const final override;
+ dump(std::ostream& sl) const final;
private:
/// The helper for the bin finding
diff --git a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
index a867c9b291ac5eed17b3d460d2d60fae1656767f..ef3c0a9f1144591d01fc066a98d7dc26801ac7bc 100644
--- a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
@@ -42,11 +42,11 @@ public:
HomogeneousSurfaceMaterial(const HomogeneousSurfaceMaterial& hsm);
/// Destructor
- virtual ~HomogeneousSurfaceMaterial();
+ ~HomogeneousSurfaceMaterial() override;
/// Pseudo-Constructor clone(
HomogeneousSurfaceMaterial*
- clone() const final override;
+ clone() const final;
/// Assignment operator
HomogeneousSurfaceMaterial&
@@ -57,29 +57,29 @@ public:
///
/// @param scale is the scale factor
HomogeneousSurfaceMaterial&
- operator*=(double scale) final override;
+ operator*=(double scale) final;
/// @copydoc SurfaceMaterial::material(const Vector2D&)
///
/// @note the input parameter is ignored
- virtual const MaterialProperties*
- material(const Vector2D& lp) const final override;
+ const MaterialProperties*
+ material(const Vector2D& lp) const final;
/// @copydoc SurfaceMaterial::material(const Vector3D&)
///
/// @note the input parameter is ignored
- virtual const MaterialProperties*
- material(const Vector3D& gp) const final override;
+ const MaterialProperties*
+ material(const Vector3D& gp) const final;
/// @copydoc SurfaceMaterial::material(size_t, size_t)
///
/// @note the input parameter is ignored
- virtual const MaterialProperties*
- material(size_t ib0, size_t ib1) const final override;
+ const MaterialProperties*
+ material(size_t ib0, size_t ib1) const final;
/// Output Method for std::ostream
std::ostream&
- dump(std::ostream& sl) const final override;
+ dump(std::ostream& sl) const final;
private:
/// The five different MaterialProperties
diff --git a/Core/include/Acts/Material/SurfaceMaterialProxy.hpp b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
index 17a0bdb44952bf3bfb49bb06b72d7410dc4c867f..6461da4453cdf23813ee0af17097fb9c451833fb 100644
--- a/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
@@ -41,16 +41,16 @@ public:
SurfaceMaterialProxy(const SurfaceMaterialProxy& smproxy);
/// Destructor
- virtual ~SurfaceMaterialProxy() = default;
+ ~SurfaceMaterialProxy() override = default;
/// Implicit constructor
/// - uses the copy constructor
SurfaceMaterialProxy*
- clone() const final override;
+ clone() const final;
/// Scale operator
- virtual SurfaceMaterialProxy&
- operator*=(double scale) final override;
+ SurfaceMaterialProxy&
+ operator*=(double scale) final;
/// Return the BinUtility - can be nullptr
const BinUtility*
@@ -62,8 +62,8 @@ public:
/// @param lp is local positioning vector
///
/// @return will return dummy material
- virtual const MaterialProperties*
- material(const Vector2D& lp) const final override;
+ const MaterialProperties*
+ material(const Vector2D& lp) const final;
/// Return method for full material description of the Surface - from the
/// global coordinates
@@ -71,8 +71,8 @@ public:
/// @param gp is the global positioning vector
///
/// @return will return dummy material
- virtual const MaterialProperties*
- material(const Vector3D& gp) const final override;
+ const MaterialProperties*
+ material(const Vector3D& gp) const final;
/// Direct access via bins to the MaterialProperties
///
@@ -80,12 +80,12 @@ public:
/// @param ib1 indicates the seconf bin
///
/// @return will return dummy material
- virtual const MaterialProperties*
- material(size_t ib0, size_t ib1) const final override;
+ const MaterialProperties*
+ material(size_t ib0, size_t ib1) const final;
/// Output Method for std::ostream, to be overloaded by child classes
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
private:
/// two dimensional BinUtility determining
diff --git a/Core/include/Acts/Surfaces/ConeBounds.hpp b/Core/include/Acts/Surfaces/ConeBounds.hpp
index 928f5ab1f767fc20c6bdca75ccc7bafab7fab2eb..787d0ca5e418ae6e277bf26e04d7aff13066daf2 100644
--- a/Core/include/Acts/Surfaces/ConeBounds.hpp
+++ b/Core/include/Acts/Surfaces/ConeBounds.hpp
@@ -74,39 +74,38 @@ public:
/// @param data The data to build from
ConeBounds(const variant_data& data);
- virtual ~ConeBounds();
+ ~ConeBounds() override;
- virtual ConeBounds*
- clone() const final override;
+ ConeBounds*
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// inside method for local position
///
/// @param lpos is the local position to be checked
/// @param bcheck is the boundary check directive
/// @return is a boolean indicating if the position is inside
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck = true) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck = true) const final;
/// Minimal distance to boundary ( > 0 if outside and <=0 if inside)
///
/// @param lpos is the local position to check for the distance
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Output Method for std::ostream
///
/// @param sl is the ostrea into which the dump is done
/// @return is the input obect
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// Return the radius at a specific z values
///
diff --git a/Core/include/Acts/Surfaces/ConeSurface.hpp b/Core/include/Acts/Surfaces/ConeSurface.hpp
index b2d27ba869723d9eb019f48dd288ab9f8a5eaeb3..47af2b5f5aa6530ebb35d9499863f42b740592e3 100644
--- a/Core/include/Acts/Surfaces/ConeSurface.hpp
+++ b/Core/include/Acts/Surfaces/ConeSurface.hpp
@@ -82,7 +82,7 @@ public:
/// @param data the @c variant_data to build from
ConeSurface(const variant_data& data);
- virtual ~ConeSurface();
+ ~ConeSurface() override;
/// Assignment operator
///
@@ -93,18 +93,18 @@ public:
/// Implicit Constructor
///
/// @param shift is the optional shift applied after cloning
- virtual ConeSurface*
- clone(const Transform3D* shift = nullptr) const final override;
+ ConeSurface*
+ clone(const Transform3D* shift = nullptr) const final;
/// The binning position method - is overloaded for r-type binning
///
/// @param bValue defines the type of binning applied in the global frame
/// @return The return type is a vector for positioning in the global frame
- virtual const Vector3D
- binningPosition(BinningValue bValue) const final override;
+ const Vector3D
+ binningPosition(BinningValue bValue) const final;
/// Return the surface type
- virtual SurfaceType
+ SurfaceType
type() const override;
/// Return the measurement frame - this is needed for alignment, in particular
@@ -144,18 +144,18 @@ public:
rotSymmetryAxis() const;
/// This method returns the ConeBounds by reference
- virtual const ConeBounds&
- bounds() const final override;
+ const ConeBounds&
+ bounds() const final;
/// Local to global transformation
///
/// @param lpos is the local position to be transformed
/// @param mom is the global momentum (ignored in this operation)
/// @param gpos is the global position shich is filled
- virtual void
+ void
localToGlobal(const Vector2D& lpos,
const Vector3D& mom,
- Vector3D& gpos) const final override;
+ Vector3D& gpos) const final;
/// Global to local transfomration
///
@@ -163,10 +163,10 @@ public:
/// @param mom is the global momentum (ignored in this operation)
/// @param lpos is hte local position to be filled
/// @return is a boolean indicating if the transformation succeeded
- virtual bool
+ bool
globalToLocal(const Vector3D& gpos,
const Vector3D& mom,
- Vector2D& lpos) const final override;
+ Vector2D& lpos) const final;
/// @brief Straight line intersection schema - provides closest intersection
/// and (signed) path length
@@ -210,29 +210,28 @@ public:
/// to be unit length.
///
/// @return is the Intersection object
- virtual Intersection
+ Intersection
intersectionEstimate(const Vector3D& gpos,
const Vector3D& gmom,
NavigationDirection navDir,
- const BoundaryCheck& bcheck = false,
- CorrFnc correct = nullptr) const final override;
+ const BoundaryCheck& bcheck = false,
+ CorrFnc correct = nullptr) const final;
/// the pathCorrection for derived classes with thickness
///
/// @param gpos is the global potion at the correction point
/// @param mom is the momentum at the correction point
/// @return is the path correction due to incident angle
- virtual double
- pathCorrection(const Vector3D& gpos,
- const Vector3D& mom) const final override;
+ double
+ pathCorrection(const Vector3D& gpos, const Vector3D& mom) const final;
/// Return properly formatted class name for screen output
- virtual std::string
+ std::string
name() const override;
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
protected:
diff --git a/Core/include/Acts/Surfaces/CylinderBounds.hpp b/Core/include/Acts/Surfaces/CylinderBounds.hpp
index 584c91d88bfa5bbc95b74e84f7a575db8009b402..f6330b79b09f31e178923dde0a00fd36215333a3 100644
--- a/Core/include/Acts/Surfaces/CylinderBounds.hpp
+++ b/Core/include/Acts/Surfaces/CylinderBounds.hpp
@@ -81,16 +81,16 @@ public:
/// @param data the @c variant_data to build from
CylinderBounds(const variant_data& data);
- virtual ~CylinderBounds();
+ ~CylinderBounds() override;
- virtual CylinderBounds*
- clone() const final override;
+ CylinderBounds*
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// Inside check for the bounds object driven by the boundary check directive
/// Each Bounds has a method inside, which checks if a LocalPosition is inside
@@ -100,8 +100,7 @@ public:
/// @param bcheck boundary check directive
/// @return boolean indicator for the success of this operation
bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Specialized method for CylinderBounds that checks if a global position
/// is within the the cylinder cover
@@ -116,12 +115,12 @@ public:
///
/// @param lpos is the local position to check for the distance
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Output Method for std::ostream
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// This method returns the radius
double
diff --git a/Core/include/Acts/Surfaces/CylinderSurface.hpp b/Core/include/Acts/Surfaces/CylinderSurface.hpp
index 98e95d33394b97806a6b7f435e74c7f6dd691158..b259de272bb3d2a1be9ed49a933891473d38ab94 100644
--- a/Core/include/Acts/Surfaces/CylinderSurface.hpp
+++ b/Core/include/Acts/Surfaces/CylinderSurface.hpp
@@ -96,7 +96,7 @@ public:
CylinderSurface(const variant_data& data);
/// Destructor
- virtual ~CylinderSurface();
+ ~CylinderSurface() override;
/// Assignment operator
///
@@ -107,16 +107,16 @@ public:
/// Implicit Constructor - optionally with a shift
///
/// @param shift is an optional transform for a shift applied after coping
- virtual CylinderSurface*
- clone(const Transform3D* shift = nullptr) const final override;
+ CylinderSurface*
+ clone(const Transform3D* shift = nullptr) const final;
/// The binning position method - is overloaded for r-type binning
///
/// @param bValue is the type of global binning to be done
///
/// @return is the global position to be used for binning
- virtual const Vector3D
- binningPosition(BinningValue bValue) const final override;
+ const Vector3D
+ binningPosition(BinningValue bValue) const final;
/// Return the measurement frame - this is needed for alignment, in particular
/// The measurement frame of a cylinder is the tangential plane at a given
@@ -125,12 +125,11 @@ public:
/// @param gpos is the position where the measurement frame is defined
/// @param mom is the momentum vector (ignored)
/// @return rotation matrix that defines the measurement frame
- virtual const RotationMatrix3D
- referenceFrame(const Vector3D& gpos,
- const Vector3D& mom) const final override;
+ const RotationMatrix3D
+ referenceFrame(const Vector3D& gpos, const Vector3D& mom) const final;
/// Return the surface type
- virtual SurfaceType
+ SurfaceType
type() const override;
/// Return method for surface normal information
@@ -139,8 +138,8 @@ public:
///
/// @param lpos is the local postion for which the normal vector is requested
/// @return normal vector at the local position
- virtual const Vector3D
- normal(const Vector2D& lpos) const final override;
+ const Vector3D
+ normal(const Vector2D& lpos) const final;
/// Return method for surface normal information
/// @note for a Cylinder a local position is always required for the normal
@@ -148,8 +147,8 @@ public:
///
/// @param gpos is the global postion for which the normal vector is requested
/// @return normal vector at the global position
- virtual const Vector3D
- normal(const Vector3D& gpos) const final override;
+ const Vector3D
+ normal(const Vector3D& gpos) const final;
/// Normal vector return without argument
using Surface::normal;
@@ -161,18 +160,18 @@ public:
rotSymmetryAxis() const;
/// This method returns the CylinderBounds by reference
- virtual const CylinderBounds&
- bounds() const final override;
+ const CylinderBounds&
+ bounds() const final;
/// Local to global transformation
///
/// @param lpos is the local position to be transformed
/// @param mom is the global momentum (ignored in this operation)
/// @param gpos is the global position shich is filled
- virtual void
+ void
localToGlobal(const Vector2D& lpos,
const Vector3D& mom,
- Vector3D& gpos) const final override;
+ Vector3D& gpos) const final;
/// Global to local transfomration
///
@@ -180,19 +179,19 @@ public:
/// @param mom is the global momentum (ignored in this operation)
/// @param lpos is hte local position to be filled
/// @return is a boolean indicating if the transformation succeeded
- virtual bool
+ bool
globalToLocal(const Vector3D& gpos,
const Vector3D& mom,
- Vector2D& lpos) const final override;
+ Vector2D& lpos) const final;
/// Check for position on surface
///
/// @param gpos is the global position to be checked
/// @param bcheck is the boundary check object
/// @return is a boolean indicating if the position is on surface
- virtual bool
+ bool
isOnSurface(const Vector3D& gpos,
- const BoundaryCheck& bcheck = true) const final override;
+ const BoundaryCheck& bcheck = true) const final;
/// Fast straight line intersection schema - provides closest intersection
/// and (signed) path length
@@ -236,29 +235,28 @@ public:
/// reinsertion into the line equation.
///
/// @return is the intersection object
- virtual Intersection
+ Intersection
intersectionEstimate(const Vector3D& gpos,
const Vector3D& gidr,
- NavigationDirection navDir = forward,
- const BoundaryCheck& bcheck = false,
- CorrFnc correct = nullptr) const final override;
+ NavigationDirection navDir = forward,
+ const BoundaryCheck& bcheck = false,
+ CorrFnc correct = nullptr) const final;
/// Path correction due to incident of the track
///
/// @param gpos is the global position as a starting point
/// @param mom is the global momentum at the starting point
/// @return is the correction factor due to incident
- virtual double
- pathCorrection(const Vector3D& gpos,
- const Vector3D& mom) const final override;
+ double
+ pathCorrection(const Vector3D& gpos, const Vector3D& mom) const final;
/// Return method for properly formatted output string
- virtual std::string
+ std::string
name() const override;
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
/// Return a PolyhedronRepresentation for this object
diff --git a/Core/include/Acts/Surfaces/DiamondBounds.hpp b/Core/include/Acts/Surfaces/DiamondBounds.hpp
index f7be1b4a17dc9dd9b5b9be83f54f98274d73bcea..4bc27b6cffaf98440c3aaf81e81e8872de0ba77f 100644
--- a/Core/include/Acts/Surfaces/DiamondBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiamondBounds.hpp
@@ -57,16 +57,16 @@ public:
/// @param data the @c variant_data to build from
DiamondBounds(const variant_data& data);
- virtual ~DiamondBounds();
+ ~DiamondBounds() override;
DiamondBounds*
- clone() const final override;
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// Inside check for the bounds object driven by the boundary check directive
/// Each Bounds has a method inside, which checks if a LocalPosition is inside
@@ -75,30 +75,29 @@ public:
/// @param lpos Local position (assumed to be in right surface frame)
/// @param bcheck boundary check directive
/// @return boolean indicator for the success of this operation
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Minimal distance to boundary ( > 0 if outside and <=0 if inside)
///
/// @param lpos is the local position to check for the distance
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Return the vertices - or, the points of the extremas
- virtual std::vector<Vector2D>
- vertices() const final override;
+ std::vector<Vector2D>
+ vertices() const final;
// Bounding box representation
- virtual const RectangleBounds&
+ const RectangleBounds&
boundingBox() const final;
/// Output Method for std::ostream
///
/// @param sl is the ostream in which it is dumped
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// This method returns the halflength in X at minimal Y
/// (first coordinate of local surface frame)
diff --git a/Core/include/Acts/Surfaces/DiscSurface.hpp b/Core/include/Acts/Surfaces/DiscSurface.hpp
index f533e6d33ed9a13ef52a99167e8f193d784ea75c..bd33de1c843cc705eba84d31083e1c0ab57cf66b 100644
--- a/Core/include/Acts/Surfaces/DiscSurface.hpp
+++ b/Core/include/Acts/Surfaces/DiscSurface.hpp
@@ -112,7 +112,7 @@ public:
/// @param data the @c variant_data to build from
DiscSurface(const variant_data& data);
- virtual ~DiscSurface();
+ ~DiscSurface() override;
/// Assignement operator
///
@@ -123,11 +123,11 @@ public:
/// Virtual constructor - shift can be given optionally
///
/// @param shift the otional transform applied after cloning
- virtual DiscSurface*
- clone(const Transform3D* shift = nullptr) const final override;
+ DiscSurface*
+ clone(const Transform3D* shift = nullptr) const final;
/// Return the surface type
- virtual SurfaceType
+ SurfaceType
type() const override;
/// Normal vector return
@@ -135,7 +135,7 @@ public:
/// @param lpos The local position is ignored
/// return a Vector3D by value
const Vector3D
- normal(const Vector2D& lpos) const override final;
+ normal(const Vector2D& lpos) const final;
/// Normal vector return without argument
using Surface::normal;
@@ -145,12 +145,12 @@ public:
///
/// @param bValue The binning type to be used
/// @return position that can beused for this binning
- virtual const Vector3D
+ const Vector3D
binningPosition(BinningValue bValue) const final;
/// This method returns the bounds by reference
const SurfaceBounds&
- bounds() const final override;
+ bounds() const final;
/// This method returns true if the GlobalPosition is on the Surface for both,
/// within or without check of whether the local position is inside boundaries
@@ -159,9 +159,9 @@ public:
/// @param gpos The global position to be checked
/// @param bcheck The boundary check directive
/// @return bollean that indicates if the position is on surface
- virtual bool
+ bool
isOnSurface(const Vector3D& gpos,
- const BoundaryCheck& bcheck = true) const final override;
+ const BoundaryCheck& bcheck = true) const final;
/// Local to global transformation
/// For planar surfaces the momentum is ignroed in the local to global
@@ -173,10 +173,10 @@ public:
/// symmetry)
///
/// @note the momentum is ignored for Disc surfaces in this calculateion
- virtual void
+ void
localToGlobal(const Vector2D& lpos,
const Vector3D& mom,
- Vector3D& gpos) const final override;
+ Vector3D& gpos) const final;
/// Global to local transformation
/// @note the momentum is ignored for Disc surfaces in this calculateion
@@ -188,10 +188,10 @@ public:
/// symmetry)
/// @return boolean indication if operation was successful (fail means global
/// position was not on surface)
- virtual bool
+ bool
globalToLocal(const Vector3D& gpos,
const Vector3D& mom,
- Vector2D& lpos) const final override;
+ Vector2D& lpos) const final;
/// Special method for DiscSurface : local<->local transformations polar <->
/// cartesian
@@ -239,14 +239,13 @@ public:
/// relevant entries are filled
///
/// @param jac The jacobian to be initialized
- /// @param pos The global position of the parameters
+ /// @param gpos The global position of the parameters
/// @param dir The direction at of the parameters
/// @param pars The paranmeters vector
- virtual void
- initJacobianToGlobal(ActsMatrixD<7, 5>& jac,
+ void initJacobianToGlobal(ActsMatrixD<7, 5>& jac,
const Vector3D& gpos,
const Vector3D& dir,
- const ActsVectorD<5>& pars) const final override;
+ const ActsVectorD<5>& pars) const final;
/// Initialize the jacobian from global to local
/// the surface knows best, hence the calculation is done here.
@@ -259,10 +258,9 @@ public:
/// @param pars The parameter vector
///
/// @return the transposed reference frame (avoids recalculation)
- virtual const RotationMatrix3D
- initJacobianToLocal(ActsMatrixD<5, 7>& jac,
- const Vector3D& gpos,
- const Vector3D& dir) const final override;
+ const RotationMatrix3D initJacobianToLocal(ActsMatrixD<5, 7>& jac,
+ const Vector3D& gpos,
+ const Vector3D& dir) const final;
/// Path correction due to incident of the track
///
@@ -270,8 +268,7 @@ public:
/// @param mom The global momentum at the starting point
/// @return The correction factor due to incident
double
- pathCorrection(const Vector3D& gpos,
- const Vector3D& mom) const final override;
+ pathCorrection(const Vector3D& gpos, const Vector3D& mom) const final;
/// @brief Fast straight line intersection schema
///
@@ -300,16 +297,16 @@ public:
/// - either in the plane
/// - perpendicular to the normal of the plane
///
- /// @return The surface intersection object
- virtual Intersection
+ /// @return is the surface intersection object
+ Intersection
intersectionEstimate(const Vector3D& gpos,
const Vector3D& gdir,
- NavigationDirection navDir = forward,
- const BoundaryCheck& bcheck = false,
- CorrFnc correct = nullptr) const final override;
+ NavigationDirection navDir = forward,
+ const BoundaryCheck& bcheck = false,
+ CorrFnc correct = nullptr) const final;
/// Return properly formatted class name for screen output
- virtual std::string
+ std::string
name() const override;
/// Return a PolyhedronRepresentation for this object
@@ -320,7 +317,7 @@ public:
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
protected:
diff --git a/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
index 7922f32603d9b6e80d7f3d2a89f185aebe98763b..1e2fad8f01917fb0df0c850fa9ead63c4d170a87 100644
--- a/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
@@ -65,35 +65,34 @@ public:
/// @param data the @c variant_data to build from
DiscTrapezoidalBounds(const variant_data& data);
- virtual ~DiscTrapezoidalBounds();
+ ~DiscTrapezoidalBounds() override;
- virtual DiscTrapezoidalBounds*
- clone() const final override;
+ DiscTrapezoidalBounds*
+ clone() const final;
- virtual SurfaceBounds::BoundsType
- type() const final override;
+ SurfaceBounds::BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// This method cheks if the radius given in the LocalPosition is inside
/// [rMin,rMax]
/// if only tol0 is given and additional in the phi sector is tol1 is given
/// @param lpos is the local position to be checked (in polar coordinates)
/// @param bcheck is the boundary check directive
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck = true) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck = true) const final;
/// Minimal distance to boundary
/// @param lpos is the local position to be checked (in polar coordinates)
/// @return is the minimal distance ( > 0 if outside and <=0 if inside)
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Output Method for std::ostream
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// This method returns inner radius
double
diff --git a/Core/include/Acts/Surfaces/EllipseBounds.hpp b/Core/include/Acts/Surfaces/EllipseBounds.hpp
index b3d090f311b1cea94413e75e85929eff39f245cb..d74cf2cf44c225a3deb78c48c049f46b65b912c4 100644
--- a/Core/include/Acts/Surfaces/EllipseBounds.hpp
+++ b/Core/include/Acts/Surfaces/EllipseBounds.hpp
@@ -66,16 +66,16 @@ public:
/// @param data the @c variant_data to build from
EllipseBounds(const variant_data& data);
- virtual ~EllipseBounds();
+ ~EllipseBounds() override;
- virtual EllipseBounds*
- clone() const final override;
+ EllipseBounds*
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// This method checks if the point given in the local coordinates is between
/// two ellipsoids if only tol0 is given and additional in the phi sector is
@@ -84,28 +84,27 @@ public:
/// @param lpos Local position (assumed to be in right surface frame)
/// @param bcheck boundary check directive
/// @return boolean indicator for the success of this operation
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Minimal distance to boundary ( > 0 if outside and <=0 if inside)
///
/// @param lpos is the local position to check for the distance
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Return the vertices - or, the points of the extremas
- virtual std::vector<Vector2D>
- vertices() const final override;
+ std::vector<Vector2D>
+ vertices() const final;
// Bounding box representation
- virtual const RectangleBounds&
+ const RectangleBounds&
boundingBox() const final;
/// Output Method for std::ostream
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// This method returns first inner radius
double
diff --git a/Core/include/Acts/Surfaces/InfiniteBounds.hpp b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
index a322a9ab48993fcb934ece0dd7fb81fab7c57f12..a03160d29ca30252a0f4a92d23e6a240ed54f819 100644
--- a/Core/include/Acts/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
@@ -26,22 +26,22 @@ class InfiniteBounds : public SurfaceBounds
{
public:
InfiniteBounds() = default;
- ~InfiniteBounds() {}
+ ~InfiniteBounds() override {}
- virtual InfiniteBounds*
- clone() const final override
+ InfiniteBounds*
+ clone() const final
{
return new InfiniteBounds();
}
- virtual SurfaceBounds::BoundsType
- type() const final override
+ SurfaceBounds::BoundsType
+ type() const final
{
return SurfaceBounds::Boundless;
}
- virtual std::vector<TDD_real_t>
- valueStore() const final override
+ std::vector<TDD_real_t>
+ valueStore() const final
{
return {};
}
@@ -51,8 +51,8 @@ public:
/// ignores input parameters
///
/// @return always true
- virtual bool
- inside(const Vector2D&, const BoundaryCheck&) const final override
+ bool
+ inside(const Vector2D&, const BoundaryCheck&) const final
{
return true;
}
@@ -60,15 +60,15 @@ public:
/// Minimal distance calculation
/// ignores input parameter
/// @return always 0. (should be -NaN)
- virtual double
- distanceToBoundary(const Vector2D& /*pos*/) const final override
+ double
+ distanceToBoundary(const Vector2D& /*pos*/) const final
{
return 0;
}
/// Output Method for std::ostream
- virtual std::ostream&
- dump(std::ostream& os) const final override
+ std::ostream&
+ dump(std::ostream& os) const final
{
os << "Acts::InfiniteBounds ... boundless surface" << std::endl;
return os;
diff --git a/Core/include/Acts/Surfaces/LineBounds.hpp b/Core/include/Acts/Surfaces/LineBounds.hpp
index 3ae99f4b48fb8725e02173c2e6193bdae7711fde..fcdb4e11a41c3e21283261868dcf4d89b3827750 100644
--- a/Core/include/Acts/Surfaces/LineBounds.hpp
+++ b/Core/include/Acts/Surfaces/LineBounds.hpp
@@ -40,16 +40,16 @@ public:
/// @param data the @c variant_data to build from
LineBounds(const variant_data& data);
- virtual ~LineBounds();
+ ~LineBounds() override;
- virtual LineBounds*
- clone() const final override;
+ LineBounds*
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// Inside check for the bounds object driven by the boundary check directive
/// Each Bounds has a method inside, which checks if a LocalPosition is inside
@@ -59,17 +59,16 @@ public:
/// @param bcheck boundary check directive
///
/// @return boolean indicator for the success of this operation
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Minimal distance to boundary ( > 0 if outside and <=0 if inside)
///
/// @param lpos is the local position to check for the distance
///
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// This method returns the radius
virtual double
@@ -82,12 +81,12 @@ public:
/// Output Method for std::ostream
///
/// @param sl is the ostream to be dumped into
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
private:
diff --git a/Core/include/Acts/Surfaces/LineSurface.hpp b/Core/include/Acts/Surfaces/LineSurface.hpp
index a23dba0ae58467b5c970eefbe8bd3c6a004e5147..b990f1308a27a378cc5700fe1622a7efba8f08a4 100644
--- a/Core/include/Acts/Surfaces/LineSurface.hpp
+++ b/Core/include/Acts/Surfaces/LineSurface.hpp
@@ -75,7 +75,7 @@ public:
/// @param data the @c variant_data to build from
LineSurface(const variant_data& data);
- virtual ~LineSurface();
+ ~LineSurface() override;
/// Assignment operator
///
@@ -88,7 +88,7 @@ public:
/// @param lpos is the local position is ignored
/// return a Vector3D by value
const Vector3D
- normal(const Vector2D& lpos) const override final;
+ normal(const Vector2D& lpos) const final;
/// Normal vector return without argument
using Surface::normal;
@@ -98,8 +98,8 @@ public:
///
/// @param bValue is the binning type to be used
/// @return position that can beused for this binning
- virtual const Vector3D
- binningPosition(BinningValue bValue) const final override;
+ const Vector3D
+ binningPosition(BinningValue bValue) const final;
/// Return the measurement frame - this is needed for alignment, in particular
///
@@ -110,9 +110,8 @@ public:
/// constructed
/// @param mom is the momentum used for the measurement frame construction
/// @return is a rotation matrix that indicates the measurement frame
- virtual const RotationMatrix3D
- referenceFrame(const Vector3D& gpos,
- const Vector3D& mom) const final override;
+ const RotationMatrix3D
+ referenceFrame(const Vector3D& gpos, const Vector3D& mom) const final;
/// Initialize the jacobian from local to global
/// the surface knows best, hence the calculation is done here.
@@ -123,11 +122,10 @@ public:
/// @param pos is the global position of the parameters
/// @param dir is the direction at of the parameters
/// @param pars is the paranmeters vector
- virtual void
- initJacobianToGlobal(ActsMatrixD<7, 5>& jac,
- const Vector3D& gpos,
- const Vector3D& dir,
- const ActsVectorD<5>& pars) const final override;
+ void initJacobianToGlobal(ActsMatrixD<7, 5>& jac,
+ const Vector3D& gpos,
+ const Vector3D& dir,
+ const ActsVectorD<5>& pars) const final;
/// Calculate the form factors for the derivatives
/// the calculation is identical for all surfaces where the
@@ -139,11 +137,11 @@ public:
/// @param jac is the transport jacobian
///
/// @return a five-dim vector
- virtual const ActsRowVectorD<5>
+ const ActsRowVectorD<5>
derivativeFactors(const Vector3D& gpos,
const Vector3D& dir,
const RotationMatrix3D& rft,
- const ActsMatrixD<7, 5>& jac) const final override;
+ const ActsMatrixD<7, 5>& jac) const final;
/// Local to global transformation
/// for line surfaces the momentum is used in order to interpret the drift
@@ -152,10 +150,10 @@ public:
/// @param lpos is the local position to be transformed
/// @param mom is the global momentum (used to sign the closest approach)
/// @param gpos is the global position shich is filled
- virtual void
+ void
localToGlobal(const Vector2D& lpos,
const Vector3D& mom,
- Vector3D& gpos) const final override;
+ Vector3D& gpos) const final;
/// Specified for LineSurface: global to local method without dynamic
/// memory allocation
@@ -192,10 +190,10 @@ public:
///
/// @return boolean indication if operation was successful (fail means global
/// position was not on surface)
- virtual bool
+ bool
globalToLocal(const Vector3D& gpos,
const Vector3D& mom,
- Vector2D& lpos) const final override;
+ Vector2D& lpos) const final;
/// Special method for LineSurface
/// provides the Line direction from cache: speedup
@@ -239,12 +237,12 @@ public:
/// e_a)(\vec e_a \cdot \vec e_b)}{1-(\vec e_a \cdot \vec e_b)^2} @f$ <br>
///
/// @return is the intersection object
- virtual Intersection
+ Intersection
intersectionEstimate(const Vector3D& gpos,
const Vector3D& gdir,
- NavigationDirection navDir = forward,
- const BoundaryCheck& bcheck = false,
- CorrFnc correct = nullptr) const final override;
+ NavigationDirection navDir = forward,
+ const BoundaryCheck& bcheck = false,
+ CorrFnc correct = nullptr) const final;
/// the pathCorrection for derived classes with thickness
/// is by definition 1 for LineSurfaces
@@ -252,7 +250,7 @@ public:
/// input parameters are ignored
///
/// @note there's no material associated to the line surface
- virtual double
+ double
pathCorrection(const Vector3D&, const Vector3D&) const override;
/// This method checks if the provided GlobalPosition is inside the assigned
@@ -263,21 +261,21 @@ public:
/// @param gpos is the global position to be checked
/// @param bcheck is the boundary check directive
/// @return bollean that indicates if the position is on surface
- virtual bool
+ bool
isOnSurface(const Vector3D& gpos,
- const BoundaryCheck& bcheck = true) const final override;
+ const BoundaryCheck& bcheck = true) const final;
/// This method returns the bounds of the Surface by reference */
- virtual const SurfaceBounds&
- bounds() const final override;
+ const SurfaceBounds&
+ bounds() const final;
/// Return properly formatted class name for screen output */
- virtual std::string
+ std::string
name() const override;
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
protected:
diff --git a/Core/include/Acts/Surfaces/PerigeeSurface.hpp b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
index 33560ccec461e3087d6e3d698e190b287e2e095f..4d0ca0e22d5425322b032faa066a0b798dd96471 100644
--- a/Core/include/Acts/Surfaces/PerigeeSurface.hpp
+++ b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
@@ -57,13 +57,13 @@ public:
/// @param data the @c variant_data to build from
PerigeeSurface(const variant_data& data);
- virtual ~PerigeeSurface();
+ ~PerigeeSurface() override;
/// Virtual constructor
///
/// @param shift is the potential shift that is applied after cloning
- virtual PerigeeSurface*
- clone(const Transform3D* shift = nullptr) const final override;
+ PerigeeSurface*
+ clone(const Transform3D* shift = nullptr) const final;
/// Assignment operator
///
@@ -72,22 +72,22 @@ public:
operator=(const PerigeeSurface& other);
/// Return the surface type
- virtual SurfaceType
- type() const final override;
+ SurfaceType
+ type() const final;
/// Return properly formatted class name for screen output */
- virtual std::string
- name() const final override;
+ std::string
+ name() const final;
/// Output Method for std::ostream
///
/// @param sl is the ostream to be dumped into
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
};
diff --git a/Core/include/Acts/Surfaces/PlanarBounds.hpp b/Core/include/Acts/Surfaces/PlanarBounds.hpp
index 2950ba5c38acb904d213a7fc182ca6f807653d1f..0b2aaf26921b7a757adb74e0ce8873b817f66cfb 100644
--- a/Core/include/Acts/Surfaces/PlanarBounds.hpp
+++ b/Core/include/Acts/Surfaces/PlanarBounds.hpp
@@ -40,8 +40,8 @@ public:
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
- toVariantData() const = 0;
+ variant_data
+ toVariantData() const override = 0;
};
} // namespace
\ No newline at end of file
diff --git a/Core/include/Acts/Surfaces/PlaneSurface.hpp b/Core/include/Acts/Surfaces/PlaneSurface.hpp
index fb5b6ad8d3396bb0437e2264ea34a05b56fc618d..048912c572e34d7c41c0e24d8290dfa2ba7ab11f 100644
--- a/Core/include/Acts/Surfaces/PlaneSurface.hpp
+++ b/Core/include/Acts/Surfaces/PlaneSurface.hpp
@@ -75,7 +75,7 @@ public:
/// @param data the @c variant_data to build from
PlaneSurface(const variant_data& data);
- virtual ~PlaneSurface();
+ ~PlaneSurface() override;
/// Assignment operator
///
@@ -87,7 +87,7 @@ public:
/// ownership of the shift transform is not given !!
///
/// @param shift is a potential shift after cloning
- virtual PlaneSurface*
+ PlaneSurface*
clone(const Transform3D* shift = nullptr) const override;
/// Normal vector return
@@ -95,7 +95,7 @@ public:
/// @param lpos is the local position is ignored
/// return a Vector3D by value
const Vector3D
- normal(const Vector2D& lpos) const override final;
+ normal(const Vector2D& lpos) const final;
/// Normal vector return without argument
using Surface::normal;
@@ -106,15 +106,15 @@ public:
/// @param bValue is the binning type to be used
///
/// @return position that can beused for this binning
- virtual const Vector3D
- binningPosition(BinningValue bValue) const override final;
+ const Vector3D
+ binningPosition(BinningValue bValue) const final;
/// Return the surface type
- virtual SurfaceType
+ SurfaceType
type() const override;
/// Return method for bounds object of this surfrace
- virtual const SurfaceBounds&
+ const SurfaceBounds&
bounds() const override;
/// Geometrical on surface test
@@ -126,7 +126,7 @@ public:
/// @param bcheck gboundary check directive
///
/// @return is a boolean indicator if the position is on surface
- virtual bool
+ bool
isOnSurface(const Vector3D& gpos,
const BoundaryCheck& bcheck = true) const override;
@@ -138,7 +138,7 @@ public:
/// @param mom global 3D momentum representation (optionally ignored)
/// @param gpos global 3D position to be filled (given by reference for method
/// symmetry)
- virtual void
+ void
localToGlobal(const Vector2D& lpos,
const Vector3D& mom,
Vector3D& gpos) const override;
@@ -155,7 +155,7 @@ public:
///
/// @return boolean indication if operation was successful (fail means global
/// position was not on surface)
- virtual bool
+ bool
globalToLocal(const Vector3D& gpos,
const Vector3D& mom,
Vector2D& lpos) const override;
@@ -199,20 +199,20 @@ public:
/// - perpendicular to the normal of the plane
///
/// @return the Intersection object
- virtual Intersection
+ Intersection
intersectionEstimate(const Vector3D& gpos,
const Vector3D& gdir,
- NavigationDirection navDir = forward,
- const BoundaryCheck& bcheck = false,
- CorrFnc correct = nullptr) const final override;
+ NavigationDirection navDir = forward,
+ const BoundaryCheck& bcheck = false,
+ CorrFnc correct = nullptr) const final;
/// Return properly formatted class name for screen output
- virtual std::string
+ std::string
name() const override;
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
protected:
diff --git a/Core/include/Acts/Surfaces/RadialBounds.hpp b/Core/include/Acts/Surfaces/RadialBounds.hpp
index c33b2c6650ad122e1417744505b604ed32c6013c..7a32872e62ff97c3b527ca1f9fbf5d0a74e2175b 100644
--- a/Core/include/Acts/Surfaces/RadialBounds.hpp
+++ b/Core/include/Acts/Surfaces/RadialBounds.hpp
@@ -65,16 +65,16 @@ public:
/// @param data the @c variant_data to build from
RadialBounds(const variant_data& data);
- virtual ~RadialBounds();
+ ~RadialBounds() override;
- virtual RadialBounds*
- clone() const final override;
+ RadialBounds*
+ clone() const final;
- virtual SurfaceBounds::BoundsType
- type() const final override;
+ SurfaceBounds::BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// For disc surfaces the local position in (r,phi) is checked
///
@@ -82,23 +82,22 @@ public:
/// @param bcheck boundary check directive
///
/// @return is a boolean indicating the operation success
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Minimal distance to boundary calculation
///
/// @param lpos local 2D position in surface coordinate frame
///
/// @return distance to boundary ( > 0 if outside and <=0 if inside)
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Outstream operator
///
/// @param sl is the ostream to be dumped into
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// Return method for inner Radius
double
diff --git a/Core/include/Acts/Surfaces/RectangleBounds.hpp b/Core/include/Acts/Surfaces/RectangleBounds.hpp
index 0399b89a56d5fd2ae4a9caa01064e47d30ae7690..7d8c694c1c590cb9400f583aa45e298c61bfdadb 100644
--- a/Core/include/Acts/Surfaces/RectangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/RectangleBounds.hpp
@@ -46,16 +46,16 @@ public:
/// @param data the @c variant_data to build from
RectangleBounds(const variant_data& data);
- virtual ~RectangleBounds();
+ ~RectangleBounds() override;
- virtual RectangleBounds*
- clone() const final override;
+ RectangleBounds*
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// Inside check for the bounds object driven by the boundary check directive
/// Each Bounds has a method inside, which checks if a LocalPosition is inside
@@ -64,30 +64,29 @@ public:
/// @param lpos Local position (assumed to be in right surface frame)
/// @param bcheck boundary check directive
/// @return boolean indicator for the success of this operation
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Minimal distance to boundary ( > 0 if outside and <=0 if inside)
///
/// @param lpos is the local position to check for the distance
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Return the vertices - or, the points of the extremas
- virtual std::vector<Vector2D>
- vertices() const final override;
+ std::vector<Vector2D>
+ vertices() const final;
// Bounding box representation
- virtual const RectangleBounds&
- boundingBox() const final override;
+ const RectangleBounds&
+ boundingBox() const final;
/// Output Method for std::ostream
///
/// @param sl is the ostream for the dump
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// Return method for the half length in X
double
diff --git a/Core/include/Acts/Surfaces/StrawSurface.hpp b/Core/include/Acts/Surfaces/StrawSurface.hpp
index 43d4a676bff957422cc23f691be620739d4c45f8..102ed78b0b38525c501593c0ada68910cfe042d8 100644
--- a/Core/include/Acts/Surfaces/StrawSurface.hpp
+++ b/Core/include/Acts/Surfaces/StrawSurface.hpp
@@ -78,7 +78,7 @@ public:
/// @param data the @c variant_data to build from
StrawSurface(const variant_data& data);
- virtual ~StrawSurface();
+ ~StrawSurface() override;
/// Assignment operator
///
@@ -89,20 +89,20 @@ public:
/// Implicit constructor - shift can be provided
///
/// @param shift is an optional shift to be applied
- virtual StrawSurface*
- clone(const Transform3D* shift = nullptr) const final override;
+ StrawSurface*
+ clone(const Transform3D* shift = nullptr) const final;
/// Return the surface type
- virtual SurfaceType
- type() const final override;
+ SurfaceType
+ type() const final;
/// Return properly formatted class name for screen output */
- virtual std::string
- name() const final override;
+ std::string
+ name() const final;
/// Produce a @c variant_data representation of this object
/// @return The representation
- virtual variant_data
+ variant_data
toVariantData() const override;
/// Return a PolyhedronRepresentation for this object
diff --git a/Core/include/Acts/Surfaces/SurfaceArray.hpp b/Core/include/Acts/Surfaces/SurfaceArray.hpp
index 68697bd995aee43b0b732992a206e8ca4c57d1ab..345e7b99a8a46da82ccd01c0973857311ae5dcfc 100644
--- a/Core/include/Acts/Surfaces/SurfaceArray.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceArray.hpp
@@ -168,7 +168,7 @@ public:
/// all bins around a given one.
///
/// @param surfaces Input surface pointers
- virtual void
+ void
fill(const SurfaceVector& surfaces) override
{
for (const auto& srf : surfaces) {
@@ -185,7 +185,7 @@ public:
///
/// @param surfaces The surface pointers to fill
/// @return number of bins that were filled
- virtual size_t
+ size_t
completeBinning(const SurfaceVector& surfaces) override
{
size_t binCompleted = 0;
@@ -226,7 +226,7 @@ public:
/// @brief Performs lookup at @c pos and returns bin content as reference
/// @param pos Lookup position
/// @return @c SurfaceVector at given bin
- virtual SurfaceVector&
+ SurfaceVector&
lookup(const Vector3D& pos) override
{
return m_grid.at(m_globalToLocal(pos));
@@ -236,7 +236,7 @@ public:
/// reference
/// @param pos Lookup position
/// @return @c SurfaceVector at given bin
- virtual const SurfaceVector&
+ const SurfaceVector&
lookup(const Vector3D& pos) const override
{
return m_grid.at(m_globalToLocal(pos));
@@ -246,7 +246,7 @@ public:
/// reference
/// @param bin Global lookup bin
/// @return @c SurfaceVector at given bin
- virtual SurfaceVector&
+ SurfaceVector&
lookup(size_t bin) override
{
return m_grid.at(bin);
@@ -256,7 +256,7 @@ public:
/// reference
/// @param bin Global lookup bin
/// @return @c SurfaceVector at given bin
- virtual const SurfaceVector&
+ const SurfaceVector&
lookup(size_t bin) const override
{
return m_grid.at(bin);
@@ -266,7 +266,7 @@ public:
///
/// @param pos Lookup position
/// @return @c SurfaceVector at given bin. Copy of all bins selected
- virtual const SurfaceVector&
+ const SurfaceVector&
neighbors(const Vector3D& pos) const override
{
auto loc = m_globalToLocal(pos);
@@ -276,7 +276,7 @@ public:
/// @brief Returns the total size of the grid (including under/overflow
/// bins)
/// @return Size of the grid data structure
- virtual size_t
+ size_t
size() const override
{
return m_grid.size();
@@ -285,7 +285,7 @@ public:
/// @brief Gets the center position of bin @c bin in global coordinates
/// @param bin the global bin index
/// @return The bin center
- virtual Vector3D
+ Vector3D
getBinCenter(size_t bin) const override
{
return getBinCenterImpl(bin);
@@ -294,7 +294,7 @@ public:
/// @brief Returns copies of the axes used in the grid as @c AnyAxis
/// @return The axes
/// @note This returns copies. Use for introspection and querying.
- virtual std::vector<const IAxis*>
+ std::vector<const IAxis*>
getAxes() const override
{
auto arr = m_grid.getAxes();
@@ -303,7 +303,7 @@ public:
/// @brief Get the number of dimensions of the grid.
/// @return number of dimensions
- virtual size_t
+ size_t
dimensions() const override
{
return DIM;
@@ -314,7 +314,7 @@ public:
/// @return bool if the bin is valid
/// @note Valid means that the index points to a bin which is not a under
/// or overflow bin or out of range in any axis.
- virtual bool
+ bool
isValidBin(size_t bin) const override
{
std::array<size_t, DIM> indices = m_grid.getLocalBinIndices(bin);
@@ -401,7 +401,7 @@ public:
/// @brief Lookup, always returns @c element
/// @param pos is ignored
/// @return reference to vector containing only @c element
- virtual SurfaceVector&
+ SurfaceVector&
lookup(const Vector3D&) override
{
return m_element;
@@ -410,7 +410,7 @@ public:
/// @brief Lookup, always returns @c element
/// @param pos is ignored
/// @return reference to vector containing only @c element
- virtual const SurfaceVector&
+ const SurfaceVector&
lookup(const Vector3D&) const override
{
return m_element;
@@ -419,20 +419,17 @@ public:
/// @brief Lookup, always returns @c element
/// @param bin is ignored
/// @return reference to vector containing only @c element
- virtual SurfaceVector& lookup(size_t) override { return m_element; }
+ SurfaceVector& lookup(size_t) override { return m_element; }
/// @brief Lookup, always returns @c element
/// @param bin is ignored
/// @return reference to vector containing only @c element
- virtual const SurfaceVector& lookup(size_t) const override
- {
- return m_element;
- }
+ const SurfaceVector& lookup(size_t) const override { return m_element; }
/// @brief Lookup, always returns @c element
/// @param pos is ignored
/// @return reference to vector containing only @c element
- virtual const SurfaceVector&
+ const SurfaceVector&
neighbors(const Vector3D&) const override
{
return m_element;
@@ -440,7 +437,7 @@ public:
/// @brief returns 1
/// @return 1
- virtual size_t
+ size_t
size() const override
{
return 1;
@@ -449,14 +446,11 @@ public:
/// @brief Gets the bin center, but always returns (0, 0, 0)
/// @param bin is ignored
/// @return (0, 0, 0)
- virtual Vector3D getBinCenter(size_t) const override
- {
- return Vector3D(0, 0, 0);
- }
+ Vector3D getBinCenter(size_t) const override { return Vector3D(0, 0, 0); }
/// @brief Returns an empty vector of @c AnyAxis
/// @return empty vector
- virtual std::vector<const IAxis*>
+ std::vector<const IAxis*>
getAxes() const override
{
return {};
@@ -464,7 +458,7 @@ public:
/// @brief Get the number of dimensions
/// @return always 0
- virtual size_t
+ size_t
dimensions() const override
{
return 0;
@@ -472,14 +466,14 @@ public:
/// @brief Comply with concept and provide fill method
/// @note Does nothing
- virtual void
+ void
fill(const SurfaceVector&) override
{
}
/// @brief Comply with concept and provide completeBinning method
/// @note Does nothing
- virtual size_t
+ size_t
completeBinning(const SurfaceVector&) override
{
return 0;
@@ -488,7 +482,7 @@ public:
/// @brief Returns if the bin is valid (it is)
/// @param bin is ignored
/// @return always true
- virtual bool isValidBin(size_t) const override { return true; }
+ bool isValidBin(size_t) const override { return true; }
private:
SurfaceVector m_element;
diff --git a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
index 8dc101f239374d3cf548ef4d80bf437b8d9970cc..cede97e4fbbf0b5239b71ec009826a77dcfbd5d3 100644
--- a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
@@ -55,16 +55,16 @@ public:
/// @param data the @c variant_data to build from
TrapezoidBounds(const variant_data& data);
- virtual ~TrapezoidBounds();
+ ~TrapezoidBounds() override;
- virtual TrapezoidBounds*
- clone() const final override;
+ TrapezoidBounds*
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// The orientation of the Trapezoid is according to the figure above,
/// in words: the shorter of the two parallel sides of the trapezoid
@@ -110,30 +110,29 @@ public:
/// @param lpos Local position (assumed to be in right surface frame)
/// @param bcheck boundary check directive
/// @return boolean indicator for the success of this operation
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Minimal distance to boundary ( > 0 if outside and <=0 if inside)
///
/// @param lpos is the local position to check for the distance
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// Return the vertices - or, the points of the extremas
- virtual std::vector<Vector2D>
- vertices() const final override;
+ std::vector<Vector2D>
+ vertices() const final;
// Bounding box representation
- virtual const RectangleBounds&
- boundingBox() const final override;
+ const RectangleBounds&
+ boundingBox() const final;
/// Output Method for std::ostream
///
/// @param sl is the ostream to be dumped into
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// This method returns the minimal halflength in X
/// (first coordinate of local surface frame)
diff --git a/Core/include/Acts/Surfaces/TriangleBounds.hpp b/Core/include/Acts/Surfaces/TriangleBounds.hpp
index f2efc2f4946dc9df46dda539fa44ffccd7375810..66c654f0374b3dd796d86e73e3a4835458362fea 100644
--- a/Core/include/Acts/Surfaces/TriangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/TriangleBounds.hpp
@@ -54,16 +54,16 @@ public:
/// @param data the @c variant_data to build from
TriangleBounds(const variant_data& data);
- virtual ~TriangleBounds();
+ ~TriangleBounds() override;
- virtual TriangleBounds*
- clone() const final override;
+ TriangleBounds*
+ clone() const final;
- virtual BoundsType
- type() const final override;
+ BoundsType
+ type() const final;
- virtual std::vector<TDD_real_t>
- valueStore() const final override;
+ std::vector<TDD_real_t>
+ valueStore() const final;
/// This method checks if the provided local coordinates are inside the
/// surface bounds
@@ -71,30 +71,29 @@ public:
/// @param lpos local position in 2D local carthesian frame
/// @param bcheck is the boundary check directive
/// @return boolean indicator for the success of this operation
- virtual bool
- inside(const Vector2D& lpos,
- const BoundaryCheck& bcheck) const final override;
+ bool
+ inside(const Vector2D& lpos, const BoundaryCheck& bcheck) const final;
/// Minimal distance to boundary ( > 0 if outside and <=0 if inside)
///
/// @param lpos is the local position to check for the distance
/// @return is a signed distance parameter
- virtual double
- distanceToBoundary(const Vector2D& lpos) const final override;
+ double
+ distanceToBoundary(const Vector2D& lpos) const final;
/// This method returns the coordinates of vertices
std::vector<Vector2D>
- vertices() const final override;
+ vertices() const final;
// Bounding box representation
- virtual const RectangleBounds&
- boundingBox() const final override;
+ const RectangleBounds&
+ boundingBox() const final;
/// Output Method for std::ostream
///
/// @param sl is the ostream to be dumped into
- virtual std::ostream&
- dump(std::ostream& sl) const final override;
+ std::ostream&
+ dump(std::ostream& sl) const final;
/// Produce a @c variant_data representation of this object
/// @return The representation
diff --git a/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
index e338b4c80d15cfe71a690e083ff7ee6b6b8a3428..7bbf1e348b78dd5630c1a444874b8be0f4fe2da3 100644
--- a/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
@@ -534,7 +534,7 @@ public:
Logging::INFO));
/// Destructor
- virtual ~CylinderVolumeBuilder();
+ ~CylinderVolumeBuilder() override;
/// CylinderVolumeBuilder main call method
///
diff --git a/Core/include/Acts/Tools/CylinderVolumeHelper.hpp b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
index c394e089e4e76bab52d7be32679d7a9420583eb9..317e225a6b68011e7611e4fc709b4b0bb998c442 100644
--- a/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
@@ -71,7 +71,7 @@ public:
Logging::INFO));
/// Destructor
- virtual ~CylinderVolumeHelper() = default;
+ ~CylinderVolumeHelper() override = default;
/// Create a TrackingVolume* from a set of layers and (optional) parameters
///
diff --git a/Core/include/Acts/Tools/LayerArrayCreator.hpp b/Core/include/Acts/Tools/LayerArrayCreator.hpp
index 41bfa58b0d25f8443605d46ad9d7304f1ee41069..f4bfb71b89e771cf2c676df659cd8de4a23dbfad 100644
--- a/Core/include/Acts/Tools/LayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/LayerArrayCreator.hpp
@@ -53,7 +53,7 @@ public:
}
/// Destructor
- virtual ~LayerArrayCreator() = default;
+ ~LayerArrayCreator() override = default;
/// LayerArrayCreator interface method
///
diff --git a/Core/include/Acts/Tools/PassiveLayerBuilder.hpp b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
index 22210daa0d81a1ec920142d4edb301c70b63a716..e8d1d6ac74ef481d4f5bdd7f9ca1b0407ae0fd94 100644
--- a/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
+++ b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
@@ -60,7 +60,7 @@ public:
= getDefaultLogger("PassiveLayerBuilder", Logging::INFO));
/// Destructor
- virtual ~PassiveLayerBuilder() = default;
+ ~PassiveLayerBuilder() override = default;
/// LayerBuilder interface method
/// @return the layers at negative side
diff --git a/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
index eed6355f50ba9345cc5b4b45af9fb0ba33b442f9..e09cba852064fedcb4ad8dbf814fdde680b78f6d 100644
--- a/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
@@ -60,11 +60,11 @@ public:
Logging::INFO));
/// Destructor
- virtual ~TrackingGeometryBuilder() = default;
+ ~TrackingGeometryBuilder() override = default;
/// TrackingGeometry Interface method
/// @return a unique pointer to a TrackingGeometry
- virtual std::unique_ptr<const TrackingGeometry>
+ std::unique_ptr<const TrackingGeometry>
trackingGeometry() const final;
/// Set configuration method
diff --git a/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
index 6eae673bda7a4aaa3f4fa9f4951069b8fa6c8b3f..3e4989566c0bccadebf718832179dd97688a02a6 100644
--- a/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
@@ -44,7 +44,7 @@ public:
}
/// Destructor
- virtual ~TrackingVolumeArrayCreator() = default;
+ ~TrackingVolumeArrayCreator() override = default;
/// create a tracking volume array
///
@@ -54,7 +54,7 @@ public:
/// @return new created volume array
std::shared_ptr<const TrackingVolumeArray>
trackingVolumeArray(const TrackingVolumeVector& vols,
- BinningValue bVal) const;
+ BinningValue bVal) const override;
/// Set logging instance
///
diff --git a/Core/include/Acts/Utilities/BinnedArrayXD.hpp b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
index 03d3d0893da8fe624d0e8ef7523fdf68f2dffcc3..2955571106ace661e2bbec5fb31a2e6cb6fffeea 100644
--- a/Core/include/Acts/Utilities/BinnedArrayXD.hpp
+++ b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
@@ -128,7 +128,7 @@ public:
= delete;
/// Destructor
- ~BinnedArrayXD() {}
+ ~BinnedArrayXD() override {}
/// Returns the object in the array from a local position
///
/// @todo check if we can change to triple return at once
@@ -138,8 +138,7 @@ public:
///
/// @return is the object in that bin
T
- object(const Vector2D& lposition,
- std::array<size_t, 3>& bins) const override final
+ object(const Vector2D& lposition, std::array<size_t, 3>& bins) const final
{
if (m_binUtility) {
size_t bdim = m_binUtility->dimensions();
@@ -166,8 +165,7 @@ public:
///
/// @return is the object in that bin
T
- object(const Vector3D& position,
- std::array<size_t, 3>& bins) const override final
+ object(const Vector3D& position, std::array<size_t, 3>& bins) const final
{
if (m_binUtility) {
size_t bdim = m_binUtility->dimensions();
diff --git a/Core/include/Acts/Utilities/Logger.hpp b/Core/include/Acts/Utilities/Logger.hpp
index 24ffbce68b441a4409b794afb0cf9fe6accbad5f..a914607c36307117001be0a51843f25010367980 100644
--- a/Core/include/Acts/Utilities/Logger.hpp
+++ b/Core/include/Acts/Utilities/Logger.hpp
@@ -279,7 +279,7 @@ namespace Logging {
explicit DefaultFilterPolicy(const Level& lvl) : m_level(lvl) {}
/// virtual default destructor
- virtual ~DefaultFilterPolicy() = default;
+ ~DefaultFilterPolicy() override = default;
/// @brief decide whether a debug message should be processed
///
diff --git a/Core/include/Acts/Utilities/ThrowAssert.hpp b/Core/include/Acts/Utilities/ThrowAssert.hpp
index 8523d25f4ab0bfc059afde6ff74c050bc51b6c4b..30429ee6ca193e22e6c51304f97355aef3b19cfc 100644
--- a/Core/include/Acts/Utilities/ThrowAssert.hpp
+++ b/Core/include/Acts/Utilities/ThrowAssert.hpp
@@ -64,8 +64,8 @@ public:
}
/// The assertion message
- virtual const char*
- what() const throw()
+ const char*
+ what() const throw() override
{
return report.c_str();
}
diff --git a/Core/include/Acts/Utilities/detail/Axis.hpp b/Core/include/Acts/Utilities/detail/Axis.hpp
index 5e0fe10595d0ba9e0f3c336f1b0d22c2304391b1..40479c54854cb59fde5d862031fd6b864cb638df 100644
--- a/Core/include/Acts/Utilities/detail/Axis.hpp
+++ b/Core/include/Acts/Utilities/detail/Axis.hpp
@@ -72,7 +72,7 @@ namespace detail {
/// @brief returns whether the axis is equidistant
///
/// @return bool is equidistant
- virtual bool
+ bool
isEquidistant() const override
{
return true;
@@ -81,7 +81,7 @@ namespace detail {
/// @brief returns whether the axis is variable
///
/// @return bool is variable
- virtual bool
+ bool
isVariable() const override
{
return false;
@@ -90,7 +90,7 @@ namespace detail {
/// @brief returns the boundary type set in the template param
///
/// @return @c AxisBoundaryType of this axis
- virtual AxisBoundaryType
+ AxisBoundaryType
getBoundaryType() const override
{
return bdt;
@@ -305,7 +305,7 @@ namespace detail {
/// @brief get maximum of binning range
///
/// @return maximum of binning range
- virtual double
+ double
getMax() const override
{
return m_max;
@@ -314,7 +314,7 @@ namespace detail {
/// @brief get minimum of binning range
///
/// @return minimum of binning range
- virtual double
+ double
getMin() const override
{
return m_min;
@@ -323,7 +323,7 @@ namespace detail {
/// @brief get total number of bins
///
/// @return total number of bins (excluding under-/overflow bins)
- virtual size_t
+ size_t
getNBins() const override
{
return m_bins;
@@ -344,7 +344,7 @@ namespace detail {
/// @brief Return a vector of bin edges
/// @return Vector which contains the bin edges
- virtual std::vector<double>
+ std::vector<double>
getBinEdges() const override
{
std::vector<double> binEdges;
@@ -388,7 +388,7 @@ namespace detail {
/// @brief returns whether the axis is equidistante
///
/// @return bool is equidistant
- virtual bool
+ bool
isEquidistant() const override
{
return false;
@@ -397,7 +397,7 @@ namespace detail {
/// @brief returns whether the axis is variable
///
/// @return bool is variable
- virtual bool
+ bool
isVariable() const override
{
return true;
@@ -406,7 +406,7 @@ namespace detail {
/// @brief returns the boundary type set in the template param
///
/// @return @c AxisBoundaryType of this axis
- virtual AxisBoundaryType
+ AxisBoundaryType
getBoundaryType() const override
{
return bdt;
@@ -631,7 +631,7 @@ namespace detail {
/// @brief get maximum of binning range
///
/// @return maximum of binning range
- virtual double
+ double
getMax() const override
{
return m_binEdges.back();
@@ -640,7 +640,7 @@ namespace detail {
/// @brief get minimum of binning range
///
/// @return minimum of binning range
- virtual double
+ double
getMin() const override
{
return m_binEdges.front();
@@ -649,7 +649,7 @@ namespace detail {
/// @brief get total number of bins
///
/// @return total number of bins (excluding under-/overflow bins)
- virtual size_t
+ size_t
getNBins() const override
{
return m_binEdges.size() - 1;
@@ -670,7 +670,7 @@ namespace detail {
/// @brief Return a vector of bin edges
/// @return Vector which contains the bin edges
- virtual std::vector<double>
+ std::vector<double>
getBinEdges() const override
{
return m_binEdges;
diff --git a/Core/include/Acts/Volumes/AbstractVolume.hpp b/Core/include/Acts/Volumes/AbstractVolume.hpp
index 7a341813c62620fa9a2473fa26eae4b9abc4cf57..f4065c5f12012a814b05c80e50e472ea36641843 100644
--- a/Core/include/Acts/Volumes/AbstractVolume.hpp
+++ b/Core/include/Acts/Volumes/AbstractVolume.hpp
@@ -66,7 +66,7 @@ public:
AbstractVolume() = delete;
// Virtual Destructor
- virtual ~AbstractVolume();
+ ~AbstractVolume() override;
/// Assignment operator - deleted
AbstractVolume&
diff --git a/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
index b05a84bdc9f1dbe72649bf704411e452687721cb..a7206eca710a3c7a3634ad6259e9de470fa20957 100644
--- a/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
@@ -65,7 +65,7 @@ public:
CuboidVolumeBounds(const CuboidVolumeBounds& cubo);
/// Destructor
- virtual ~CuboidVolumeBounds();
+ ~CuboidVolumeBounds() override;
/// Assignment operator
///
diff --git a/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
index 2b7e8cc529b9321c22c262a983ca050cf991054e..14424f96e1e64c2352116e6f8f09bbf804a92456 100644
--- a/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
@@ -109,7 +109,7 @@ public:
CylinderVolumeBounds(const CylinderVolumeBounds& cylbo);
/// Destructor
- virtual ~CylinderVolumeBounds();
+ ~CylinderVolumeBounds() override;
/// Assignment operator
CylinderVolumeBounds&
@@ -138,13 +138,13 @@ public:
/// Binning offset - overloaded for some R-binning types
///
/// @param bValue is the type used for the binning
- virtual Vector3D
+ Vector3D
binningOffset(BinningValue bValue) const override;
/// Binning borders in double
///
/// @param bValue is the type used for the binning
- virtual double
+ double
binningBorder(BinningValue bValue) const override;
/// This method returns the inner radius
diff --git a/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
index d001d86c499d8d1b11c9180d42215d1ceb0265c3..b72870c28989ba0377f17365102d486d49ad0619 100644
--- a/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
@@ -94,7 +94,7 @@ public:
DoubleTrapezoidVolumeBounds(const DoubleTrapezoidVolumeBounds& dtbo);
/// Destructor
- virtual ~DoubleTrapezoidVolumeBounds();
+ ~DoubleTrapezoidVolumeBounds() override;
/// Assignment operator
///
diff --git a/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
index 72ef8f5a082210aa3699619fdf22d6c59fb82ee6..1641b5f9848ea166ce70030895c8dc653fbec381 100644
--- a/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
@@ -90,7 +90,7 @@ public:
TrapezoidVolumeBounds(const TrapezoidVolumeBounds& bobo);
/// Destructor
- virtual ~TrapezoidVolumeBounds();
+ ~TrapezoidVolumeBounds() override;
/// Assignment operator
TrapezoidVolumeBounds&
diff --git a/Core/include/Acts/Volumes/Volume.hpp b/Core/include/Acts/Volumes/Volume.hpp
index f19595b53b72a87531fc6445391058de5a5b59e3..e815f335fb6e2e9227d8497a8eb35056aed9b61d 100644
--- a/Core/include/Acts/Volumes/Volume.hpp
+++ b/Core/include/Acts/Volumes/Volume.hpp
@@ -86,7 +86,7 @@ public:
/// @param bValue is the binning value schema
///
/// @return vector 3D that can be used for the binning
- virtual const Vector3D
+ const Vector3D
binningPosition(BinningValue bValue) const override;
protected:
diff --git a/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
index c62691f0953f8c00ab35dbd96f8af000916ccaf3..41d27446717bab375341091ff6bfcd3793b99cd1 100644
--- a/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
@@ -78,7 +78,7 @@ public:
= getDefaultLogger("ExtrapolationEngine", Logging::INFO));
/// Destructor
- ~ExtrapolationEngine();
+ ~ExtrapolationEngine() override;
using IExtrapolationEngine::extrapolate;
/// Charged extrapolation - public interface
diff --git a/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
index 66337500c2687860bd8e7a3bfbdcd59e1af9b64d..610c6ff4dc0ca7ae756aba4ee5c95c142890f435 100644
--- a/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
@@ -62,7 +62,7 @@ public:
Logging::INFO));
/// Destructor
- ~MaterialEffectsEngine();
+ ~MaterialEffectsEngine() override;
/// Public charged material effects interface
///
diff --git a/Legacy/include/Acts/Extrapolation/StaticEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
index bc5e79844ce6b913c2074779e1b876ab9f830a65..b91c6cff154619d55e8aa7b57be918662dd34e96 100644
--- a/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
@@ -87,7 +87,7 @@ public:
= getDefaultLogger("StaticEngine", Logging::INFO));
/// Destructor
- ~StaticEngine();
+ ~StaticEngine() override;
using IExtrapolationEngine::extrapolate;
diff --git a/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
index 5f5ea5be114d045569e2283dd4dc5f917d4ec4a5..b5df6f7fda25ba86a462867194c715012504b6ee 100644
--- a/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
@@ -61,7 +61,7 @@ public:
Logging::INFO));
/// Destructor
- ~StaticNavigationEngine();
+ ~StaticNavigationEngine() override;
/// avoid method shaddowing
using INavigationEngine::resolveBoundary;
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ActsExtension.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ActsExtension.hpp
index 1935bc93aee2555e9fb028c184d722612e1ec2a3..f3f0fda264060653508440182bcb7133cf08feba 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ActsExtension.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ActsExtension.hpp
@@ -182,7 +182,7 @@ public:
/// Copy constructor
ActsExtension(const ActsExtension&, const dd4hep::DetElement&);
/// Destructor
- ~ActsExtension() = default;
+ ~ActsExtension() override = default;
/// Set configuration method
/// @param config is the new configuration struct
void
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetElement.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetElement.hpp
index 7056dc253b7ac8eebb9a20abf7695c7ac134fd78..ddb9fda1c237b41a2a6350b97e66fdf8640e7275 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetElement.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetElement.hpp
@@ -73,7 +73,7 @@ public:
std::shared_ptr<const Acts::SurfaceMaterial> material
= nullptr);
/// Desctructor
- virtual ~DD4hepDetElement() = default;
+ ~DD4hepDetElement() override = default;
private:
/// DD4hep detector element
@@ -81,4 +81,4 @@ private:
/// DD4hep segmentation
dd4hep::Segmentation m_segmentation;
};
-}
\ No newline at end of file
+}
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp
index 57f09446b45b8f57e0b8d943ca20572a8ff7944f..67d79f5106edf7716a05d5b2df7dbff4fb233673 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp
@@ -81,26 +81,26 @@ public:
DD4hepLayerBuilder(const Acts::DD4hepLayerBuilder::Config& config,
std::unique_ptr<const Logger> logger);
/// Destructor
- ~DD4hepLayerBuilder();
+ ~DD4hepLayerBuilder() override;
/// LayerBuilder interface method
/// @return the layers at negative side
- virtual const LayerVector
+ const LayerVector
negativeLayers() const final;
/// LayerBuilder interface method
/// @return the layers at the central sector
- virtual const LayerVector
+ const LayerVector
centralLayers() const final;
/// LayerBuilder interface method
/// @return the layers at positive side
- virtual const LayerVector
+ const LayerVector
positiveLayers() const final;
/// Name identification
/// @return the string based identification of this configuration
- virtual const std::string&
+ const std::string&
identification() const final;
/// set the configuration object
diff --git a/Plugins/Digitization/include/Acts/Plugins/Digitization/CartesianSegmentation.hpp b/Plugins/Digitization/include/Acts/Plugins/Digitization/CartesianSegmentation.hpp
index 78d1e7ba4f4423a8ca4544a8f67baee227a7c39d..c3be2c32e874d47a8f40a515642932c5eed6014e 100644
--- a/Plugins/Digitization/include/Acts/Plugins/Digitization/CartesianSegmentation.hpp
+++ b/Plugins/Digitization/include/Acts/Plugins/Digitization/CartesianSegmentation.hpp
@@ -64,7 +64,7 @@ public:
std::shared_ptr<const PlanarBounds> rBounds = nullptr);
/// Virtual Destructor
- virtual ~CartesianSegmentation();
+ ~CartesianSegmentation() override;
/// @copydoc Acts::Segmentation::createSegmentationSurfaces
///
@@ -76,19 +76,19 @@ public:
SurfacePtrVector& segmentationSurfacesY,
double halfThickness,
int readoutDirection = 1.,
- double lorentzAngle = 0.) const final override;
+ double lorentzAngle = 0.) const final;
/// @copydoc Segmentation::cell
DigitizationCell
- cell(const Vector3D& position) const final override;
+ cell(const Vector3D& position) const final;
/// @copydoc Segmentation::cell
DigitizationCell
- cell(const Vector2D& position) const final override;
+ cell(const Vector2D& position) const final;
/// @copydoc Segmentation::cellPosition
Vector2D
- cellPosition(const DigitizationCell& cId) const final override;
+ cellPosition(const DigitizationCell& cId) const final;
/// Fill the associated digitsation cell from this start and end position
/// correct for lorentz effect if needed
@@ -99,17 +99,17 @@ public:
const Vector3D& end,
double halfThickness,
int readoutDirection = 1,
- double lorentzAngle = 0.) const final override;
+ double lorentzAngle = 0.) const final;
/// return the surface bounds by reference
/// specialization for Rectangle Bounds
const PlanarBounds&
- moduleBounds() const final override;
+ moduleBounds() const final;
/// return the bin utility that defines the
/// readout segmentation
const BinUtility&
- binUtility() const final override;
+ binUtility() const final;
/// return the pitch sizes as a pair
std::pair<double, double>
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp
index 6587e41b2cc46e90579e4b3a70ce1f5cfb20a6ae..7e02701bf66d59cb1e5be5dca8ede024bde8d9a0 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp
@@ -116,23 +116,23 @@ public:
= nullptr);
/// Destructor
- virtual ~TGeoDetectorElement();
+ ~TGeoDetectorElement() override;
/// Identifier
- virtual Identifier
- identifier() const final override;
+ Identifier
+ identifier() const final;
/// Return local to global transform associated with this identifier
- virtual const Transform3D&
- transform() const final override;
+ const Transform3D&
+ transform() const final;
/// Return surface associated with this identifier, which should come from the
- virtual const Surface&
- surface() const final override;
+ const Surface&
+ surface() const final;
/// Returns the thickness of the module
- virtual double
- thickness() const final override;
+ double
+ thickness() const final;
private:
/// DD4hep detector element, just linked - not owned
@@ -176,4 +176,4 @@ TGeoDetectorElement::thickness() const
{
return m_thickness;
}
-}
\ No newline at end of file
+}
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp
index c3f636cfbc4280f1967f9faf41eb8dd39611258d..ce41e683062b82b85b7d4b8396f225e6c9a13122 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp
@@ -86,7 +86,7 @@ public:
= getDefaultLogger("LayerArrayCreator", Logging::INFO));
/// Destructor
- ~TGeoLayerBuilder();
+ ~TGeoLayerBuilder() override;
/// LayerBuilder interface method - returning the layers at negative side
const LayerVector
diff --git a/Tests/Core/Extrapolator/ExtrapolatorTestGeometry.hpp b/Tests/Core/Extrapolator/ExtrapolatorTestGeometry.hpp
index df2a3e91dfa9769382a2935451f01d270fc0aa28..eb96d4db0fc55591022320227044f3dfec3cd0f2 100644
--- a/Tests/Core/Extrapolator/ExtrapolatorTestGeometry.hpp
+++ b/Tests/Core/Extrapolator/ExtrapolatorTestGeometry.hpp
@@ -46,8 +46,8 @@ namespace Test {
}
// causes pointer assignment
- virtual bool
- isFree() const override final
+ bool
+ isFree() const final
{
return false;
}
diff --git a/Tests/Core/Layers/LayerStub.hpp b/Tests/Core/Layers/LayerStub.hpp
index 4c9e2e0c9fe173961978cc071d230ee0691cb1b0..b86e69a7104950b2cb1ba839381775b7a3dc3353 100644
--- a/Tests/Core/Layers/LayerStub.hpp
+++ b/Tests/Core/Layers/LayerStub.hpp
@@ -32,7 +32,7 @@ public:
}
/// Destructor
- virtual ~LayerStub() {}
+ ~LayerStub() override {}
/// Assignment is deleted in the Layer baseclass
LayerStub&
@@ -41,13 +41,13 @@ public:
/// surfaceRepresentation is pure virtual in baseclass
const Surface&
- surfaceRepresentation() const
+ surfaceRepresentation() const override
{
return (*this);
}
Surface&
- surfaceRepresentation()
+ surfaceRepresentation() override
{
return (*this);
}
diff --git a/Tests/Core/Surfaces/DetectorElementStub.hpp b/Tests/Core/Surfaces/DetectorElementStub.hpp
index 1c69e7d0e928d1885eca472b0bc9f9a6f3833541..b3d355d19cb9cf58346128cfeb778772b2634e70 100644
--- a/Tests/Core/Surfaces/DetectorElementStub.hpp
+++ b/Tests/Core/Surfaces/DetectorElementStub.hpp
@@ -114,7 +114,7 @@ public:
}
/// Destructor
- ~DetectorElementStub() { /*nop */}
+ ~DetectorElementStub() override { /*nop */}
/// Identifier
Identifier
@@ -196,4 +196,4 @@ DetectorElementStub::thickness() const
return m_elementThickness;
}
-} // end of ns
\ No newline at end of file
+} // end of ns
diff --git a/Tests/Core/Surfaces/SurfaceBoundsTests.cpp b/Tests/Core/Surfaces/SurfaceBoundsTests.cpp
index 163dcd79b973cd9a8c77771c82fce695d3b97e33..37a544d3efc5e05d2f8dafe4a6dec30d1f18c194 100644
--- a/Tests/Core/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/Core/Surfaces/SurfaceBoundsTests.cpp
@@ -35,7 +35,7 @@ public:
m_values[i] = i;
}
}
- virtual ~SurfaceBoundsStub() { /*nop*/}
+ ~SurfaceBoundsStub() override { /*nop*/}
SurfaceBounds*
clone() const final
{
@@ -47,7 +47,7 @@ public:
return SurfaceBounds::Other;
}
std::vector<TDD_real_t>
- valueStore() const
+ valueStore() const override
{
return m_values;
}
@@ -69,7 +69,7 @@ public:
}
variant_data
- toVariantData() const
+ toVariantData() const override
{
return variant_data();
}
diff --git a/Tests/Core/Surfaces/SurfaceStub.hpp b/Tests/Core/Surfaces/SurfaceStub.hpp
index f465f68f1e864bc15d788f68abe6ea6c4d83d92e..6064d4b6ce9b92312b4b81d4d9990a584b8918c8 100644
--- a/Tests/Core/Surfaces/SurfaceStub.hpp
+++ b/Tests/Core/Surfaces/SurfaceStub.hpp
@@ -30,7 +30,7 @@ public:
{
}
- virtual ~SurfaceStub() { /*nop */}
+ ~SurfaceStub() override { /*nop */}
/// Implicit constructor
Surface*
@@ -133,7 +133,7 @@ public:
}
/// Conform to base class signature
- virtual variant_data
+ variant_data
toVariantData() const override
{
using namespace std::string_literals;