Skip to content

Commit

Permalink
Merge pull request #20756 from davidlange6/clangTidyCleanT1_CalibMuon
Browse files Browse the repository at this point in the history 
clang checks for CalibMuon subsystem
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 6, 2017
2 parents 4b54a5f + 7c0cd3b commit c511cf0
Show file tree
Hide file tree
Showing 63 changed files with 220 additions and 220 deletions.
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCBadChambersConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCBadChambersConditions(const edm::ParameterSet&);
~CSCBadChambersConditions();
~CSCBadChambersConditions() override;


inline static CSCBadChambers * prefillBadChambers();
Expand All @@ -31,7 +31,7 @@ class CSCBadChambersConditions: public edm::ESProducer, public edm::EventSetupRe

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCBadChambers *cndbBadChambers ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCBadStripsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCBadStripsConditions(const edm::ParameterSet&);
~CSCBadStripsConditions();
~CSCBadStripsConditions() override;


inline static CSCBadStrips * prefillBadStrips();
Expand All @@ -31,7 +31,7 @@ class CSCBadStripsConditions: public edm::ESProducer, public edm::EventSetupReco

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCBadStrips *cndbBadStrips ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCBadWiresConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCBadWiresConditions(const edm::ParameterSet&);
~CSCBadWiresConditions();
~CSCBadWiresConditions() override;


inline static CSCBadWires * prefillBadWires();
Expand All @@ -31,7 +31,7 @@ class CSCBadWiresConditions: public edm::ESProducer, public edm::EventSetupRecor

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCBadWires *cndbBadWires ;

};
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCChannelMapperESProducer.h
View file
Expand Up @@ -14,7 +14,7 @@ class CSCChannelMapperESProducer : public edm::ESProducer {
typedef std::shared_ptr<CSCChannelMapperBase> BSP_TYPE;

CSCChannelMapperESProducer(const edm::ParameterSet&);
~CSCChannelMapperESProducer();
~CSCChannelMapperESProducer() override;

BSP_TYPE produce(const CSCChannelMapperRecord&);

Expand Down
12 changes: 6 additions & 6 deletions CalibMuon/CSCCalibration/interface/CSCChannelMapperPostls1.h
View file
Expand Up @@ -30,23 +30,23 @@ class CSCChannelMapperPostls1 : public CSCChannelMapperBase {
public:

CSCChannelMapperPostls1() {}
~CSCChannelMapperPostls1() {}
~CSCChannelMapperPostls1() override {}

virtual std::string name() const {return "CSCChannelMapperPostls1";}
std::string name() const override {return "CSCChannelMapperPostls1";}

/// Return raw strip channel number for input geometrical channel number
int rawStripChannel( const CSCDetId& id, int igeom ) const;
int rawStripChannel( const CSCDetId& id, int igeom ) const override;

/// Return geometrical strip channel number for input raw channel number
int geomStripChannel( const CSCDetId& id, int iraw ) const ;
int geomStripChannel( const CSCDetId& id, int iraw ) const override ;

/// Offline conversion of a strip (geometric labelling) back to channel
/// (Postls1: 1-1 correspondence strip to channel)
int channelFromStrip( const CSCDetId& id, int strip ) const;
int channelFromStrip( const CSCDetId& id, int strip ) const override;

/// Construct raw CSCDetId matching supplied offline CSCDetid
/// (Postls1: leave ME1a detid alone)
CSCDetId rawCSCDetId( const CSCDetId& id ) const;
CSCDetId rawCSCDetId( const CSCDetId& id ) const override;

};

Expand Down
12 changes: 6 additions & 6 deletions CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h
View file
Expand Up @@ -32,23 +32,23 @@ class CSCChannelMapperStartup : public CSCChannelMapperBase {
public:

CSCChannelMapperStartup() {}
~CSCChannelMapperStartup() {}
~CSCChannelMapperStartup() override {}

virtual std::string name() const {return "CSCChannelMapperStartup";}
std::string name() const override {return "CSCChannelMapperStartup";}

/// Return raw strip channel number for input geometrical channel number
int rawStripChannel( const CSCDetId& id, int igeom ) const;
int rawStripChannel( const CSCDetId& id, int igeom ) const override;

/// Return geometrical strip channel number for input raw channel number
int geomStripChannel( const CSCDetId& id, int iraw ) const ;
int geomStripChannel( const CSCDetId& id, int iraw ) const override ;

/// Offline conversion of a strip (geometric labelling) back to channel
/// (Startup: convert the 48 strips of ME1A to 16 ganged channels.)
int channelFromStrip( const CSCDetId& id, int strip ) const;
int channelFromStrip( const CSCDetId& id, int strip ) const override;

/// Construct raw CSCDetId matching supplied offline CSCDetid
/// (Startup: return the ME11 CSCDetID when supplied with that for ME1A)
CSCDetId rawCSCDetId( const CSCDetId& id ) const;
CSCDetId rawCSCDetId( const CSCDetId& id ) const override;

};

Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h
View file
Expand Up @@ -21,7 +21,7 @@
class CSCChipSpeedCorrectionDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCChipSpeedCorrectionDBConditions(const edm::ParameterSet&);
~CSCChipSpeedCorrectionDBConditions();
~CSCChipSpeedCorrectionDBConditions() override;

inline static CSCDBChipSpeedCorrection * prefillDBChipSpeedCorrection(bool isForMC, std::string dataCorrFileName, float dataOffse);

Expand All @@ -31,7 +31,7 @@ class CSCChipSpeedCorrectionDBConditions: public edm::ESProducer, public edm::Ev

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCDBChipSpeedCorrection *cndbChipCorr ;

//Flag for determining if this is for setting MC or data corrections
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h
View file
Expand Up @@ -19,7 +19,7 @@
class CSCCrosstalkConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCCrosstalkConditions(const edm::ParameterSet&);
~CSCCrosstalkConditions();
~CSCCrosstalkConditions() override;


static CSCcrosstalk * prefillCrosstalk();
Expand All @@ -30,7 +30,7 @@ class CSCCrosstalkConditions: public edm::ESProducer, public edm::EventSetupReco

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCcrosstalk *cnCrosstalk ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCCrosstalkDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCCrosstalkDBConditions(const edm::ParameterSet&);
~CSCCrosstalkDBConditions();
~CSCCrosstalkDBConditions() override;


inline static CSCDBCrosstalk * prefillDBCrosstalk();
Expand All @@ -31,7 +31,7 @@ class CSCCrosstalkDBConditions: public edm::ESProducer, public edm::EventSetupRe

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;


CSCDBCrosstalk *cndbCrosstalk ;
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h
View file
Expand Up @@ -19,7 +19,7 @@
class CSCFakeCrosstalkConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakeCrosstalkConditions(const edm::ParameterSet&);
~CSCFakeCrosstalkConditions();
~CSCFakeCrosstalkConditions() override;

float mean,min,minchi;
int seed;long int M;
Expand All @@ -32,7 +32,7 @@ class CSCFakeCrosstalkConditions: public edm::ESProducer, public edm::EventSetup

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCcrosstalk *cncrosstalk ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCFakeDBCrosstalk: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakeDBCrosstalk(const edm::ParameterSet&);
~CSCFakeDBCrosstalk();
~CSCFakeDBCrosstalk() override;

inline static CSCDBCrosstalk * prefillDBCrosstalk();

Expand All @@ -30,7 +30,7 @@ class CSCFakeDBCrosstalk: public edm::ESProducer, public edm::EventSetupRecordIn

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
Pointer cndbCrosstalk ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h
View file
Expand Up @@ -20,15 +20,15 @@
class CSCFakeDBGains: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakeDBGains(const edm::ParameterSet&);
~CSCFakeDBGains();
~CSCFakeDBGains() override;

inline static CSCDBGains* prefillDBGains();

typedef std::shared_ptr<CSCDBGains> Pointer;
Pointer produceDBGains(const CSCDBGainsRcd&);

private:
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;

// member data
Pointer cndbGains ;
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCFakeDBNoiseMatrix: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakeDBNoiseMatrix(const edm::ParameterSet&);
~CSCFakeDBNoiseMatrix();
~CSCFakeDBNoiseMatrix() override;

inline static CSCDBNoiseMatrix * prefillDBNoiseMatrix();

Expand All @@ -30,7 +30,7 @@ class CSCFakeDBNoiseMatrix: public edm::ESProducer, public edm::EventSetupRecord

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
Pointer cndbNoiseMatrix ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCFakeDBPedestals: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakeDBPedestals(const edm::ParameterSet&);
~CSCFakeDBPedestals();
~CSCFakeDBPedestals() override;

inline static CSCDBPedestals * prefillDBPedestals();

Expand All @@ -30,7 +30,7 @@ class CSCFakeDBPedestals: public edm::ESProducer, public edm::EventSetupRecordIn

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;

Pointer cndbPedestals ;
};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCFakeGainsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakeGainsConditions(const edm::ParameterSet&);
~CSCFakeGainsConditions();
~CSCFakeGainsConditions() override;

float mean,min,minchi;
int seed;long int M;
Expand All @@ -33,7 +33,7 @@ class CSCFakeGainsConditions: public edm::ESProducer, public edm::EventSetupReco

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCGains *cngains ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h
View file
Expand Up @@ -20,15 +20,15 @@
class CSCFakeNoiseMatrixConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakeNoiseMatrixConditions(const edm::ParameterSet&);
~CSCFakeNoiseMatrixConditions();
~CSCFakeNoiseMatrixConditions() override;

void prefillNoiseMatrix();

typedef const CSCNoiseMatrix * ReturnType;
ReturnType produceNoiseMatrix(const CSCNoiseMatrixRcd&);

private:
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCNoiseMatrix *cnmatrix ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCFakePedestalsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCFakePedestalsConditions(const edm::ParameterSet&);
~CSCFakePedestalsConditions();
~CSCFakePedestalsConditions() override;

float meanped,meanrms;
int seed;long int M;
Expand All @@ -33,7 +33,7 @@ class CSCFakePedestalsConditions: public edm::ESProducer, public edm::EventSetup

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCPedestals *cnpedestals ;
};

Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCGainsConditions.h
View file
Expand Up @@ -19,7 +19,7 @@
class CSCGainsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCGainsConditions(const edm::ParameterSet&);
~CSCGainsConditions();
~CSCGainsConditions() override;

static CSCGains * prefillGains();

Expand All @@ -29,7 +29,7 @@ class CSCGainsConditions: public edm::ESProducer, public edm::EventSetupRecordIn

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCGains *cnGains ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h
View file
Expand Up @@ -20,7 +20,7 @@
class CSCGainsDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCGainsDBConditions(const edm::ParameterSet&);
~CSCGainsDBConditions();
~CSCGainsDBConditions() override;


inline static CSCDBGains * prefillDBGains();
Expand All @@ -31,7 +31,7 @@ class CSCGainsDBConditions: public edm::ESProducer, public edm::EventSetupRecord

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCDBGains *cndbGains ;

};
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h
View file
Expand Up @@ -21,7 +21,7 @@
class CSCGasGainCorrectionDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CSCGasGainCorrectionDBConditions(const edm::ParameterSet&);
~CSCGasGainCorrectionDBConditions();
~CSCGasGainCorrectionDBConditions() override;

inline static CSCDBGasGainCorrection * prefillDBGasGainCorrection(bool isForMC, std::string dataCorrFileName);

Expand All @@ -31,7 +31,7 @@ class CSCGasGainCorrectionDBConditions: public edm::ESProducer, public edm::Even

private:
// ----------member data ---------------------------
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
CSCDBGasGainCorrection *cndbGasGainCorr ;

//Flag for determining if this is for setting MC or data corrections
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/interface/CSCIndexerESProducer.h
View file
Expand Up @@ -14,7 +14,7 @@ class CSCIndexerESProducer : public edm::ESProducer {
typedef std::shared_ptr<CSCIndexerBase> BSP_TYPE;

CSCIndexerESProducer(const edm::ParameterSet&);
~CSCIndexerESProducer();
~CSCIndexerESProducer() override;

BSP_TYPE produce(const CSCIndexerRecord&);

Expand Down

0 comments on commit c511cf0

Please sign in to comment.