clang check RecoBTau

cms-sw · Oct 8, 2017 · 0cf3507 · 0cf3507
1 parent 5349f79
commit 0cf3507
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/RecoBTau/JetCrystalsAssociator/src/JetCrystalsAssociator.cc b/RecoBTau/JetCrystalsAssociator/src/JetCrystalsAssociator.cc
@@ -68,10 +68,10 @@ class JetCrystalsAssociator : public edm::EDProducer {
 
    public:
       explicit JetCrystalsAssociator(const edm::ParameterSet&);
-      ~JetCrystalsAssociator();
+      ~JetCrystalsAssociator() override;
 
 
-      virtual void produce(edm::Event&, const edm::EventSetup&) override;
+      void produce(edm::Event&, const edm::EventSetup&) override;
    private:
       std::unique_ptr<JetCrystalsAssociationCollection> associate( 
           const edm::Handle<CaloJetCollection> & jets,
@@ -164,7 +164,7 @@ JetCrystalsAssociator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup
 		DetId id = theRecHit->detid();
 		const CaloCellGeometry* this_cell = EB->getGeometry(id);
 		if (this_cell) {
-		  GlobalPoint posi = this_cell->getPosition();
+		  const GlobalPoint& posi = this_cell->getPosition();
 		  double energy = theRecHit->energy();
 		  double eta = posi.eta();
 		  double phi = posi.phi();
@@ -183,7 +183,7 @@ JetCrystalsAssociator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup
 		DetId id = theRecHit->detid();
 		const CaloCellGeometry* this_cell = EE->getGeometry(id);
 		if (this_cell) {
-		  GlobalPoint posi = this_cell->getPosition();
+		  const GlobalPoint& posi = this_cell->getPosition();
 		  double energy = theRecHit->energy();
 		  double eta = posi.eta();
 		  double phi = posi.phi();

diff --git a/RecoBTau/JetTagComputer/interface/GenericMVAJetTagComputer.h b/RecoBTau/JetTagComputer/interface/GenericMVAJetTagComputer.h
@@ -16,11 +16,11 @@ class JetTagComputerRecord;
 class GenericMVAJetTagComputer : public JetTagComputer {
     public:
 	GenericMVAJetTagComputer(const edm::ParameterSet &parameters);
-	virtual ~GenericMVAJetTagComputer();
+	~GenericMVAJetTagComputer() override;
 
-	virtual void initialize(const JetTagComputerRecord &);
+	void initialize(const JetTagComputerRecord &) override;
 
-	virtual float discriminator(const TagInfoHelper &info) const;
+	float discriminator(const TagInfoHelper &info) const override;
 
 	virtual reco::TaggingVariableList
 	taggingVariables(const reco::BaseTagInfo &tagInfo) const;

diff --git a/RecoBTau/JetTagComputer/interface/JetTagComputerESProducer.h b/RecoBTau/JetTagComputer/interface/JetTagComputerESProducer.h
@@ -24,7 +24,7 @@ class JetTagComputerESProducer: public edm::ESProducer {
     m_jetTagComputer = std::make_shared<ConcreteJetTagComputer>(m_pset);
   }
 
-  virtual ~JetTagComputerESProducer() {
+  ~JetTagComputerESProducer() override {
   }
 
   std::shared_ptr<JetTagComputer> produce(const JetTagComputerRecord & record) {

diff --git a/RecoBTau/JetTagComputer/plugins/JetTagProducer.cc b/RecoBTau/JetTagComputer/plugins/JetTagProducer.cc
@@ -132,7 +132,7 @@ JetTagProducer::produce(Event& iEvent, const EventSetup& iSetup)
   // take first tagInfo
   Handle< View<BaseTagInfo> > &tagInfoHandle = tagInfoHandles[0];
   std::unique_ptr<JetTagCollection> jetTagCollection;
-  if (tagInfoHandle.product()->size() > 0) {
+  if (!tagInfoHandle.product()->empty()) {
     RefToBase<Jet> jj = tagInfoHandle->begin()->jet();
     jetTagCollection = std::make_unique<JetTagCollection>(edm::makeRefToBaseProdFrom(jj, iEvent));
   } else

diff --git a/RecoBTau/JetTagComputer/plugins/JetTagProducer.h b/RecoBTau/JetTagComputer/plugins/JetTagProducer.h
@@ -22,11 +22,11 @@
 class JetTagProducer : public edm::stream::EDProducer<> {
     public:
 	explicit JetTagProducer(const edm::ParameterSet&);
-	~JetTagProducer();
+	~JetTagProducer() override;
 	static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
 
     private:
-	virtual void produce(edm::Event&, const edm::EventSetup&);
+	void produce(edm::Event&, const edm::EventSetup&) override;
 
 	std::string				m_jetTagComputer;
 	std::vector<edm::EDGetTokenT<edm::View<reco::BaseTagInfo> > > token_tagInfos;

diff --git a/RecoBTau/JetTagComputer/src/GenericMVAComputerCache.cc b/RecoBTau/JetTagComputer/src/GenericMVAComputerCache.cc
@@ -52,7 +52,7 @@ GenericMVAComputer const* GenericMVAComputerCache::getComputer(int index) const
       << "Calibration record " << errorUpdatingLabel
       << " not found in MVAComputerContainer." << std::endl;
   }
-  return index >= 0 ? computers[index].computer.get() : 0;
+  return index >= 0 ? computers[index].computer.get() : nullptr;
 }
 
 bool GenericMVAComputerCache::isEmpty() const {