Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clang-tidy checks for CalibCalorimetry subsystem #20755

Merged
merged 1 commit into from Oct 6, 2017
Merged

clang-tidy checks for CalibCalorimetry subsystem #20755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ void prefillMap(){
}


virtual void addCell(const DetId &cell, float scaling_factor)
void addCell(const DetId &cell, float scaling_factor) override
{
map_.setValue(cell.rawId(),scaling_factor);
}
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapHcal.h
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ void prefillMap(const HcalTopology & topology){
}


virtual void addCell(const DetId &cell, float scaling_factor)
void addCell(const DetId &cell, float scaling_factor) override
{
//mapHcal_.setValue(cell.rawId(),scaling_factor);
mapHcal_[cell.rawId()]=scaling_factor;
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibTools.h
View file
Open in desktop
Expand Up @@ -50,14 +50,14 @@
class CaloMiscalibTools : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CaloMiscalibTools(const edm::ParameterSet&);
~CaloMiscalibTools();
~CaloMiscalibTools() override;

typedef const EcalIntercalibConstants * ReturnType;

ReturnType produce(const EcalIntercalibConstantsRcd&);
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;

CaloMiscalibMapEcal map_;
std::string barrelfile_;
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibToolsMC.h
View file
Open in desktop
Expand Up @@ -50,14 +50,14 @@
class CaloMiscalibToolsMC : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
public:
CaloMiscalibToolsMC(const edm::ParameterSet&);
~CaloMiscalibToolsMC();
~CaloMiscalibToolsMC() override;

typedef const EcalIntercalibConstantsMC * ReturnType;

ReturnType produce(const EcalIntercalibConstantsMCRcd&);
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;

CaloMiscalibMapEcal map_;
std::string barrelfile_;
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloMiscalibTools/interface/EcalRecHitRecalib.h
View file
Open in desktop
Expand Up @@ -38,10 +38,10 @@
class EcalRecHitRecalib : public edm::EDProducer {
public:
explicit EcalRecHitRecalib(const edm::ParameterSet&);
~EcalRecHitRecalib();
~EcalRecHitRecalib() override;


virtual void produce(edm::Event &, const edm::EventSetup&);
void produce(edm::Event &, const edm::EventSetup&) override;
private:
// ----------member data ---------------------------

Expand Down
6 changes: 3 additions & 3 deletions CalibCalorimetry/CaloMiscalibTools/interface/HcalRecHitRecalib.h
View file
Open in desktop
Expand Up @@ -38,10 +38,10 @@ class HcalRecHitRecalib : public edm::EDProducer
{
public:
explicit HcalRecHitRecalib(const edm::ParameterSet&);
~HcalRecHitRecalib();
~HcalRecHitRecalib() override;

virtual void beginRun(const edm::Run&, const edm::EventSetup&) override;
virtual void produce(edm::Event &, const edm::EventSetup&) override;
void beginRun(const edm::Run&, const edm::EventSetup&) override;
void produce(edm::Event &, const edm::EventSetup&) override;

private:
edm::EDGetTokenT<HBHERecHitCollection> tok_hbhe_;
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.h
View file
Open in desktop
@@ -1,8 +1,8 @@
#ifndef _MISCALIB_READER_FROM_XML_DOM_UTILS_H
#define _MISCALIB_READER_FROM_XML_DOM_UTILS_H

#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <string>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/dom/DOMNamedNodeMap.hpp>
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ class MiscalibReaderFromXMLEcalBarrel : public MiscalibReaderFromXML
MiscalibReaderFromXMLEcalBarrel(CaloMiscalibMapEcal & map):MiscalibReaderFromXML(map){};


virtual DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute);
DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override;

EBDetId getCellFromAttributes(int ieta, int iphi);

Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ class MiscalibReaderFromXMLEcalEndcap : public MiscalibReaderFromXML
public:
MiscalibReaderFromXMLEcalEndcap(CaloMiscalibMapEcal & map):MiscalibReaderFromXML(map){};

virtual DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute);
DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override;

EEDetId getCellFromAttributes(int ix, int iy, int iz);

Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ class MiscalibReaderFromXMLHcal : public MiscalibReaderFromXML
MiscalibReaderFromXMLHcal(CaloMiscalibMapHcal & map):MiscalibReaderFromXML(map){};


virtual DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute);
DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override;

HcalDetId getCellFromAttributes(int idet, int ieta, int iphi, int idepth);

Expand Down
8 changes: 4 additions & 4 deletions CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstants.h
View file
Open in desktop
Expand Up @@ -25,13 +25,13 @@
class WriteEcalMiscalibConstants : public edm::EDAnalyzer {
public:
explicit WriteEcalMiscalibConstants(const edm::ParameterSet&);
~WriteEcalMiscalibConstants();
~WriteEcalMiscalibConstants() override;


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

// ----------member data ---------------------------
std::string newTagRequest_;
Expand Down
8 changes: 4 additions & 4 deletions CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstantsMC.h
View file
Open in desktop
Expand Up @@ -25,13 +25,13 @@
class WriteEcalMiscalibConstantsMC : public edm::EDAnalyzer {
public:
explicit WriteEcalMiscalibConstantsMC(const edm::ParameterSet&);
~WriteEcalMiscalibConstantsMC();
~WriteEcalMiscalibConstantsMC() override;


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

// ----------member data ---------------------------
std::string newTagRequest_;
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloMiscalibTools/plugins/EcalRecHitRecalib.cc
View file
Open in desktop
Expand Up @@ -45,8 +45,8 @@ EcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
Handle<EBRecHitCollection> barrelRecHitsHandle;
Handle<EERecHitCollection> endcapRecHitsHandle;

const EBRecHitCollection* EBRecHits = 0;
const EERecHitCollection* EERecHits = 0;
const EBRecHitCollection* EBRecHits = nullptr;
const EERecHitCollection* EERecHits = nullptr;

iEvent.getByLabel(ecalHitsProducer_,barrelHits_,barrelRecHitsHandle);
if (!barrelRecHitsHandle.isValid()) {
Expand Down
6 changes: 3 additions & 3 deletions CalibCalorimetry/CaloMiscalibTools/plugins/HcalRecHitRecalib.cc
View file
Open in desktop
Expand Up @@ -74,9 +74,9 @@ HcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
Handle<HFRecHitCollection> HFRecHitsHandle;
Handle<HORecHitCollection> HORecHitsHandle;

const HBHERecHitCollection* HBHERecHits = 0;
const HFRecHitCollection* HFRecHits = 0;
const HORecHitCollection* HORecHits = 0;
const HBHERecHitCollection* HBHERecHits = nullptr;
const HFRecHitCollection* HFRecHits = nullptr;
const HORecHitCollection* HORecHits = nullptr;

iEvent.getByToken(tok_hbhe_,HBHERecHitsHandle);
if (!HBHERecHitsHandle.isValid()) {
Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXML.cc
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
#include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.h"
#include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h"
#include "FWCore/Concurrency/interface/Xerces.h"
#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <string>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
class CaloTPGTranscoderULUTs : public edm::ESProducer {
public:
CaloTPGTranscoderULUTs(const edm::ParameterSet&);
~CaloTPGTranscoderULUTs();
~CaloTPGTranscoderULUTs() override;

typedef std::unique_ptr<CaloTPGTranscoder> ReturnType;

Expand Down
4 changes: 2 additions & 2 deletions CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
#include "Geometry/Records/interface/CaloGeometryRecord.h"
#include <iostream>
#include <fstream>
#include <math.h>
#include <cmath>

//#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EventSetup.h"
Expand All @@ -18,7 +18,7 @@ using namespace std;

CaloTPGTranscoderULUT::CaloTPGTranscoderULUT(const std::string& compressionFile,
const std::string& decompressionFile)
: theTopology(0),
: theTopology(nullptr),
nominal_gain_(0.), lsb_factor_(0.), rct_factor_(1.), nct_factor_(1.),
compressionFile_(compressionFile),
decompressionFile_(decompressionFile)
Expand Down
14 changes: 7 additions & 7 deletions CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h
View file
Open in desktop
Expand Up @@ -20,18 +20,18 @@ class CaloTPGTranscoderULUT : public CaloTPGTranscoder {
public:
CaloTPGTranscoderULUT(const std::string& compressionFile="",
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 override;
~CaloTPGTranscoderULUT() override;
HcalTriggerPrimitiveSample hcalCompress(const HcalTrigTowerDetId& id, unsigned int sample, int fineGrain) const override;
EcalTriggerPrimitiveSample ecalCompress(const EcalTrigTowerDetId& id, unsigned int sample, bool fineGrain) const override;

virtual void rctEGammaUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc,
void rctEGammaUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc,
const EcalTrigTowerDetId& eid, const EcalTriggerPrimitiveSample& ec,
unsigned int& et, bool& egVecto, bool& activity) const override;
virtual void rctJetUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc,
void rctJetUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc,
const EcalTrigTowerDetId& eid, const EcalTriggerPrimitiveSample& ec,
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;
double hcaletValue(const int& ieta, const int& iphi, const int& version, const int& compressedValue) const override;
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
6 changes: 3 additions & 3 deletions CalibCalorimetry/CastorCalib/interface/CastorPedestalsAnalysis.h
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@
#include "TCanvas.h"
#include "TStyle.h"

#include <math.h>
#include <cmath>
#include <iostream>
#include <map>
#include <iomanip>
Expand Down Expand Up @@ -76,9 +76,9 @@ class CastorPedestalsAnalysis : public edm::EDAnalyzer
//Constructor
CastorPedestalsAnalysis(const edm::ParameterSet& ps);
//Destructor
virtual ~CastorPedestalsAnalysis();
~CastorPedestalsAnalysis() override;
//Analysis
void analyze(const edm::Event & event, const edm::EventSetup& eventSetup);
void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override;

private:
//Container for data, 1 per channel
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.cc
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ CastorDbProducer::CastorDbProducer( const edm::ParameterSet& fConfig)
: ESProducer(),
mService (new CastorDbService (fConfig)),
mDumpRequest (),
mDumpStream(0)
mDumpStream(nullptr)
{
//the following line is needed to tell the framework what
// data is being produced
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.h
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ class CastorDbRecord;
class CastorDbProducer : public edm::ESProducer {
public:
CastorDbProducer( const edm::ParameterSet& );
~CastorDbProducer();
~CastorDbProducer() override;

std::shared_ptr<CastorDbService> produce( const CastorDbRecord& );

Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ namespace {

std::vector<HcalGenericDetId> allCells (bool h2_mode) {
static std::vector<HcalGenericDetId> result;
if (result.size () <= 0) {
if (result.empty()) {

CastorTopology castortopology;
HcalCastorDetId cell;
Expand Down
6 changes: 3 additions & 3 deletions CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.h
View file
Open in desktop
Expand Up @@ -25,14 +25,14 @@ class CastorHardcodeCalibrations : public edm::ESProducer,
{
public:
CastorHardcodeCalibrations (const edm::ParameterSet& );
~CastorHardcodeCalibrations ();
~CastorHardcodeCalibrations () override;

void produce () {};

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

std::unique_ptr<CastorPedestals> producePedestals (const CastorPedestalsRcd& rcd);
std::unique_ptr<CastorPedestalWidths> producePedestalWidths (const CastorPedestalWidthsRcd& rcd);
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CastorCalib/plugins/CastorPedestalsAnalysis.cc
View file
Open in desktop
Expand Up @@ -190,7 +190,7 @@ CastorPedestalsAnalysis::~CastorPedestalsAnalysis()
std::string name2 = tempstringout.str() + "_pedplots_2d.png";

TStyle *theStyle = new TStyle("style","null");
theStyle->SetPalette(1,0);
theStyle->SetPalette(1,nullptr);
theStyle->SetCanvasDefH(1200); //Height of canvas
theStyle->SetCanvasDefW(1600); //Width of canvas

Expand Down
6 changes: 3 additions & 3 deletions CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.h
View file
Open in desktop
Expand Up @@ -30,14 +30,14 @@ class CastorTextCalibrations : public edm::ESProducer,
{
public:
CastorTextCalibrations (const edm::ParameterSet& );
~CastorTextCalibrations ();
~CastorTextCalibrations () override;

void produce () {};

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

std::unique_ptr<CastorPedestals> producePedestals (const CastorPedestalsRcd& rcd);
std::unique_ptr<CastorPedestalWidths> producePedestalWidths (const CastorPedestalWidthsRcd& rcd);
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/CastorCalib/src/CastorAlgoUtils.cc
View file
Open in desktop
@@ -1,5 +1,5 @@
#include "CalibCalorimetry/CastorCalib/interface/CastorAlgoUtils.h"
#include <math.h>
#include <cmath>

namespace reco {
namespace castor {
Expand Down