Skip to content

Commit

Permalink
DQM: fix clang warnings about missing override keyword
Browse files Browse the repository at this point in the history
  • Loading branch information
@gartung
gartung committed Nov 29, 2016
1 parent 5332703 commit e4e6f2c
Show file tree
Hide file tree
Showing 141 changed files with 432 additions and 432 deletions.
12 changes: 6 additions & 6 deletions DQM/BeamMonitor/plugins/AlcaBeamMonitor.h
View file
Expand Up @@ -32,12 +32,12 @@ class AlcaBeamMonitor : public edm::EDAnalyzer {

protected:

void beginJob (void);
void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup);
void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup);
void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup);
void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup);
void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup);
void beginJob (void) override;
void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override;
void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override;
void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override;
void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override;
void endJob (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup);

private:
Expand Down
12 changes: 6 additions & 6 deletions DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h
View file
Expand Up @@ -28,12 +28,12 @@ class AlcaBeamMonitorClient : public edm::EDAnalyzer {

protected:

void beginJob (void);
void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup);
void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup);
void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup);
void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup);
void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup);
void beginJob (void) override;
void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override;
void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override;
void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override;
void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override;
void endJob (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup);

private:
Expand Down
12 changes: 6 additions & 6 deletions DQM/BeamMonitor/plugins/BeamMonitor.h
View file
Expand Up @@ -39,20 +39,20 @@ class BeamMonitor : public edm::EDAnalyzer {
protected:

// BeginJob
void beginJob();
void beginJob() override;

// BeginRun
void beginRun(const edm::Run& r, const edm::EventSetup& c);
void beginRun(const edm::Run& r, const edm::EventSetup& c) override;

void analyze(const edm::Event& e, const edm::EventSetup& c) ;
void analyze(const edm::Event& e, const edm::EventSetup& c) override;

void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& context) ;
const edm::EventSetup& context) override;

void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& c);
const edm::EventSetup& c) override;
// EndRun
void endRun(const edm::Run& r, const edm::EventSetup& c);
void endRun(const edm::Run& r, const edm::EventSetup& c) override;
// Endjob
void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c);

Expand Down
12 changes: 6 additions & 6 deletions DQM/BeamMonitor/plugins/BeamMonitorBx.h
View file
Expand Up @@ -35,20 +35,20 @@ class BeamMonitorBx : public edm::EDAnalyzer {
protected:

// BeginJob
void beginJob();
void beginJob() override;

// BeginRun
void beginRun(const edm::Run& r, const edm::EventSetup& c);
void beginRun(const edm::Run& r, const edm::EventSetup& c) override;

void analyze(const edm::Event& e, const edm::EventSetup& c) ;
void analyze(const edm::Event& e, const edm::EventSetup& c) override;

void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& context) ;
const edm::EventSetup& context) override;

void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& c);
const edm::EventSetup& c) override;
// EndRun
void endRun(const edm::Run& r, const edm::EventSetup& c);
void endRun(const edm::Run& r, const edm::EventSetup& c) override;
// Endjob
void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c);

Expand Down
12 changes: 6 additions & 6 deletions DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.h
View file
Expand Up @@ -41,17 +41,17 @@ class BeamSpotProblemMonitor : public edm::EDAnalyzer {


// BeginJob
void beginJob();
void beginJob() override;

// BeginRun
void beginRun(const edm::Run& r, const edm::EventSetup& c);
void analyze(const edm::Event& e, const edm::EventSetup& c) ;
void beginRun(const edm::Run& r, const edm::EventSetup& c) override;
void analyze(const edm::Event& e, const edm::EventSetup& c) override;
void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& context) ;
const edm::EventSetup& context) override;
void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& c);
const edm::EventSetup& c) override;
// EndRun
void endRun(const edm::Run& r, const edm::EventSetup& c);
void endRun(const edm::Run& r, const edm::EventSetup& c) override;
// Endjob
void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c);

Expand Down
12 changes: 6 additions & 6 deletions DQM/BeamMonitor/plugins/TKStatus.h
View file
Expand Up @@ -30,20 +30,20 @@ class TKStatus : public edm::EDAnalyzer {
protected:

// BeginJob
void beginJob();
void beginJob() override;

// BeginRun
void beginRun(const edm::Run& r, const edm::EventSetup& c);
void beginRun(const edm::Run& r, const edm::EventSetup& c) override;

void analyze(const edm::Event& e, const edm::EventSetup& c) ;
void analyze(const edm::Event& e, const edm::EventSetup& c) override ;

void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& context) ;
const edm::EventSetup& context) override ;

void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& c);
const edm::EventSetup& c) override;
// EndRun
void endRun(const edm::Run& r, const edm::EventSetup& c);
void endRun(const edm::Run& r, const edm::EventSetup& c) override;
// Endjob
void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c);

Expand Down
6 changes: 3 additions & 3 deletions DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h
View file
Expand Up @@ -62,9 +62,9 @@ class Vx3DHLTAnalyzer : public DQMEDAnalyzer
double Gauss3DFunc(const double* par);

private:
void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup);
void beginLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup);
void endLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup);
void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
void beginLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup) override;
void endLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup) override;
void bookHistograms (DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

unsigned int HitCounter (const edm::Event& iEvent);
Expand Down
10 changes: 5 additions & 5 deletions DQM/CSCMonitorModule/plugins/CSCMonitorModule.h
View file
Expand Up @@ -110,7 +110,7 @@ class CSCMonitorModule: public DQMEDAnalyzer, public cscdqm::MonitorObjectProvid

public:

bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const {
bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const override {
// Check parameter values
if (crateId < MIN_CRATE_ID || crateId > MAX_CRATE_ID || dmbId < MIN_DMB_SLOT || dmbId > MAX_DMB_SLOT) {
return false;
Expand All @@ -119,7 +119,7 @@ class CSCMonitorModule: public DQMEDAnalyzer, public cscdqm::MonitorObjectProvid
return (detId.rawId() != 0);
}

cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req);
cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req) override;

/**
* EDAnalyzer Implementation
Expand All @@ -130,9 +130,9 @@ class CSCMonitorModule: public DQMEDAnalyzer, public cscdqm::MonitorObjectProvid
void beginJob() { }
// void beginRun(const edm::Run& r, const edm::EventSetup& c);
void setup() { }
void analyze(const edm::Event& e, const edm::EventSetup& c);
void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) { }
void endRun(const edm::Run& r, const edm::EventSetup& c) { }
void analyze(const edm::Event& e, const edm::EventSetup& c) override;
void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override { }
void endRun(const edm::Run& r, const edm::EventSetup& c) override { }
void endJob() { }
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

Expand Down
4 changes: 2 additions & 2 deletions DQM/CSCMonitorModule/plugins/CSCOfflineClient.h
View file
Expand Up @@ -89,8 +89,8 @@ class CSCOfflineClient: public DQMEDHarvester, public cscdqm::MonitorObjectProvi

public:

bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const { return false; }
cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req);
bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const override{ return false; }
cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req) override;

/**
* EDAnalyzer Implementation
Expand Down
8 changes: 4 additions & 4 deletions DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc
View file
Expand Up @@ -34,10 +34,10 @@ class TotemDAQTriggerDQMSource: public DQMEDAnalyzer
protected:
void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
void analyze(edm::Event const& e, edm::EventSetup const& eSetup);
void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup);
void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup);
void endRun(edm::Run const& run, edm::EventSetup const& eSetup);
void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override;
void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override;
void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;

private:
unsigned int verbosity;
Expand Down
8 changes: 4 additions & 4 deletions DQM/CTPPS/plugins/TotemRPDQMSource.cc
View file
Expand Up @@ -45,10 +45,10 @@ class TotemRPDQMSource: public DQMEDAnalyzer
protected:
void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
void analyze(edm::Event const& e, edm::EventSetup const& eSetup);
void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup);
void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup);
void endRun(edm::Run const& run, edm::EventSetup const& eSetup);
void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override;
void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override;
void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;

private:
unsigned int verbosity;
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/src/DTChamberEfficiencyClient.h
View file
Expand Up @@ -51,13 +51,13 @@ class DTChamberEfficiencyClient: public DQMEDHarvester{

protected:

void beginRun(const edm::Run& , const edm::EventSetup&);
void beginRun(const edm::Run& , const edm::EventSetup&) override;
void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;

/// book the report summary

void bookHistos(DQMStore::IBooker &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override;

private:

Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/src/DTChamberEfficiencyTest.h
View file
Expand Up @@ -65,7 +65,7 @@ class DTChamberEfficiencyTest: public DQMEDHarvester{
std::string getMEName(std::string histoTag, const DTChamberId & chID);

/// DQM Client Diagnostic
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override;



Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/src/DTDCSSummary.h
View file
Expand Up @@ -31,7 +31,7 @@ class DTDCSSummary : public DQMEDHarvester {
// Operations

void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &,
edm::LuminosityBlock const &, edm::EventSetup const &);
edm::LuminosityBlock const &, edm::EventSetup const &) override;

void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;

Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/src/DTDataIntegrityTest.h
View file
Expand Up @@ -45,7 +45,7 @@ class DTDataIntegrityTest: public DQMEDHarvester{
void bookHistos(DQMStore::IBooker &, std::string histoType, int dduId);

/// DQM Client Diagnostic
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override;

private:
int readOutToGeometry(int dduId, int rosNumber, int& wheel, int& sector);
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/src/DTOfflineSummaryClients.h
View file
Expand Up @@ -33,10 +33,10 @@ class DTOfflineSummaryClients: public DQMEDHarvester{
virtual ~DTOfflineSummaryClients();

/// BeginRun
void beginRun (const edm::Run& r, const edm::EventSetup& c);
void beginRun (const edm::Run& r, const edm::EventSetup& c) override;

/// EndLumi
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override;

/// EndJob
void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/src/DTResolutionTest.h
View file
Expand Up @@ -67,7 +67,7 @@ class DTResolutionTest: public DQMEDHarvester{
std::string getMEName2D(const DTSuperLayerId & slID);

/// DQM Client Diagnostic
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override;


private:
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/src/DTRunConditionVarClient.h
View file
Expand Up @@ -55,7 +55,7 @@ class DTRunConditionVarClient: public DQMEDHarvester{
/// Destructor
virtual ~DTRunConditionVarClient();

void beginRun(const edm::Run& r, const edm::EventSetup& c);
void beginRun(const edm::Run& r, const edm::EventSetup& c) override;

protected:

Expand All @@ -67,7 +67,7 @@ class DTRunConditionVarClient: public DQMEDHarvester{
int wh, int nbins, float min, float max, bool isVDCorr=false);

/// DQM Client Diagnostic
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override;


float varQuality(float var, float maxGood, float minBad);
Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorClient/src/DTSummaryClients.h
View file
Expand Up @@ -47,7 +47,7 @@ class DTSummaryClients: public DQMEDHarvester{

void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;

void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override;

private:

Expand Down
8 changes: 4 additions & 4 deletions DQM/DTMonitorModule/interface/DTDigiTask.h
View file
Expand Up @@ -61,7 +61,7 @@ class DTDigiTask: public DQMEDAnalyzer{

protected:

void dqmBeginRun(const edm::Run&, const edm::EventSetup&);
void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;

// Book the histograms
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
Expand All @@ -73,14 +73,14 @@ class DTDigiTask: public DQMEDAnalyzer{
void bookHistos(DQMStore::IBooker & ibooker, const int wheelId, std::string folder, std::string histoTag);

/// To reset the MEs
void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ;
void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup);
void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override;
void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup) override;

/// To map real channels
void channelsMap(const DTChamberId& dtCh, std::string histoTag);

/// Analyze
void analyze(const edm::Event& e, const edm::EventSetup& c);
void analyze(const edm::Event& e, const edm::EventSetup& c) override;


/// get the L1A source
Expand Down
4 changes: 2 additions & 2 deletions DQM/DTMonitorModule/src/DTChamberEfficiency.h
View file
Expand Up @@ -68,8 +68,8 @@ class DTChamberEfficiency : public DQMEDAnalyzer
~DTChamberEfficiency() ;

//Operations
void analyze(const edm::Event & event, const edm::EventSetup& eventSetup);
void dqmBeginRun(const edm::Run& , const edm::EventSetup&);
void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override;
void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override;

protected:
// Book the histograms
Expand Down
6 changes: 3 additions & 3 deletions DQM/DTMonitorModule/src/DTChamberEfficiencyTask.h
View file
Expand Up @@ -49,13 +49,13 @@ class DTChamberEfficiencyTask: public DQMEDAnalyzer{
virtual ~DTChamberEfficiencyTask();

/// BeginRun
void dqmBeginRun(const edm::Run& run, const edm::EventSetup& setup);
void dqmBeginRun(const edm::Run& run, const edm::EventSetup& setup) override;

/// To reset the MEs
void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ;
void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override;

// Operations
void analyze(const edm::Event& event, const edm::EventSetup& setup);
void analyze(const edm::Event& event, const edm::EventSetup& setup) override;

protected:
// Book the histograms
Expand Down
8 changes: 4 additions & 4 deletions DQM/DTMonitorModule/src/DTDCSByLumiTask.h
View file
Expand Up @@ -46,19 +46,19 @@ class DTDCSByLumiTask: public DQMEDAnalyzer{
protected:

/// Begin Run
void dqmBeginRun(const edm::Run&, const edm::EventSetup&);
void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;

// Book the histograms
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

/// By Lumi DCS DB Operation
void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ;
void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override;

/// By Lumi DCS DB Operation
void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup);
void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup) override;

/// Analyze
void analyze(const edm::Event& e, const edm::EventSetup& c);
void analyze(const edm::Event& e, const edm::EventSetup& c) override;

private:

Expand Down

0 comments on commit e4e6f2c

Please sign in to comment.