Skip to content

Commit

Permalink
fix clang warnings about missing override keyword
Browse files Browse the repository at this point in the history
Conflicts:
	TrackingTools/TrackAssociator/plugins/HcalDetIdAssociator.h
  • Loading branch information
gartung committed Dec 1, 2016
1 parent 4589ff1 commit 7751b2b
Show file tree
Hide file tree
Showing 337 changed files with 632 additions and 632 deletions.
10 changes: 5 additions & 5 deletions CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ class CaloTPGTranscoderULUT : public CaloTPGTranscoder {
const std::string& decompressionFile="");
virtual ~CaloTPGTranscoderULUT();
virtual HcalTriggerPrimitiveSample hcalCompress(const HcalTrigTowerDetId& id, unsigned int sample, int fineGrain) const override;
virtual EcalTriggerPrimitiveSample ecalCompress(const EcalTrigTowerDetId& id, unsigned int sample, bool fineGrain) const;
virtual EcalTriggerPrimitiveSample ecalCompress(const EcalTrigTowerDetId& id, unsigned int sample, bool fineGrain) const override;

virtual void rctEGammaUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc,
const EcalTrigTowerDetId& eid, const EcalTriggerPrimitiveSample& ec,
unsigned int& et, bool& egVecto, bool& activity) const;
unsigned int& et, bool& egVecto, bool& activity) const override;
virtual void rctJetUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc,
const EcalTrigTowerDetId& eid, const EcalTriggerPrimitiveSample& ec,
unsigned int& et) const;
virtual double hcaletValue(const int& ieta, const int& iphi, const int& version, const int& compressedValue) const;
virtual double hcaletValue(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc) const;
unsigned int& et) const override;
virtual double hcaletValue(const int& ieta, const int& iphi, const int& version, const int& compressedValue) const override;
virtual double hcaletValue(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc) const override;
virtual bool HTvalid(const int ieta, const int iphi, const int version) const;
virtual const std::vector<unsigned int> getCompressionLUT(const HcalTrigTowerDetId& id) const;
virtual void setup(HcalLutMetadata const&, HcalTrigTowerGeometry const&, int, int);
Expand Down
8 changes: 4 additions & 4 deletions CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ class HcaluLUTTPGCoder : public HcalTPGCoder {
virtual void adc2Linear(const HFDataFrame& df, IntegerCaloSamples& ics) const override;
virtual void adc2Linear(const QIE10DataFrame& df, IntegerCaloSamples& ics) const override;
virtual void adc2Linear(const QIE11DataFrame& df, IntegerCaloSamples& ics) const override;
virtual void compress(const IntegerCaloSamples& ics, const std::vector<bool>& featureBits, HcalTriggerPrimitiveDigi& tp) const;
virtual unsigned short adc2Linear(HcalQIESample sample,HcalDetId id) const;
virtual float getLUTPedestal(HcalDetId id) const;
virtual float getLUTGain(HcalDetId id) const;
virtual void compress(const IntegerCaloSamples& ics, const std::vector<bool>& featureBits, HcalTriggerPrimitiveDigi& tp) const override;
virtual unsigned short adc2Linear(HcalQIESample sample,HcalDetId id) const override;
virtual float getLUTPedestal(HcalDetId id) const override;
virtual float getLUTGain(HcalDetId id) const override;

void update(const HcalDbService& conditions);
void update(const char* filename, bool appendMSB = false);
Expand Down
2 changes: 1 addition & 1 deletion CalibFormats/SiPixelObjects/interface/PixelCalibBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace pos{
PixelCalibBase();
virtual ~PixelCalibBase();
virtual std::string mode() const {return mode_;}
virtual void writeXMLHeader( pos::PixelConfigKey &key,
virtual void writeXMLHeader( pos::PixelConfigKey key,
int version,
std::string path,
std::ofstream *out,
Expand Down
12 changes: 6 additions & 6 deletions CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ namespace pos{
const std::set <PixelModuleName>& moduleList() const {assert(rocAndModuleListsBuilt_); return modules_;}
const std::set <PixelChannel>& channelList() const {assert( objectsDependingOnTheNameTranslationBuilt_ ); return channels_;}

std::string mode() const {return mode_;}
std::string mode() const override {return mode_;}

bool singleROC() const {return singleROC_;}

Expand All @@ -172,22 +172,22 @@ namespace pos{

friend std::ostream& pos::operator<<(std::ostream& s, const PixelCalibConfiguration& calib);

virtual void writeASCII(std::string dir="") const;
void writeXML( pos::PixelConfigKey key, int version, std::string path) const {;}
virtual void writeASCII(std::string dir="") const override;
void writeXML( pos::PixelConfigKey key, int version, std::string path) const override{;}
virtual void writeXMLHeader( pos::PixelConfigKey key,
int version,
std::string path,
std::ofstream *out,
std::ofstream *out1 = NULL,
std::ofstream *out2 = NULL
) const ;
) const override;
virtual void writeXML( std::ofstream *out,
std::ofstream *out1 = NULL ,
std::ofstream *out2 = NULL ) const ;
std::ofstream *out2 = NULL ) const override;
virtual void writeXMLTrailer( std::ofstream *out,
std::ofstream *out1 = NULL,
std::ofstream *out2 = NULL
) const ;
) const override;


private:
Expand Down
10 changes: 5 additions & 5 deletions CalibFormats/SiPixelObjects/interface/PixelDelay25Calib.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ namespace pos{
PixelDelay25Calib(std::vector<std::vector<std::string> > &);
~PixelDelay25Calib();

virtual void writeASCII(std::string dir="") const;
void writeXML( pos::PixelConfigKey key, int version, std::string path) const {;}
virtual void writeASCII(std::string dir="") const override;
void writeXML( pos::PixelConfigKey key, int version, std::string path) const override {;}
virtual void writeXMLHeader( pos::PixelConfigKey key,
int version,
std::string path,
std::ofstream *out,
std::ofstream *out1 = NULL,
std::ofstream *out2 = NULL
) const ;
) const override;
virtual void writeXML( std::ofstream *out,
std::ofstream *out1 = NULL ,
std::ofstream *out2 = NULL ) const ;
std::ofstream *out2 = NULL ) const override;
virtual void writeXMLTrailer( std::ofstream *out,
std::ofstream *out1 = NULL,
std::ofstream *out2 = NULL
) const ;
) const override;

std::set<std::string>& portcardList() {return portcardNames_;}
bool allPortcards() {return allPortcards_;}
Expand Down
6 changes: 3 additions & 3 deletions CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ class FakeTTrig : public edm::EDAnalyzer {
virtual ~FakeTTrig();

// Operations
virtual void beginRun(const edm::Run& run, const edm::EventSetup& setup );
virtual void beginRun(const edm::Run& run, const edm::EventSetup& setup ) override;
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
virtual void analyze(const edm::Event& event, const edm::EventSetup& setup){}
virtual void endJob();
virtual void analyze(const edm::Event& event, const edm::EventSetup& setup)override {}
virtual void endJob() override;

// TOF computation
double tofComputation(const DTSuperLayer* superlayer);
Expand Down
4 changes: 2 additions & 2 deletions Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class AnalyzerMinbias : public edm::EDAnalyzer {
~AnalyzerMinbias();

virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
virtual void beginJob() ;
virtual void endJob() ;
virtual void beginJob() override;
virtual void endJob() override;

private:

Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalCalibAlgos/test/HcalIsoTrkAnalyzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class HcalIsoTrkAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::

private:
virtual void analyze(edm::Event const&, edm::EventSetup const&) override;
virtual void beginJob() ;
virtual void beginJob() override;
virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
Expand Down
4 changes: 2 additions & 2 deletions Calibration/HcalCalibAlgos/test/RecAnalyzerMinbias.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class RecAnalyzerMinbias : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::

private:
virtual void analyze(edm::Event const&, edm::EventSetup const&) override;
virtual void beginJob() ;
virtual void endJob();
virtual void beginJob() override;
virtual void endJob() override;
virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
virtual void endRun(edm::Run const&, edm::EventSetup const&) override {}
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class IsoTrackCalibration : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm:

private:
virtual void analyze(edm::Event const&, edm::EventSetup const&) override;
virtual void beginJob() ;
virtual void beginJob() override;
virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
Expand Down
2 changes: 1 addition & 1 deletion Calibration/IsolatedParticles/plugins/StudyHLT.cc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class StudyHLT : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::one::Share

private:
virtual void analyze(edm::Event const&, edm::EventSetup const&) override;
virtual void beginJob() ;
virtual void beginJob() override;
virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
Expand Down
4 changes: 2 additions & 2 deletions CaloOnlineTools/HcalOnlineDb/src/WriteL1TriggerObjetsXml.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class WriteL1TriggerObjetsXml : public edm::one::EDAnalyzer<edm::one::WatchRuns>

private:
virtual void analyze(edm::Event const&, edm::EventSetup const&) override;
virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
virtual void endRun(edm::Run const&, edm::EventSetup const&) {}
virtual void beginRun(edm::Run const&, edm::EventSetup const&) override {}
virtual void endRun(edm::Run const&, edm::EventSetup const&) override {}

// ----------member data ---------------------------
std::string tagname_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class CandidateTriggerObjectProducer : public edm::EDProducer {

private:
virtual void beginRun(const edm::Run& iRun, edm::EventSetup const& iSetup) override;
virtual void beginJob() {} ;
virtual void beginJob() override {} ;
virtual void produce(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() {} ;
virtual void endJob() override {} ;

/// module config parameters
edm::InputTag triggerResultsTag_;
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Hcal/interface/StreamOutFormatTarget.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class XMLPARSER_EXPORT StreamOutFormatTarget : public XMLFormatTarget {
const XMLSize_t count,
XMLFormatter* const formatter) override;

virtual void flush();
virtual void flush() override;

private:
std::ostream* mStream;
Expand Down
4 changes: 2 additions & 2 deletions DPGAnalysis/Skims/interface/CSCSkim.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ class CSCSkim : public edm::EDFilter {
~CSCSkim();

// Analysis routines
virtual void beginJob() ;
virtual void beginJob() override;
virtual bool filter(edm::Event& event, const edm::EventSetup& eventSetup) override;
virtual void endJob() ;
virtual void endJob() override;

protected:

Expand Down
4 changes: 2 additions & 2 deletions DPGAnalysis/Skims/interface/EcalTangentFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class EcalTangentFilter : public edm::EDFilter {
~EcalTangentFilter();

private:
virtual void beginJob() ;
virtual void beginJob() override;
virtual bool filter(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() ;
virtual void endJob() override;

// ----------member data ---------------------------
int fNgood, fNtot, fEvt;
Expand Down
4 changes: 2 additions & 2 deletions DPGAnalysis/Skims/interface/MatchedProbeMaker.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class MatchedProbeMaker : public edm::EDProducer
~MatchedProbeMaker();

private:
virtual void beginJob() ;
virtual void beginJob() override;
virtual void produce(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() ;
virtual void endJob() override;

// ----------member data ---------------------------
edm::InputTag m_candidateSource;
Expand Down
4 changes: 2 additions & 2 deletions DPGAnalysis/Skims/interface/TagProbeMassEDMFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ class TagProbeMassEDMFilter : public edm::EDFilter
~TagProbeMassEDMFilter();

private:
virtual void beginJob() ;
virtual void beginJob() override;
virtual bool filter(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() ;
virtual void endJob() override;

// ----------member data ---------------------------
std::string tpMapName;
Expand Down
4 changes: 2 additions & 2 deletions DPGAnalysis/Skims/interface/TagProbeMassProducer.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ class TagProbeMassProducer : public edm::EDProducer
~TagProbeMassProducer();

private:
virtual void beginJob() ;
virtual void beginJob() override;
virtual void produce(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() ;
virtual void endJob() override;

bool isPassingProbe (const unsigned int iprobe) const;

Expand Down
4 changes: 2 additions & 2 deletions DPGAnalysis/Skims/interface/TriggerMatchProducer.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class TriggerMatchProducer : public edm::EDProducer

private:
virtual void beginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) override;
virtual void beginJob() ;
virtual void beginJob() override;
virtual void produce(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() ;
virtual void endJob() override;

// ----------member data --------------------------

Expand Down
2 changes: 1 addition & 1 deletion DQM/DataScouting/plugins/RazorVarAnalyzer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RazorVarAnalyzer : public ScoutingAnalyzerBase {
explicit RazorVarAnalyzer( const edm::ParameterSet & ) ;
virtual ~RazorVarAnalyzer() ;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
virtual void analyze( const edm::Event & , const edm::EventSetup & );
virtual void analyze( const edm::Event & , const edm::EventSetup & ) override;
private:
edm::InputTag m_eleCollectionTag;
edm::InputTag m_jetCollectionTag;
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalMonitorTasks/interface/LedTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace ecaldqm {

void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
private:
void setParams(edm::ParameterSet const&);
void setParams(edm::ParameterSet const&) override;

std::map<int, unsigned> wlToME_;

Expand Down
4 changes: 2 additions & 2 deletions DQM/L1TMonitor/interface/L1TCSCTF.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class L1TCSCTF : public thread_unsafe::DQMEDAnalyzer {

protected:
// Analyze
void analyze(const edm::Event& e, const edm::EventSetup& c);
virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&);
void analyze(const edm::Event& e, const edm::EventSetup& c) override;
virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
//virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ;

Expand Down
8 changes: 4 additions & 4 deletions DQM/L1TMonitor/interface/L1TGT.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ class L1TGT: public DQMEDAnalyzer {
protected:

//virtual void beginJob();
virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&);
virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ;
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;

/// end section
virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;


private:
Expand Down
2 changes: 1 addition & 1 deletion DQM/L1TMonitor/interface/L1TRate.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class L1TRate : public DQMEDAnalyzer {

virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override;
virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override;
virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&);
virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;

// Private methods
private:
Expand Down
2 changes: 1 addition & 1 deletion DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class L1TdeStage2CaloLayer1 : public DQMEDAnalyzer {
virtual ~L1TdeStage2CaloLayer1();

protected:
void analyze(const edm::Event& e, const edm::EventSetup& c);
void analyze(const edm::Event& e, const edm::EventSetup& c) override;
virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override;
virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/RCTMonitor/interface/RCTMonitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class RCTMonitor : public DQMEDAnalyzer {
~RCTMonitor();
void bookHistograms(DQMStore::IBooker&, edm::Run const&,
edm::EventSetup const&) override;
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
void FillRCT(const edm::Event&, const edm::EventSetup&);

private:
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorCluster/interface/MonitorLTC.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class MonitorLTC : public DQMEDAnalyzer {
public:
explicit MonitorLTC(const edm::ParameterSet&);
~MonitorLTC(){};
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
private:
DQMStore* dqmStore_;
Expand Down
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ class SiStripMonitorCluster : public DQMEDAnalyzer {
public:
explicit SiStripMonitorCluster(const edm::ParameterSet&);
~SiStripMonitorCluster();
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
void dqmBeginRun(const edm::Run&, const edm::EventSetup&) ;
void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;

struct ModMEs{ // MEs for one single detector module

Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class SiStripMonitorFilter : public DQMEDAnalyzer {
explicit SiStripMonitorFilter(const edm::ParameterSet&);
~SiStripMonitorFilter(){};

virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

private:
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class SiStripMonitorHLT : public DQMEDAnalyzer {
explicit SiStripMonitorHLT(const edm::ParameterSet&);
~SiStripMonitorHLT(){};

virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

private:
Expand Down
Loading

0 comments on commit 7751b2b

Please sign in to comment.