clang check RecoMET

afiqaize · Oct 9, 2017 · affc3af · affc3af
1 parent a37ee8e
commit affc3af
Show file tree

Hide file tree

Showing 67 changed files with 173 additions and 173 deletions.
diff --git a/RecoMET/METAlgorithms/interface/MuonMETInfo.h b/RecoMET/METAlgorithms/interface/MuonMETInfo.h
@@ -19,7 +19,7 @@ struct MuonMETInfo {
   MuonMETInfo():
   ecalE(0), hcalE(0), hoE(0),
   ecalPos(0,0,0),hcalPos(0,0,0), hoPos(0,0,0),
-  useAverage(0), useTkAssociatorPositions(0),useHO(0){ }
+  useAverage(false), useTkAssociatorPositions(false),useHO(false){ }
 
 };
 

diff --git a/RecoMET/METAlgorithms/interface/SignAlgoResolutions.h b/RecoMET/METAlgorithms/interface/SignAlgoResolutions.h
@@ -51,7 +51,7 @@ namespace metsig {
     double eval(const resolutionType & type, const resolutionFunc & func, const double & et, const double & phi, const double & eta) const; // for example getvalue(caloHF,ET,et,phi,eta,p);
     metsig::SigInputObj evalPF(const reco::PFCandidate* candidate) const;
     metsig::SigInputObj evalPFJet(const reco::PFJet *jet) const;
-    bool isFilled() const {return functionmap_.size()>0;}
+    bool isFilled() const {return !functionmap_.empty();}
 
   private:
     double getfunc(const resolutionType & type,const resolutionFunc & func,  std::vector<double> & x) const;

diff --git a/RecoMET/METAlgorithms/src/EcalHaloAlgo.cc b/RecoMET/METAlgorithms/src/EcalHaloAlgo.cc
@@ -26,7 +26,7 @@ EcalHaloAlgo::EcalHaloAlgo()
   SumEnergyThreshold = 0.;
   NHitsThreshold =0;
 
-  geo = 0;
+  geo = nullptr;
 }
 
 EcalHaloData EcalHaloAlgo::Calculate(const CaloGeometry& TheCaloGeometry, edm::Handle<reco::PhotonCollection>& ThePhotons, edm::Handle<reco::SuperClusterCollection>& TheSuperClusters, edm::Handle<EBRecHitCollection>& TheEBRecHits, edm::Handle<EERecHitCollection>& TheEERecHits, edm::Handle<ESRecHitCollection>& TheESRecHits, edm::Handle<HBHERecHitCollection>& TheHBHERecHits, const edm::EventSetup& TheSetup)
@@ -60,8 +60,8 @@ EcalHaloData EcalHaloAlgo::Calculate(const CaloGeometry& TheCaloGeometry, edm::H
 
       // Get Det Id of the rechit
       DetId id = DetId(hit->id()); 
-      const CaloSubdetectorGeometry* TheSubGeometry = 0;                                                                         
-      const CaloCellGeometry* cell = 0 ;                                                                                    
+      const CaloSubdetectorGeometry* TheSubGeometry = nullptr;                                                                         
+      const CaloCellGeometry* cell = nullptr ;                                                                                    
 
       // Get EB geometry 
       TheSubGeometry = TheCaloGeometry.getSubdetectorGeometry(DetId::Ecal, 1);                                                         
@@ -194,7 +194,7 @@ EcalHaloData EcalHaloAlgo::Calculate(const CaloGeometry& TheCaloGeometry, edm::H
 
 
 
-  geo = 0;
+  geo = nullptr;
   edm::ESHandle<CaloGeometry> pGeo;
   TheSetup.get<CaloGeometryRecord>().get(pGeo);
   geo = pGeo.product();

diff --git a/RecoMET/METAlgorithms/src/MuonMETAlgo.cc b/RecoMET/METAlgorithms/src/MuonMETAlgo.cc
@@ -8,7 +8,7 @@
 //
 
 //____________________________________________________________________________||
-#include <math.h>
+#include <cmath>
 #include <vector>
 #include "RecoMET/METAlgorithms/interface/MuonMETAlgo.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
@@ -72,7 +72,7 @@ template <class T> void MuonMETAlgo::MuonMETAlgo_run(const edm::View<reco::Muon>
       float deltay = muCorrData.corrY();
 
       const reco::Muon *mu = &inputMuons[i];
-      LorentzVector mup4 = mu->p4();
+      const LorentzVector& mup4 = mu->p4();
 
       sumMuPx    += mup4.px();
       sumMuPy    += mup4.py();

diff --git a/RecoMET/METAlgorithms/src/PFSpecificAlgo.cc b/RecoMET/METAlgorithms/src/PFSpecificAlgo.cc
@@ -14,7 +14,7 @@
 //____________________________________________________________________________||
 SpecificPFMETData PFSpecificAlgo::run(const edm::View<reco::Candidate>& pfCands)
 {
-  if(!pfCands.size()) return SpecificPFMETData();
+  if(pfCands.empty()) return SpecificPFMETData();
 
   double NeutralEMEt = 0.0;
   double NeutralHadEt = 0.0;

diff --git a/RecoMET/METAlgorithms/src/SignAlgoResolutions.cc b/RecoMET/METAlgorithms/src/SignAlgoResolutions.cc
@@ -23,7 +23,7 @@
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
 
 
-#include <math.h>
+#include <cmath>
 
 #include <cstdlib>
 #include <iostream>
@@ -33,8 +33,8 @@
 
 metsig::SignAlgoResolutions::SignAlgoResolutions(const edm::ParameterSet &iConfig):
     functionmap_(),
-    ptResol_(0),
-    phiResol_(0)
+    ptResol_(nullptr),
+    phiResol_(nullptr)
 {
   addResolutions(iConfig);
 }
@@ -338,7 +338,7 @@ double metsig::SignAlgoResolutions::EtFunction( const functionPars &x, const fun
 {
   if(par.size()<3)
     return 0.;
-  if(x.size()<1)
+  if(x.empty())
     return 0.;
   double et=x[0];
   if(et<=0.)
@@ -384,7 +384,7 @@ metsig::SignAlgoResolutions::initializeJetResolutions( const edm::ParameterSet &
   using namespace std;
 
   // only reinitialize the resolutsion if the pointers are zero
-  if ( ptResol_ == 0 ) {
+  if ( ptResol_ == nullptr ) {
     string resolutionsAlgo  = iConfig.getParameter<std::string>("resolutionsAlgo");     
     string resolutionsEra   = iConfig.getParameter<std::string>("resolutionsEra");     
 
@@ -398,8 +398,8 @@ metsig::SignAlgoResolutions::initializeJetResolutions( const edm::ParameterSet &
     if (stat(path.c_str(),&st)!=0) {
       cerr<<"ERROR: tried to set path but failed, abort."<<endl;
     }    
-    string era(resolutionsEra);
-    string alg(resolutionsAlgo);
+    const string& era(resolutionsEra);
+    const string& alg(resolutionsAlgo);
     string ptFileName  = path + "/" + era + "_PtResolution_" +alg+".txt";
     string phiFileName = path + "/" + era + "_PhiResolution_"+alg+".txt";
 

diff --git a/RecoMET/METAlgorithms/src/SignCaloSpecificAlgo.cc b/RecoMET/METAlgorithms/src/SignCaloSpecificAlgo.cc
@@ -108,7 +108,7 @@ SignCaloSpecificAlgo::makeVectorOutOfCaloTowers(edm::Handle<edm::View<reco::Cand
 		if(!noHF || subdet !=HcalForward)
 		  signInputVec.push_back(temp);
 
-		wasused=1;
+		wasused=true;
 		hadIsDone = true;
 	      }
 	    else if( !emIsDone && id.det() == DetId::Ecal )
@@ -133,7 +133,7 @@ SignCaloSpecificAlgo::makeVectorOutOfCaloTowers(edm::Handle<edm::View<reco::Cand
 		}
 		metsig::SigInputObj temp(sign_tower_type,sign_tower_et,sign_tower_phi,sign_tower_sigma_et,sign_tower_sigma_phi);
 		signInputVec.push_back(temp);
-		wasused=1;
+		wasused=true;
 		emIsDone = true;
 	      }
 	  }

diff --git a/RecoMET/METAlgorithms/src/SignPFSpecificAlgo.cc b/RecoMET/METAlgorithms/src/SignPFSpecificAlgo.cc
@@ -15,7 +15,7 @@
 
 //____________________________________________________________________________||
 metsig::SignPFSpecificAlgo::SignPFSpecificAlgo()
-: resolutions_(0), algo_()
+: resolutions_(nullptr), algo_()
 {
   clusteredParticlePtrs_.clear();
 }

diff --git a/RecoMET/METAlgorithms/src/TCMETAlgo.cc b/RecoMET/METAlgorithms/src/TCMETAlgo.cc
@@ -58,7 +58,7 @@ typedef math::XYZTLorentzVector LorentzVector;
 
 //____________________________________________________________________________||
 TCMETAlgo::TCMETAlgo()
-  : response_function_(0), showerRF_(0)
+  : response_function_(nullptr), showerRF_(nullptr)
 { }
 
 //____________________________________________________________________________||
@@ -142,7 +142,7 @@ void TCMETAlgo::configure(const edm::ParameterSet& iConfig, edm::ConsumesCollect
 
 
   showerRF_          = getResponseFunction_shower();
-  response_function_ = 0;
+  response_function_ = nullptr;
 
   int rfType = iConfig.getParameter<int>("rf_type");
 
@@ -675,7 +675,7 @@ bool TCMETAlgo::isGoodTrack(const reco::TrackRef track)
   if( !( ( track->qualityMask() & cut ) == cut ) ) return false;
 
   bool isGoodAlgo = false;
-  if( trkAlgos_.size() == 0 ) isGoodAlgo = true;
+  if( trkAlgos_.empty() ) isGoodAlgo = true;
   for( unsigned int i = 0; i < trkAlgos_.size(); i++ )
     {
       if( track->algo() == trkAlgos_.at(i) ) isGoodAlgo = true;

diff --git a/RecoMET/METFilters/interface/EcalBoundaryInfoCalculator.h b/RecoMET/METFilters/interface/EcalBoundaryInfoCalculator.h
@@ -128,7 +128,7 @@ template<class EcalDetId> class EcalBoundaryInfoCalculator {
             edm::LogWarning("EcalBoundaryInfoCalculator") << "ERROR - RecHit belongs to wrong sub detector";
         }
 
-        if (stati.size() > 0)
+        if (!stati.empty())
             return true;
         return false;
 

diff --git a/RecoMET/METFilters/plugins/BadGlobalMuonTagger.cc b/RecoMET/METFilters/plugins/BadGlobalMuonTagger.cc
@@ -14,9 +14,9 @@
 class BadGlobalMuonTagger : public edm::global::EDFilter<> {
     public:
         explicit BadGlobalMuonTagger(const edm::ParameterSet & iConfig);
-        virtual ~BadGlobalMuonTagger() {}
+        ~BadGlobalMuonTagger() override {}
 
-        virtual bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
+        bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
 
     private:
         edm::EDGetTokenT<edm::View<reco::Muon>> muons_;            
@@ -68,7 +68,7 @@ BadGlobalMuonTagger::filter(edm::StreamID iID, edm::Event & iEvent, const edm::E
     std::vector<int> goodMuon;
 
     iEvent.getByToken(vtx_,  vtx);
-    assert(vtx->size() >= 1);
+    assert(!vtx->empty());
     const auto &PV = vtx->front().position();
 
     std::unique_ptr<edm::PtrVector<reco::Muon>> out(new edm::PtrVector<reco::Muon>());

diff --git a/RecoMET/METFilters/plugins/BadParticleFilter.cc b/RecoMET/METFilters/plugins/BadParticleFilter.cc
@@ -27,10 +27,10 @@
 class BadParticleFilter : public edm::global::EDFilter<> {
 public:
   explicit BadParticleFilter(const edm::ParameterSet&);
-  ~BadParticleFilter();
+  ~BadParticleFilter() override;
 
 private:
-  virtual bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override;
+  bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override;
 
   // ----------member data ---------------------------
 

diff --git a/RecoMET/METFilters/plugins/CSCTightHalo2015Filter.cc b/RecoMET/METFilters/plugins/CSCTightHalo2015Filter.cc
@@ -9,11 +9,11 @@ class CSCTightHalo2015Filter : public edm::global::EDFilter<> {
   public:
 
     explicit CSCTightHalo2015Filter(const edm::ParameterSet & iConfig);
-    ~CSCTightHalo2015Filter() {}
+    ~CSCTightHalo2015Filter() override {}
 
   private:
 
-  virtual bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
+  bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
 
     const bool taggingMode_;
     edm::EDGetTokenT<reco::BeamHaloSummary> beamHaloSummaryToken_;

diff --git a/RecoMET/METFilters/plugins/CSCTightHaloFilter.cc b/RecoMET/METFilters/plugins/CSCTightHaloFilter.cc
@@ -9,11 +9,11 @@ class CSCTightHaloFilter : public edm::global::EDFilter<> {
   public:
 
     explicit CSCTightHaloFilter(const edm::ParameterSet & iConfig);
-    ~CSCTightHaloFilter() {}
+    ~CSCTightHaloFilter() override {}
 
   private:
 
-  virtual bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
+  bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
 
     const bool taggingMode_;
     edm::EDGetTokenT<reco::BeamHaloSummary> beamHaloSummaryToken_;

diff --git a/RecoMET/METFilters/plugins/CSCTightHaloTrkMuUnvetoFilter.cc b/RecoMET/METFilters/plugins/CSCTightHaloTrkMuUnvetoFilter.cc
@@ -9,11 +9,11 @@ class CSCTightHaloTrkMuUnvetoFilter : public edm::global::EDFilter<> {
   public:
 
     explicit CSCTightHaloTrkMuUnvetoFilter(const edm::ParameterSet & iConfig);
-    ~CSCTightHaloTrkMuUnvetoFilter() {}
+    ~CSCTightHaloTrkMuUnvetoFilter() override {}
 
   private:
 
-  virtual bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
+  bool filter(edm::StreamID iID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
 
     const bool taggingMode_;
     edm::EDGetTokenT<reco::BeamHaloSummary> beamHaloSummaryToken_;

diff --git a/RecoMET/METFilters/plugins/ChargedHadronTrackResolutionFilter.cc b/RecoMET/METFilters/plugins/ChargedHadronTrackResolutionFilter.cc
@@ -27,10 +27,10 @@
 class ChargedHadronTrackResolutionFilter : public edm::global::EDFilter<> {
 public:
   explicit ChargedHadronTrackResolutionFilter(const edm::ParameterSet&);
-  ~ChargedHadronTrackResolutionFilter();
+  ~ChargedHadronTrackResolutionFilter() override;
 
 private:
-  virtual bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override;
+  bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override;
 
       // ----------member data ---------------------------
 

diff --git a/RecoMET/METFilters/plugins/EEBadScFilter.cc b/RecoMET/METFilters/plugins/EEBadScFilter.cc
@@ -38,13 +38,13 @@ class EEBadScFilter : public edm::global::EDFilter<> {
   public:
 
     explicit EEBadScFilter(const edm::ParameterSet & iConfig);
-    ~EEBadScFilter() {}
+    ~EEBadScFilter() override {}
 
   private:
 
   // main filter function
 
-  virtual bool filter(edm::StreamID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
+  bool filter(edm::StreamID, edm::Event & iEvent, const edm::EventSetup & iSetup) const override;
 
   // function to calculate 5x5 energy and check rechit flags
 

diff --git a/RecoMET/METFilters/plugins/EENoiseFilter.cc b/RecoMET/METFilters/plugins/EENoiseFilter.cc
@@ -11,11 +11,11 @@ class EENoiseFilter : public edm::EDFilter {
   public:
 
     explicit EENoiseFilter(const edm::ParameterSet & iConfig);
-    ~EENoiseFilter() {}
+    ~EENoiseFilter() override {}
 
   private:
 
-    virtual bool filter(edm::Event & iEvent, const edm::EventSetup & iSetup) override;
+    bool filter(edm::Event & iEvent, const edm::EventSetup & iSetup) override;
 
     edm::EDGetTokenT<EcalRecHitCollection> ebRHSrcToken_;
     edm::EDGetTokenT<EcalRecHitCollection> eeRHSrcToken_;

diff --git a/RecoMET/METFilters/plugins/EcalDeadCellBoundaryEnergyFilter.cc b/RecoMET/METFilters/plugins/EcalDeadCellBoundaryEnergyFilter.cc
@@ -60,12 +60,12 @@
 class EcalDeadCellBoundaryEnergyFilter: public edm::global::EDFilter<> {
    public:
       explicit EcalDeadCellBoundaryEnergyFilter(const edm::ParameterSet&);
-      ~EcalDeadCellBoundaryEnergyFilter();
+      ~EcalDeadCellBoundaryEnergyFilter() override;
 
    private:
-      virtual void beginJob() override;
-      virtual bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
-      virtual void endJob() override;
+      void beginJob() override;
+      bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
+      void endJob() override;
 
       // ----------member data ---------------------------
       const int kMAX;
@@ -225,7 +225,7 @@ bool EcalDeadCellBoundaryEnergyFilter::filter(edm::StreamID, edm::Event& iEvent,
          }
 
          // RecHit is at EB boundary and should be processed
-         if (!detIdAlreadyChecked && deadNeighbourStati.size() == 0 && ebBoundaryCalc.checkRecHitHasInvalidNeighbour(
+         if (!detIdAlreadyChecked && deadNeighbourStati.empty() && ebBoundaryCalc.checkRecHitHasInvalidNeighbour(
                *hit, ecalStatus)) {
 
             BoundaryInformation gapinfo = ebBoundaryCalc.gapRecHits(
@@ -249,8 +249,8 @@ bool EcalDeadCellBoundaryEnergyFilter::filter(edm::StreamID, edm::Event& iEvent,
          }
 
          // RecHit is member of boundary and should be processed
-         if (!detIdAlreadyChecked && (passChannelLimitation || (limitDeadCellToChannelStatusEB_.size() == 0
-               && deadNeighbourStati.size() > 0))) {
+         if (!detIdAlreadyChecked && (passChannelLimitation || (limitDeadCellToChannelStatusEB_.empty()
+               && !deadNeighbourStati.empty()))) {
 
             BoundaryInformation boundinfo = ebBoundaryCalc.boundaryRecHits(
                   (const edm::Handle<EcalRecHitCollection>&) EBRecHits, (const EcalRecHit *) &(*hit), theCaloTopology,
@@ -319,7 +319,7 @@ bool EcalDeadCellBoundaryEnergyFilter::filter(edm::StreamID, edm::Event& iEvent,
          const CaloCellGeometry* cellGeom = subGeom->getGeometry(currDetId);
          double eta = cellGeom->getPosition().eta();
 
-         if (!detIdAlreadyChecked && deadNeighbourStati.size() == 0 && eeBoundaryCalc.checkRecHitHasInvalidNeighbour(
+         if (!detIdAlreadyChecked && deadNeighbourStati.empty() && eeBoundaryCalc.checkRecHitHasInvalidNeighbour(
                *hit, ecalStatus) && std::abs(eta) < 1.6) {
 
             BoundaryInformation gapinfo = eeBoundaryCalc.gapRecHits(
@@ -343,8 +343,8 @@ bool EcalDeadCellBoundaryEnergyFilter::filter(edm::StreamID, edm::Event& iEvent,
          }
 
          // RecHit is member of boundary and should be processed
-         if (!detIdAlreadyChecked && (passChannelLimitation || (limitDeadCellToChannelStatusEE_.size() == 0
-               && deadNeighbourStati.size() > 0))) {
+         if (!detIdAlreadyChecked && (passChannelLimitation || (limitDeadCellToChannelStatusEE_.empty()
+               && !deadNeighbourStati.empty()))) {
 
             BoundaryInformation boundinfo = eeBoundaryCalc.boundaryRecHits(
                   (const edm::Handle<EcalRecHitCollection>&) EERecHits, (const EcalRecHit *) &(*hit), theCaloTopology,

diff --git a/RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc b/RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc
@@ -97,14 +97,14 @@
 class EcalDeadCellDeltaRFilter : public edm::EDFilter {
 public:
   explicit EcalDeadCellDeltaRFilter(const edm::ParameterSet&);
-  ~EcalDeadCellDeltaRFilter();
+  ~EcalDeadCellDeltaRFilter() override;
 
 private:
-  virtual bool filter(edm::Event&, const edm::EventSetup&) override;
-  virtual void beginJob() override;
-  virtual void endJob() override;
-  virtual void beginRun(const edm::Run&, const edm::EventSetup&) override;
-  virtual void endRun(const edm::Run&, const edm::EventSetup&) override;
+  bool filter(edm::Event&, const edm::EventSetup&) override;
+  void beginJob() override;
+  void endJob() override;
+  void beginRun(const edm::Run&, const edm::EventSetup&) override;
+  void endRun(const edm::Run&, const edm::EventSetup&) override;
   virtual void envSet(const edm::EventSetup&);
 
   // ----------member data ---------------------------