Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DataFormats/TrackerRecHit2D/interface/VectorHit.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRawModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
Expand Down
8 changes: 4 additions & 4 deletions RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<TM>& meas, const Trajectory& traj) const {}
virtual void analyseResult(const TrajectoryContainer& result) const {}
void analyseMeasurements(const std::vector<TM>& meas, const Trajectory& traj) const {}
void analyseResult(const TrajectoryContainer& result) const {}

private:
// /// no copy constructor
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/TkDetLayers/src/CompositeTECPetal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<const GeomDet*>& basicComponents() const override { return theBasicComps; }
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkDetLayers/src/Phase1PixelBlade.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Phase1PixelBlade final : public GeometricSearchDet {
std::vector<DetGroup>& 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()
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkDetLayers/src/Phase2EndcapRing.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Phase2EndcapRing final : public GeometricSearchDet {
std::vector<DetGroup>& 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()
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkDetLayers/src/Phase2EndcapSingleRing.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Phase2EndcapSingleRing final : public GeometricSearchDet {
std::vector<DetGroup>& 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()
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkDetLayers/src/PixelBlade.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class PixelBlade final : public GeometricSearchDet {
std::vector<DetGroup>& 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()
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkDetLayers/src/TIBRing.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkDetLayers/src/TIDRing.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class TIDRing final : public GeometricSearchDet {
std::vector<DetGroup>& 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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class dso_hidden NavigationSchoolESProducer final : public edm::ESProducer {

typedef std::unique_ptr<NavigationSchool> ReturnType;

virtual ReturnType produce(const NavigationSchoolRecord&);
ReturnType produce(const NavigationSchoolRecord&);

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TrackProducer/plugins/QualityFilter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<double, GlobalTag> GlobalPointDouble;
typedef Vector3DBase<double, GlobalTag> GlobalVectorDouble;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class HelixExtrapolatorToLine2Order final : public HelixLineExtrapolation {

private:
/// common part for propagation to point and line
virtual std::pair<bool, double> pathLengthFromCoefficients(const double ceq[4]) const dso_internal;
std::pair<bool, double> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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_; }

Expand Down