diff --git a/DataFormats/TrackerRecHit2D/interface/VectorHit.h b/DataFormats/TrackerRecHit2D/interface/VectorHit.h index 2f54b77117c96..e32920337683d 100644 --- a/DataFormats/TrackerRecHit2D/interface/VectorHit.h +++ b/DataFormats/TrackerRecHit2D/interface/VectorHit.h @@ -72,7 +72,7 @@ class VectorHit final : public BaseTrackerRecHit { // returning methods LocalPoint localPosition() const override { return thePosition; } - virtual LocalVector localDirection() const { return theDirection; } + LocalVector localDirection() const { return theDirection; } const AlgebraicSymMatrix44& covMatrix() const; LocalError localPositionError() const override; LocalError localDirectionError() const; diff --git a/EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h b/EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h index ea7a3afadf46a..0c73e848fb9b7 100644 --- a/EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h +++ b/EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h @@ -84,7 +84,7 @@ namespace sistrip { //check FE unit APV addresses in FULL DEBUG header are equal to the APVe address if the majority was good bool checkFEUnitAPVAddresses() const; //do all corrupt buffer checks - virtual bool doCorruptBufferChecks() const; + bool doCorruptBufferChecks() const; //check that there are no errors in channel, APV or FEUnit status bits //these are done by channelGood(). Channels with bad status bits may be disabled so bad status bits do not usually indicate an error diff --git a/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRawModule.h b/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRawModule.h index d62e0e772cf05..d4644fd91d799 100644 --- a/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRawModule.h +++ b/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRawModule.h @@ -34,8 +34,8 @@ namespace sistrip { DigiToRawModule(const edm::ParameterSet&); ~DigiToRawModule() override; - virtual void beginJob() {} - virtual void endJob() {} + void beginJob() {} + void endJob() {} void produce(edm::Event&, const edm::EventSetup&) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h b/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h index 06d451935bf56..de7d2ab126e72 100644 --- a/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h +++ b/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h @@ -29,24 +29,24 @@ class MuonTransientTrackingRecHit final : public GenericTransientTrackingRecHit ~MuonTransientTrackingRecHit() override {} /// Direction in 3D for segments, otherwise (0,0,0) - virtual LocalVector localDirection() const; + LocalVector localDirection() const; /// Direction in 3D for segments, otherwise (0,0,0) - virtual GlobalVector globalDirection() const; + GlobalVector globalDirection() const; /// Error on the local direction - virtual LocalError localDirectionError() const; + LocalError localDirectionError() const; /// Error on the global direction - virtual GlobalError globalDirectionError() const; + GlobalError globalDirectionError() const; AlgebraicSymMatrix parametersError() const override; /// Chi square of the fit for segments, else 0 - virtual double chi2() const; + double chi2() const; /// Degrees of freedom for segments, else 0 - virtual int degreesOfFreedom() const; + int degreesOfFreedom() const; /// if this rec hit is a DT rec hit bool isDT() const; @@ -66,7 +66,7 @@ class MuonTransientTrackingRecHit final : public GenericTransientTrackingRecHit /// return the sub components of this transient rechit ConstRecHitContainer transientHits() const override; - /// FIXME virtual ConstMuonRecHitContainer specificTransientHits() const; + /// FIXME ConstMuonRecHitContainer specificTransientHits() const; static RecHitPointer build(const GeomDet* geom, const TrackingRecHit* rh) { return RecHitPointer(new MuonTransientTrackingRecHit(geom, rh)); diff --git a/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h b/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h index cf4e0c44b45ea..81479cb5f5654 100644 --- a/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h +++ b/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h @@ -30,7 +30,7 @@ class dso_internal GroupedCkfTrajectoryBuilder final : public BaseCkfTrajectoryB static void fillPSetDescription(edm::ParameterSetDescription& iDesc); /// set Event for the internal MeasurementTracker data member - // virtual void setEvent(const edm::Event& event) const; + // void setEvent(const edm::Event& event) const; /// trajectories building starting from a seed TrajectoryContainer trajectories(const TrajectorySeed&) const override; @@ -87,10 +87,10 @@ class dso_internal GroupedCkfTrajectoryBuilder final : public BaseCkfTrajectoryB protected: void setEvent_(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - virtual void analyseSeed(const TrajectorySeed& seed) const {} + void analyseSeed(const TrajectorySeed& seed) const {} - virtual void analyseMeasurements(const std::vector& meas, const Trajectory& traj) const {} - virtual void analyseResult(const TrajectoryContainer& result) const {} + void analyseMeasurements(const std::vector& meas, const Trajectory& traj) const {} + void analyseResult(const TrajectoryContainer& result) const {} private: // /// no copy constructor diff --git a/RecoTracker/TkDetLayers/src/CompositeTECPetal.h b/RecoTracker/TkDetLayers/src/CompositeTECPetal.h index b89bb2247a5f4..5029ebcbfb63e 100644 --- a/RecoTracker/TkDetLayers/src/CompositeTECPetal.h +++ b/RecoTracker/TkDetLayers/src/CompositeTECPetal.h @@ -27,9 +27,9 @@ class CompositeTECPetal final : public GeometricSearchDet { ~CompositeTECPetal() override __attribute__((cold)); // GeometricSearchDet interface - const BoundSurface& surface() const final { return *theDiskSector; } + const BoundSurface& surface() const override { return *theDiskSector; } //Extension of the interface - virtual const BoundDiskSector& specificSurface() const final { return *theDiskSector; } + const BoundDiskSector& specificSurface() const { return *theDiskSector; } // GeometricSearchDet interface const std::vector& basicComponents() const override { return theBasicComps; } diff --git a/RecoTracker/TkDetLayers/src/Phase1PixelBlade.h b/RecoTracker/TkDetLayers/src/Phase1PixelBlade.h index 012bda3a843ba..2dffcd9c882d4 100644 --- a/RecoTracker/TkDetLayers/src/Phase1PixelBlade.h +++ b/RecoTracker/TkDetLayers/src/Phase1PixelBlade.h @@ -37,7 +37,7 @@ class Phase1PixelBlade final : public GeometricSearchDet { std::vector& result) const override __attribute__((hot)); //Extension of the interface - virtual const BoundDiskSector& specificSurface() const { return *theDiskSector; } + const BoundDiskSector& specificSurface() const { return *theDiskSector; } private: // private methods for the implementation of groupedCompatibleDets() diff --git a/RecoTracker/TkDetLayers/src/Phase2EndcapRing.h b/RecoTracker/TkDetLayers/src/Phase2EndcapRing.h index e7096e0d54350..0c9ec107b1d49 100644 --- a/RecoTracker/TkDetLayers/src/Phase2EndcapRing.h +++ b/RecoTracker/TkDetLayers/src/Phase2EndcapRing.h @@ -35,7 +35,7 @@ class Phase2EndcapRing final : public GeometricSearchDet { std::vector& result) const override __attribute__((hot)); //Extension of interface - virtual const BoundDisk& specificSurface() const { return *theDisk; } + const BoundDisk& specificSurface() const { return *theDisk; } private: // private methods for the implementation of groupedCompatibleDets() diff --git a/RecoTracker/TkDetLayers/src/Phase2EndcapSingleRing.h b/RecoTracker/TkDetLayers/src/Phase2EndcapSingleRing.h index 2f00a63909161..d62b88225dcd0 100644 --- a/RecoTracker/TkDetLayers/src/Phase2EndcapSingleRing.h +++ b/RecoTracker/TkDetLayers/src/Phase2EndcapSingleRing.h @@ -32,7 +32,7 @@ class Phase2EndcapSingleRing final : public GeometricSearchDet { std::vector& result) const override; //Extension of interface - virtual const BoundDisk& specificSurface() const { return *theDisk; } + const BoundDisk& specificSurface() const { return *theDisk; } private: // private methods for the implementation of groupedCompatibleDets() diff --git a/RecoTracker/TkDetLayers/src/PixelBlade.h b/RecoTracker/TkDetLayers/src/PixelBlade.h index b78b6382a8b65..4c0519c6cf818 100644 --- a/RecoTracker/TkDetLayers/src/PixelBlade.h +++ b/RecoTracker/TkDetLayers/src/PixelBlade.h @@ -35,7 +35,7 @@ class PixelBlade final : public GeometricSearchDet { std::vector& result) const override __attribute__((hot)); //Extension of the interface - virtual const BoundDiskSector& specificSurface() const { return *theDiskSector; } + const BoundDiskSector& specificSurface() const { return *theDiskSector; } private: // private methods for the implementation of groupedCompatibleDets() diff --git a/RecoTracker/TkDetLayers/src/TIBRing.h b/RecoTracker/TkDetLayers/src/TIBRing.h index 67f44d2cf07c8..edb9dc956958a 100644 --- a/RecoTracker/TkDetLayers/src/TIBRing.h +++ b/RecoTracker/TkDetLayers/src/TIBRing.h @@ -36,7 +36,7 @@ class TIBRing final : public GeometricSearchDet { //--- Extension of the interface /// Return the ring surface as a - virtual const BoundCylinder& specificSurface() const { return *theCylinder; } + const BoundCylinder& specificSurface() const { return *theCylinder; } private: //general private methods diff --git a/RecoTracker/TkDetLayers/src/TIDRing.h b/RecoTracker/TkDetLayers/src/TIDRing.h index 163325a18133f..c3e1dff1367be 100644 --- a/RecoTracker/TkDetLayers/src/TIDRing.h +++ b/RecoTracker/TkDetLayers/src/TIDRing.h @@ -32,7 +32,7 @@ class TIDRing final : public GeometricSearchDet { std::vector& result) const override __attribute__((hot)); //Extension of interface - virtual const BoundDisk& specificSurface() const { return *theDisk; } + const BoundDisk& specificSurface() const { return *theDisk; } private: // private methods for the implementation of groupedCompatibleDets() diff --git a/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc b/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc index 0fb250f20c29b..04ca75cdb6fe1 100644 --- a/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc +++ b/RecoTracker/TkNavigation/plugins/NavigationSchoolESProducer.cc @@ -19,7 +19,7 @@ class dso_hidden NavigationSchoolESProducer final : public edm::ESProducer { typedef std::unique_ptr ReturnType; - virtual ReturnType produce(const NavigationSchoolRecord&); + ReturnType produce(const NavigationSchoolRecord&); static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/RecoTracker/TrackProducer/plugins/QualityFilter.cc b/RecoTracker/TrackProducer/plugins/QualityFilter.cc index 2ae059e26340e..eb82a0f8e04a1 100644 --- a/RecoTracker/TrackProducer/plugins/QualityFilter.cc +++ b/RecoTracker/TrackProducer/plugins/QualityFilter.cc @@ -15,7 +15,7 @@ class dso_hidden QualityFilter final : public edm::stream::EDProducer<> { private: void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob(); + void endJob(); // ----------member data --------------------------- private: diff --git a/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h b/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h index b11a998663a27..27d5169eaca54 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h +++ b/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h @@ -45,7 +45,7 @@ class TRecHit1DMomConstraint final : public TransientTrackingRecHit { bool canImproveWithTrack() const override { return false; } - virtual RecHitPointer clone(const TrajectoryStateOnSurface& ts) const { return RecHitPointer(clone()); } + RecHitPointer clone(const TrajectoryStateOnSurface& ts) const { return RecHitPointer(clone()); } const GeomDetUnit* detUnit() const override { return nullptr; } diff --git a/RecoTracker/TransientTrackingRecHit/interface/TRecHit2DPosConstraint.h b/RecoTracker/TransientTrackingRecHit/interface/TRecHit2DPosConstraint.h index 975abd338d9bf..b89b563391ac6 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/TRecHit2DPosConstraint.h +++ b/RecoTracker/TransientTrackingRecHit/interface/TRecHit2DPosConstraint.h @@ -54,7 +54,7 @@ class TRecHit2DPosConstraint final : public TrackingRecHit { bool canImproveWithTrack() const override { return false; } - virtual RecHitPointer clone(const TrajectoryStateOnSurface& ts) const { return RecHitPointer(clone()); } + RecHitPointer clone(const TrajectoryStateOnSurface& ts) const { return RecHitPointer(clone()); } static RecHitPointer build(const LocalPoint& pos, const LocalError& err, const Surface* surface) { return RecHitPointer(new TRecHit2DPosConstraint(pos, err, surface)); diff --git a/RecoTracker/TransientTrackingRecHit/interface/TRecHit5DParamConstraint.h b/RecoTracker/TransientTrackingRecHit/interface/TRecHit5DParamConstraint.h index 2826c0a511a84..70e3048586b5d 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/TRecHit5DParamConstraint.h +++ b/RecoTracker/TransientTrackingRecHit/interface/TRecHit5DParamConstraint.h @@ -58,7 +58,7 @@ class TRecHit5DParamConstraint final : public TrackingRecHit { } /// ???? - virtual RecHitPointer clone(const TrajectoryStateOnSurface& tsos) const { + RecHitPointer clone(const TrajectoryStateOnSurface& tsos) const { return RecHitPointer(new TRecHit5DParamConstraint(tsos)); } diff --git a/RecoVertex/KinematicFitPrimitives/interface/TrackKinematicStatePropagator.h b/RecoVertex/KinematicFitPrimitives/interface/TrackKinematicStatePropagator.h index 1c19edfdae66e..d4f2da465eeaa 100644 --- a/RecoVertex/KinematicFitPrimitives/interface/TrackKinematicStatePropagator.h +++ b/RecoVertex/KinematicFitPrimitives/interface/TrackKinematicStatePropagator.h @@ -40,11 +40,11 @@ class TrackKinematicStatePropagator final : public KinematicStatePropagator { * Internal private methods, distinguishing between the propagation of neutrals * and propagation of cahrged tracks. */ - virtual KinematicState propagateToTheTransversePCACharged(const KinematicState& state, - const GlobalPoint& referencePoint) const; + KinematicState propagateToTheTransversePCACharged(const KinematicState& state, + const GlobalPoint& referencePoint) const; - virtual KinematicState propagateToTheTransversePCANeutral(const KinematicState& state, - const GlobalPoint& referencePoint) const; + KinematicState propagateToTheTransversePCANeutral(const KinematicState& state, + const GlobalPoint& referencePoint) const; typedef Point3DBase GlobalPointDouble; typedef Vector3DBase GlobalVectorDouble; diff --git a/TrackingTools/GeomPropagators/interface/HelixExtrapolatorToLine2Order.h b/TrackingTools/GeomPropagators/interface/HelixExtrapolatorToLine2Order.h index 0edab6f6dad5f..ae30856994d08 100644 --- a/TrackingTools/GeomPropagators/interface/HelixExtrapolatorToLine2Order.h +++ b/TrackingTools/GeomPropagators/interface/HelixExtrapolatorToLine2Order.h @@ -61,7 +61,7 @@ class HelixExtrapolatorToLine2Order final : public HelixLineExtrapolation { private: /// common part for propagation to point and line - virtual std::pair pathLengthFromCoefficients(const double ceq[4]) const dso_internal; + std::pair pathLengthFromCoefficients(const double ceq[4]) const dso_internal; /// Solutions of 3rd order equation int solve3rdOrder(const double ceq[], double sol[]) const dso_internal; /// Solutions of 2nd order equation diff --git a/TrackingTools/GsfTracking/interface/GsfMultipleScatteringUpdator.h b/TrackingTools/GsfTracking/interface/GsfMultipleScatteringUpdator.h index 4654c782ea4ca..e679adf12095c 100644 --- a/TrackingTools/GsfTracking/interface/GsfMultipleScatteringUpdator.h +++ b/TrackingTools/GsfTracking/interface/GsfMultipleScatteringUpdator.h @@ -21,7 +21,7 @@ class GsfMultipleScatteringUpdator final : public GsfMaterialEffectsUpdator { /// Computation: generates vectors of weights, means and standard deviations void compute(const TrajectoryStateOnSurface&, const PropagationDirection, Effect[]) const override; - virtual size_t size() const { return 2; } + size_t size() const { return 2; } }; #endif diff --git a/TrackingTools/PatternTools/interface/TwoTrackMinimumDistance.h b/TrackingTools/PatternTools/interface/TwoTrackMinimumDistance.h index b19bb4e560e29..899e9c48fddb1 100644 --- a/TrackingTools/PatternTools/interface/TwoTrackMinimumDistance.h +++ b/TrackingTools/PatternTools/interface/TwoTrackMinimumDistance.h @@ -31,7 +31,7 @@ class TwoTrackMinimumDistance final : public ClosestApproachOnHelices { bool calculate(const FreeTrajectoryState& sta, const FreeTrajectoryState& stb) override; - virtual bool calculate(const GlobalTrajectoryParameters& sta, const GlobalTrajectoryParameters& stb); + bool calculate(const GlobalTrajectoryParameters& sta, const GlobalTrajectoryParameters& stb); bool status() const override { return status_; }