pass code checks

cms-sw · Sep 1, 2017 · d37dcdc · d37dcdc
1 parent 93b7f22
commit d37dcdc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 28 deletions.
diff --git a/DQM/RPCMonitorDigi/interface/RPCEfficiency.h b/DQM/RPCMonitorDigi/interface/RPCEfficiency.h
@@ -95,12 +95,12 @@ class CSCStationIndex{
 class RPCEfficiency : public DQMEDAnalyzer {
    public:
       explicit RPCEfficiency(const edm::ParameterSet&);
-      ~RPCEfficiency();
+      ~RPCEfficiency() override;
 
 
  protected:
 
-      virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
+      void analyze(const edm::Event&, const edm::EventSetup&) override;
       void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
       void bookDetUnitSeg(DQMStore::IBooker &, RPCDetId & detId,int nstrips, std::string folder, std::map<std::string, MonitorElement*> & );
       std::map<DTStationIndex,std::set<RPCDetId> > rollstoreDT;

diff --git a/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h b/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h
@@ -15,18 +15,18 @@
 #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 
-#include<string>
-#include<map>
+#include <string>
+#include <array>
+#include <map>
 
-class RPCMonitorDigi : public DQMEDAnalyzer {
-   public:
+class RPCMonitorDigi : public DQMEDAnalyzer
+{
+public:
 	explicit RPCMonitorDigi( const edm::ParameterSet&);
-	~RPCMonitorDigi();
-
-
- protected:
+	~RPCMonitorDigi() override = default;
 
-	virtual void analyze( const edm::Event&, const edm::EventSetup& ) override;
+protected:
+	void analyze( const edm::Event&, const edm::EventSetup& ) override;
 	void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 	/// Booking of MonitoringElement for one RPCDetId (= roll)
 	void bookRollME(DQMStore::IBooker &, const RPCDetId& , const RPCGeometry* rpcGeo, const std::string &, std::map<std::string, MonitorElement*> &);
@@ -37,14 +37,14 @@ class RPCMonitorDigi : public DQMEDAnalyzer {
 	/// Booking of MonitoringElemnt at region (Barrel/Endcap) level
 	void bookRegionME(DQMStore::IBooker &,const std::string &, std::map<std::string, MonitorElement*> &);
 
-   private:
+private:
 
 	bool useMuonDigis_;
 
 	void performSourceOperation(std::map < RPCDetId , std::vector<RPCRecHit> > &, std::string );
 	int stripsInRoll(const RPCDetId& id, const RPCGeometry* rpcGeo) const;
 
-	static const std::string regionNames_[3];
+	static const std::array<std::string, 3> regionNames_;
 	std::string muonFolder_;
 	std::string noiseFolder_;
 	int counter;

diff --git a/DQM/RPCMonitorDigi/interface/utils.h b/DQM/RPCMonitorDigi/interface/utils.h
@@ -18,7 +18,7 @@ namespace rpcdqm{
     static void setNoAlphanumeric(MonitorElement* myMe)
     {
       // Set no-alphanumeric flag to avoid malfunctioning in multithread environment.
-      TH2* h2 = 0;
+      TH2* h2 = nullptr;
       if      ( myMe->kind() == MonitorElement::DQM_KIND_TH2F ) h2 = myMe->getTH2F();
       else if ( myMe->kind() == MonitorElement::DQM_KIND_TH2D ) h2 = myMe->getTH2D();
       if ( !h2 ) return;

diff --git a/DQM/RPCMonitorDigi/src/RPCMonitorDigi.cc b/DQM/RPCMonitorDigi/src/RPCMonitorDigi.cc
@@ -13,7 +13,7 @@
 #include <set>
 #include <sstream>
 
-const std::string RPCMonitorDigi::regionNames_[3] =  {"Endcap-", "Barrel", "Endcap+"};
+const std::array<std::string, 3> RPCMonitorDigi::regionNames_ = {{"Endcap-", "Barrel", "Endcap+"}};
 
 RPCMonitorDigi::RPCMonitorDigi( const edm::ParameterSet& pset )
  : counter(0),
@@ -39,9 +39,6 @@ RPCMonitorDigi::RPCMonitorDigi( const edm::ParameterSet& pset )
 
 }
 
-RPCMonitorDigi::~RPCMonitorDigi(){}
-
-
 void RPCMonitorDigi::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const &r, edm::EventSetup const & iSetup){
 
   edm::LogInfo ("rpcmonitordigi") <<"[RPCMonitorDigi]: Begin Run " ;
@@ -54,7 +51,7 @@ void RPCMonitorDigi::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const
   //loop on geometry to book all MEs
   edm::LogInfo ("rpcmonitordigi") <<"[RPCMonitorDigi]: Booking histograms per roll. " ;
   for (TrackingGeometry::DetContainer::const_iterator it=rpcGeo->dets().begin();it<rpcGeo->dets().end();it++){
-    if(dynamic_cast< const RPCChamber* >( *it ) != 0 ){
+    if(dynamic_cast< const RPCChamber* >( *it ) != nullptr ){
       const RPCChamber* ch = dynamic_cast< const RPCChamber* >( *it ); 
       std::vector< const RPCRoll*> roles = (ch->rolls());
       if(useRollInfo_){
@@ -152,7 +149,7 @@ void RPCMonitorDigi::analyze(const edm::Event& event,const edm::EventSetup& setu
 	  TrackingRecHit * tkRecHit = (*it)->clone();
 	  RPCRecHit* rpcRecHit = dynamic_cast<RPCRecHit*>(tkRecHit);
 	  int detId = (int)rpcRecHit->rpcId();
-	  if(rechitMuon.find(detId) == rechitMuon.end() || rechitMuon[detId].size() == 0){
+	  if(rechitMuon.find(detId) == rechitMuon.end() || rechitMuon[detId].empty() ){
 	    std::vector<RPCRecHit>  myVect(1,*rpcRecHit );	  
 	    rechitMuon[detId]= myVect;
 	  }else {
@@ -170,7 +167,7 @@ void RPCMonitorDigi::analyze(const edm::Event& event,const edm::EventSetup& setu
     if( NumberOfRecHitMuon_ && numMuons>0) { NumberOfRecHitMuon_->Fill( numRPCRecHit);}
 
     //Fill counter of RPC events with rechits associated in with a muon
-    if( muonRPCEvents_ != 0 && numRPCRecHit>0 )  {muonRPCEvents_->Fill(1);}
+    if( muonRPCEvents_ != nullptr && numRPCRecHit>0 )  {muonRPCEvents_->Fill(1);}
 
     //Perform client operation 
     this->performSourceOperation(rechitMuon, muonFolder_);
@@ -194,7 +191,7 @@ void RPCMonitorDigi::analyze(const edm::Event& event,const edm::EventSetup& setu
     for (rpcRecHitIter = rpcHits->begin(); rpcRecHitIter != rpcHits->end() ; rpcRecHitIter++) {
       RPCRecHit rpcRecHit = (*rpcRecHitIter);
       int detId = (int)rpcRecHit.rpcId();
-      if(rechitNoise.find(detId) == rechitNoise.end() || rechitNoise[detId].size() == 0){
+      if(rechitNoise.find(detId) == rechitNoise.end() || rechitNoise[detId].empty() ){
 	std::vector<RPCRecHit>  myVect(1,rpcRecHit );
 	rechitNoise[detId]= myVect;
       }else {
@@ -207,7 +204,7 @@ void RPCMonitorDigi::analyze(const edm::Event& event,const edm::EventSetup& setu
 
 
   //Fill counter for all RPC events 
-  if( noiseRPCEvents_ != 0 &&  !rechitNoise.empty())  {noiseRPCEvents_->Fill(1);}
+  if( noiseRPCEvents_ != nullptr &&  !rechitNoise.empty())  {noiseRPCEvents_->Fill(1);}
   //Perform client operation 
   this->performSourceOperation(rechitNoise, noiseFolder_);
 
@@ -218,7 +215,7 @@ void RPCMonitorDigi::performSourceOperation(  std::map<RPCDetId , std::vector<RP
 
   edm::LogInfo ("rpcmonitordigi") <<"[RPCMonitorDigi]: Performing DQM source operations for "; 
 
-  if(recHitMap.size()==0) {return;} //if  
+  if(recHitMap.empty()) return;
 
   std::map<std::string, std::map<std::string, MonitorElement*> >  meRollCollection ;
   std::map<std::string, MonitorElement*>   meWheelDisk ;
@@ -472,7 +469,3 @@ void RPCMonitorDigi::performSourceOperation(  std::map<RPCDetId , std::vector<RP
 
 }
 
-
-
-
-