Merge pull request cms-sw#20850 from davidlange6/clangTidyCleanT2_Rec…

…oPixelVertexing Clang-tidy checks for RecoPixelVertexing
carolhungwt · Oct 10, 2017 · 424cb92 · 424cb92
2 parents 78c11d4 + 8255bdb
commit 424cb92
Show file tree

Hide file tree

Showing 59 changed files with 154 additions and 154 deletions.
diff --git a/RecoPixelVertexing/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc b/RecoPixelVertexing/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc
@@ -377,7 +377,7 @@ void PixelClusterShapeExtractor::analyzeRecTracks
         const SiPixelRecHit* pixelRecHit =
           dynamic_cast<const SiPixelRecHit *>(recHit);
 
-        if(pixelRecHit != 0)
+        if(pixelRecHit != nullptr)
           processRec(*pixelRecHit, theClusterShape, ldir, *clusterShapeCache, hrpc);
       }
     }

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilterESProducer.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilterESProducer.h
@@ -41,7 +41,7 @@ class ClusterShapeHitFilterESProducer : public edm::ESProducer
 {
  public:
   ClusterShapeHitFilterESProducer(const edm::ParameterSet&);
-  ~ClusterShapeHitFilterESProducer();
+  ~ClusterShapeHitFilterESProducer() override;
 
   typedef std::unique_ptr<ClusterShapeHitFilter> ReturnType;
   ReturnType produce(const ClusterShapeHitFilter::Record &);

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h
@@ -26,8 +26,8 @@ class ClusterShapeTrackFilter : public PixelTrackFilterBase
 {
  public:
   ClusterShapeTrackFilter(const SiPixelClusterShapeCache *cache, double ptmin, double ptmax, const edm::EventSetup& es);
-  virtual ~ClusterShapeTrackFilter();
-  virtual bool operator() (const reco::Track*, const std::vector<const TrackingRecHit *> &hits) const override;
+  ~ClusterShapeTrackFilter() override;
+  bool operator() (const reco::Track*, const std::vector<const TrackingRecHit *> &hits) const override;
 
  private:
   float areaParallelogram(const Global2DVector & a,

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrajectoryFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrajectoryFilter.h
@@ -19,17 +19,17 @@ class ClusterShapeTrajectoryFilter : public TrajectoryFilter {
  public:
   ClusterShapeTrajectoryFilter(const edm::ParameterSet& iConfig, edm::ConsumesCollector& iC);
 
-  virtual ~ClusterShapeTrajectoryFilter();
+  ~ClusterShapeTrajectoryFilter() override;
 
   void setEvent(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
 
-  virtual bool qualityFilter(const TempTrajectory&) const override;
-  virtual bool qualityFilter(const Trajectory&) const override;
+  bool qualityFilter(const TempTrajectory&) const override;
+  bool qualityFilter(const Trajectory&) const override;
 
-  virtual bool toBeContinued(TempTrajectory&) const override;
-  virtual bool toBeContinued(Trajectory&) const override;
+  bool toBeContinued(TempTrajectory&) const override;
+  bool toBeContinued(Trajectory&) const override;
 
-  virtual std::string name() const override { return "ClusterShapeTrajectoryFilter"; }
+  std::string name() const override { return "ClusterShapeTrajectoryFilter"; }
 
  private:
   edm::EDGetTokenT<SiPixelClusterShapeCache> theCacheToken;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/LowPtClusterShapeSeedComparitor.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/LowPtClusterShapeSeedComparitor.h
@@ -17,14 +17,14 @@ class LowPtClusterShapeSeedComparitor : public SeedComparitor
 {
  public:
   LowPtClusterShapeSeedComparitor(const edm::ParameterSet& ps, edm::ConsumesCollector& iC);
-  virtual ~LowPtClusterShapeSeedComparitor(){}
-  virtual void init(const edm::Event& e, const edm::EventSetup& es) ;
-  virtual bool compatible(const SeedingHitSet  &hits) const ;
-  virtual bool compatible(const TrajectoryStateOnSurface &,  
-                          SeedingHitSet::ConstRecHitPointer hit) const { return true; }
-  virtual bool compatible(const SeedingHitSet  &hits, 
+  ~LowPtClusterShapeSeedComparitor() override{}
+  void init(const edm::Event& e, const edm::EventSetup& es) override ;
+  bool compatible(const SeedingHitSet  &hits) const override ;
+  bool compatible(const TrajectoryStateOnSurface &,  
+                          SeedingHitSet::ConstRecHitPointer hit) const override { return true; }
+  bool compatible(const SeedingHitSet  &hits, 
                           const GlobalTrajectoryParameters &helixStateAtVertex,
-                          const FastHelix                  &helix) const { return true; }
+                          const FastHelix                  &helix) const override { return true; }
 
  private:
    /// something

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/PixelTripletLowPtGenerator.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/PixelTripletLowPtGenerator.h
@@ -27,9 +27,9 @@ class   PixelTripletLowPtGenerator :
  public:
    PixelTripletLowPtGenerator( const edm::ParameterSet& cfg, edm::ConsumesCollector& iC);
 
-  virtual ~PixelTripletLowPtGenerator();
+  ~PixelTripletLowPtGenerator() override;
 
-  virtual void hitTriplets( const TrackingRegion& region, OrderedHitTriplets & trs,
+  void hitTriplets( const TrackingRegion& region, OrderedHitTriplets & trs,
                             const edm::Event & ev, const edm::EventSetup& es,
                             const SeedingLayerSetsHits::SeedingLayerSet& pairLayers,
                             const std::vector<SeedingLayerSetsHits::SeedingLayer>& thirdLayers) override;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/StripSubClusterShapeTrajectoryFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/StripSubClusterShapeTrajectoryFilter.h
@@ -71,17 +71,17 @@ class StripSubClusterShapeTrajectoryFilter: public StripSubClusterShapeFilterBas
         StripSubClusterShapeTrajectoryFilter(const edm::ParameterSet &iConfig, edm::ConsumesCollector& iC):
             StripSubClusterShapeFilterBase(iConfig,iC) {}
 
-        virtual ~StripSubClusterShapeTrajectoryFilter() {}
+        ~StripSubClusterShapeTrajectoryFilter() override {}
 
-        virtual bool qualityFilter(const TempTrajectory&) const override;
-        virtual bool qualityFilter(const Trajectory&) const override;
+        bool qualityFilter(const TempTrajectory&) const override;
+        bool qualityFilter(const Trajectory&) const override;
 
-        virtual bool toBeContinued(TempTrajectory&) const override;
-        virtual bool toBeContinued(Trajectory&) const override;
+        bool toBeContinued(TempTrajectory&) const override;
+        bool toBeContinued(Trajectory&) const override;
 
-        virtual std::string name() const override { return "StripSubClusterShapeTrajectoryFilter"; }
+        std::string name() const override { return "StripSubClusterShapeTrajectoryFilter"; }
 
-        virtual void setEvent(const edm::Event & e, const edm::EventSetup & es) override {
+        void setEvent(const edm::Event & e, const edm::EventSetup & es) override {
             setEventBase(e,es);
         }
 
@@ -94,16 +94,16 @@ class StripSubClusterShapeSeedFilter: public StripSubClusterShapeFilterBase, pub
     public:
         StripSubClusterShapeSeedFilter(const edm::ParameterSet &iConfig, edm::ConsumesCollector& iC) ;
 
-        virtual ~StripSubClusterShapeSeedFilter() {}
+        ~StripSubClusterShapeSeedFilter() override {}
 
-        virtual void init(const edm::Event& ev, const edm::EventSetup& es) override {
+        void init(const edm::Event& ev, const edm::EventSetup& es) override {
             setEventBase(ev,es);
         }
         // implemented
-        virtual bool compatible(const TrajectoryStateOnSurface &tsos,  SeedingHitSet::ConstRecHitPointer hit) const override ;
+        bool compatible(const TrajectoryStateOnSurface &tsos,  SeedingHitSet::ConstRecHitPointer hit) const override ;
         // not implemented 
-        virtual bool compatible(const SeedingHitSet &hits) const override { return true; }
-        virtual bool compatible(const SeedingHitSet &hits, const GlobalTrajectoryParameters &helixStateAtVertex, const FastHelix &helix) const override ;
+        bool compatible(const SeedingHitSet &hits) const override { return true; }
+        bool compatible(const SeedingHitSet &hits, const GlobalTrajectoryParameters &helixStateAtVertex, const FastHelix &helix) const override ;
 
     protected:
         bool filterAtHelixStage_;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/TrackCleaner.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/TrackCleaner.h
@@ -16,10 +16,10 @@ class TrackCleaner : public PixelTrackCleaner
 {
   public:
     explicit TrackCleaner(const TrackerTopology *tTopo);
-    virtual ~TrackCleaner();
+    ~TrackCleaner() override;
 
-    virtual TracksWithRecHits cleanTracks
-      (const TracksWithRecHits & tracksWithRecHits) const;
+    TracksWithRecHits cleanTracks
+      (const TracksWithRecHits & tracksWithRecHits) const override;
 
   private:
     bool areSame(const TrackingRecHit * a,

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/TrackFitter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/TrackFitter.h
@@ -21,7 +21,7 @@ class TrackFitter : public PixelFitterBase
               const MagneticField *field, const TransientTrackingRecHitBuilder *ttrhBuilder):
     theES(es), theTracker(tracker), theField(field), theTTRecHitBuilder(ttrhBuilder)
   {}
-  virtual ~TrackFitter() { }
+  ~TrackFitter() override { }
 
   std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit *>& hits, const TrackingRegion& region) const override;
 

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ValidHitPairFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ValidHitPairFilter.h
@@ -21,8 +21,8 @@ class ValidHitPairFilter : public PixelTrackFilterBase
 {
 public:
   ValidHitPairFilter(const edm::EventSetup& es);
-  virtual ~ValidHitPairFilter();
-  virtual bool operator()(const reco::Track * track,
+  ~ValidHitPairFilter() override;
+  bool operator()(const reco::Track * track,
                           const std::vector<const TrackingRecHit *>& recHits) const override;
 
 private:

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/ClusterShapeSeedComparitor.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/ClusterShapeSeedComparitor.cc
@@ -25,12 +25,12 @@
 class PixelClusterShapeSeedComparitor : public SeedComparitor {
     public:
         PixelClusterShapeSeedComparitor(const edm::ParameterSet &cfg, edm::ConsumesCollector& iC) ;
-        virtual ~PixelClusterShapeSeedComparitor() ; 
-        virtual void init(const edm::Event& ev, const edm::EventSetup& es) override ;
-        virtual bool compatible(const SeedingHitSet  &hits) const override { return true; }
-        virtual bool compatible(const TrajectoryStateOnSurface &,
+        ~PixelClusterShapeSeedComparitor() override ; 
+        void init(const edm::Event& ev, const edm::EventSetup& es) override ;
+        bool compatible(const SeedingHitSet  &hits) const override { return true; }
+        bool compatible(const TrajectoryStateOnSurface &,
                 SeedingHitSet::ConstRecHitPointer hit) const override ;
-        virtual bool compatible(const SeedingHitSet  &hits, 
+        bool compatible(const SeedingHitSet  &hits, 
                 const GlobalTrajectoryParameters &helixStateAtVertex,
                 const FastHelix                  &helix) const override ;
 
@@ -126,24 +126,24 @@ PixelClusterShapeSeedComparitor::compatibleHit(const TrackingRecHit &hit, const
     if (hit.geographicalId().subdetId() <= 2) {
         if (!filterPixelHits_) return true;    
         const SiPixelRecHit *pixhit = dynamic_cast<const SiPixelRecHit *>(&hit);
-        if (pixhit == 0) throw cms::Exception("LogicError", "Found a valid hit on the pixel detector which is not a SiPixelRecHit\n");
+        if (pixhit == nullptr) throw cms::Exception("LogicError", "Found a valid hit on the pixel detector which is not a SiPixelRecHit\n");
         //printf("Cheching hi hit on detid %10d, local direction is x = %9.6f, y = %9.6f, z = %9.6f\n", hit.geographicalId().rawId(), direction.x(), direction.y(), direction.z());
         return filterHandle_->isCompatible(*pixhit, direction, *pixelClusterShapeCache_);
     } else {
         if (!filterStripHits_) return true;
         const std::type_info &tid = typeid(*&hit);
         if (tid == typeid(SiStripMatchedRecHit2D)) {
             const SiStripMatchedRecHit2D* matchedHit = dynamic_cast<const SiStripMatchedRecHit2D *>(&hit);
-            assert(matchedHit != 0);
+            assert(matchedHit != nullptr);
             return (filterHandle_->isCompatible(DetId(matchedHit->monoId()), matchedHit->monoCluster(), direction) &&
                     filterHandle_->isCompatible(DetId(matchedHit->stereoId()), matchedHit->stereoCluster(), direction));
         } else if (tid == typeid(SiStripRecHit2D)) {
             const SiStripRecHit2D* recHit = dynamic_cast<const SiStripRecHit2D *>(&hit);
-            assert(recHit != 0);
+            assert(recHit != nullptr);
             return filterHandle_->isCompatible(*recHit, direction);
         } else if (tid == typeid(ProjectedSiStripRecHit2D)) {
             const ProjectedSiStripRecHit2D* precHit = dynamic_cast<const ProjectedSiStripRecHit2D *>(&hit);
-            assert(precHit != 0);
+            assert(precHit != nullptr);
             return filterHandle_->isCompatible(precHit->originalHit(), direction);
         } else {
             //printf("Questo e' un %s, che ci fo?\n", tid.name());

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/ClusterShapeTrackFilterProducer.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/ClusterShapeTrackFilterProducer.cc
@@ -16,12 +16,12 @@
 class ClusterShapeTrackFilterProducer: public edm::global::EDProducer<> {
 public:
   explicit ClusterShapeTrackFilterProducer(const edm::ParameterSet& iConfig);
-  ~ClusterShapeTrackFilterProducer();
+  ~ClusterShapeTrackFilterProducer() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-  virtual void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
+  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
 
   edm::EDGetTokenT<SiPixelClusterShapeCache> clusterShapeCacheToken_;
   const double ptMin_;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc
@@ -96,7 +96,7 @@ void PixelVertexProducerClusters::produce
 
   auto vertices = std::make_unique<reco::VertexCollection>();
 
-  if(thePixelHits->size() > 0)
+  if(!thePixelHits->empty())
   {
     vector<VertexHit> hits;
 

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.h b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.h
@@ -14,8 +14,8 @@ class PixelVertexProducerClusters : public edm::global::EDProducer<>
 {
 public:
   explicit PixelVertexProducerClusters(const edm::ParameterSet& ps);
-  ~PixelVertexProducerClusters();
-  virtual void produce(edm::StreamID, edm::Event& ev, const edm::EventSetup& es) const override;
+  ~PixelVertexProducerClusters() override;
+  void produce(edm::StreamID, edm::Event& ev, const edm::EventSetup& es) const override;
 
 private:
   edm::EDGetTokenT<SiPixelRecHitCollection> pixelToken_;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerMedian.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerMedian.cc
@@ -74,7 +74,7 @@ void PixelVertexProducerMedian::produce
 
   auto vertices = std::make_unique<reco::VertexCollection>();
 
-  if(tracks.size() > 0)
+  if(!tracks.empty())
   {
   // Sort along vertex z position
   std::sort(tracks.begin(), tracks.end(), ComparePairs());

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerMedian.h b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerMedian.h
@@ -10,8 +10,8 @@ class PixelVertexProducerMedian : public edm::EDProducer
 {
 public:
   explicit PixelVertexProducerMedian(const edm::ParameterSet& ps);
-  ~PixelVertexProducerMedian();
-  virtual void produce(edm::Event& ev, const edm::EventSetup& es);
+  ~PixelVertexProducerMedian() override;
+  void produce(edm::Event& ev, const edm::EventSetup& es) override;
 
 private:
   edm::ParameterSet theConfig;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc
@@ -26,11 +26,11 @@
 class SiPixelClusterShapeCacheProducer: public edm::global::EDProducer<> {
 public:
   explicit SiPixelClusterShapeCacheProducer(const edm::ParameterSet& iConfig);
-  ~SiPixelClusterShapeCacheProducer();
+  ~SiPixelClusterShapeCacheProducer() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
-  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const;
+  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
 
 private:
   using InputCollection = edmNew::DetSetVector<SiPixelCluster>;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/TrackCleanerESProducer.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/TrackCleanerESProducer.cc
@@ -10,7 +10,7 @@
 class TrackCleanerESProducer: public edm::ESProducer {
 public:
   TrackCleanerESProducer(const edm::ParameterSet& iConfig);
-  ~TrackCleanerESProducer() = default;
+  ~TrackCleanerESProducer() override = default;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/TrackFitterProducer.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/TrackFitterProducer.cc
@@ -23,12 +23,12 @@
 class TrackFitterProducer: public edm::global::EDProducer<> {
 public:
   explicit TrackFitterProducer(const edm::ParameterSet& iConfig);
-  ~TrackFitterProducer() {}
+  ~TrackFitterProducer() override {}
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-  virtual void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
+  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
 
   std::string theTTRHBuilderName;
   edm::EDGetTokenT<reco::BeamSpot> theBeamSpotToken;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/TrackListCombiner.h b/RecoPixelVertexing/PixelLowPtUtilities/plugins/TrackListCombiner.h
@@ -15,8 +15,8 @@ class TrackListCombiner : public edm::global::EDProducer<>
 {
 public:
   explicit TrackListCombiner(const edm::ParameterSet& ps);
-  ~TrackListCombiner();
-  virtual void produce(edm::StreamID, edm::Event& ev, const edm::EventSetup& es) const override;
+  ~TrackListCombiner() override;
+  void produce(edm::StreamID, edm::Event& ev, const edm::EventSetup& es) const override;
 
 private:
   struct Tags {

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/ValidHitPairFilterProducer.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/ValidHitPairFilterProducer.cc
@@ -13,12 +13,12 @@
 class ValidHitPairFilterProducer: public edm::global::EDProducer<> {
 public:
   explicit ValidHitPairFilterProducer(const edm::ParameterSet& iConfig);
-  ~ValidHitPairFilterProducer();
+  ~ValidHitPairFilterProducer() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-  virtual void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
+  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
 };
 
 ValidHitPairFilterProducer::ValidHitPairFilterProducer(const edm::ParameterSet& iConfig) {