Skip to content

Commit

Permalink
Merge pull request #343 from gartung/Alignment-ReferenceTrajectories-…
Browse files Browse the repository at this point in the history
…add-override

override keywords added by the clang extras utility cpp11-migrate --add-override
  • Loading branch information
ktf committed Aug 15, 2013
2 parents 2097b6c + ad7b051 commit 7e68a66
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ class CombinedTrajectoryFactory : public TrajectoryFactoryBase

virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const ExternalPredictionCollection &external,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual CombinedTrajectoryFactory* clone() const { return new CombinedTrajectoryFactory(*this); }
virtual CombinedTrajectoryFactory* clone() const override { return new CombinedTrajectoryFactory(*this); }

private:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ class DualBzeroTrajectoryFactory : public TrajectoryFactoryBase
/// Produce the reference trajectories.
virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const ExternalPredictionCollection &external,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual DualBzeroTrajectoryFactory* clone() const { return new DualBzeroTrajectoryFactory(*this); }
virtual DualBzeroTrajectoryFactory* clone() const override { return new DualBzeroTrajectoryFactory(*this); }

protected:
struct DualBzeroTrajectoryInput
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ class DualTrajectoryFactory : public TrajectoryFactoryBase
/// Produce the reference trajectories.
virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const ExternalPredictionCollection &external,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual DualTrajectoryFactory* clone() const { return new DualTrajectoryFactory(*this); }
virtual DualTrajectoryFactory* clone() const override { return new DualTrajectoryFactory(*this); }

protected:
struct DualTrajectoryInput
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ class ReferenceTrajectoryFactory : public TrajectoryFactoryBase
/// Produce the reference trajectories.
virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const ExternalPredictionCollection &external,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual ReferenceTrajectoryFactory* clone() const { return new ReferenceTrajectoryFactory(*this); }
virtual ReferenceTrajectoryFactory* clone() const override { return new ReferenceTrajectoryFactory(*this); }

protected:
ReferenceTrajectoryFactory(const ReferenceTrajectoryFactory &other);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ class TwoBodyDecayTrajectoryFactory : public TrajectoryFactoryBase
/// Produce the trajectories.
virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
const ConstTrajTrackPairCollection &tracks,
const ExternalPredictionCollection &external,
const reco::BeamSpot &beamSpot) const;
const reco::BeamSpot &beamSpot) const override;

virtual TwoBodyDecayTrajectoryFactory* clone() const { return new TwoBodyDecayTrajectoryFactory(*this); }
virtual TwoBodyDecayTrajectoryFactory* clone() const override { return new TwoBodyDecayTrajectoryFactory(*this); }

protected:
const ReferenceTrajectoryCollection constructTrajectories(const ConstTrajTrackPairCollection &tracks,
Expand Down

0 comments on commit 7e68a66

Please sign in to comment.