Skip to content

Commit

Permalink
Merge pull request #20779 from davidlange6/clangTidyCleanT2_CaloOnlin…
Browse files Browse the repository at this point in the history 
…eTools

Clang-tidy checks for CaloOnlineTools
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 7, 2017
2 parents 069ac49 + 1fa2d64 commit bce75f1
Show file tree
Hide file tree
Showing 46 changed files with 240 additions and 240 deletions.
8 changes: 4 additions & 4 deletions CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.h
View file
Expand Up @@ -50,13 +50,13 @@
class EcalBxOrbitNumberGrapher : public edm::EDAnalyzer {
public:
explicit EcalBxOrbitNumberGrapher(const edm::ParameterSet&);
~EcalBxOrbitNumberGrapher();
~EcalBxOrbitNumberGrapher() 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 ;
void initHists(int);

// ----------member data ---------------------------
Expand Down
48 changes: 24 additions & 24 deletions CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc
View file
Expand Up @@ -198,7 +198,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
int myRunType = headerItr->getRunType();
int FEDid = headerItr->fedId();
TH2F* dccRuntypeHist = FEDsAndDCCRuntypeVsBxHists_[FEDid];
if(dccRuntypeHist==0)
if(dccRuntypeHist==nullptr)
{
initHists(FEDid);
dccRuntypeHist = FEDsAndDCCRuntypeVsBxHists_[FEDid];
Expand Down Expand Up @@ -358,7 +358,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
TH2F* timingHistVsPhi = FEDsAndTimingVsPhiHists_[FEDid];
TH2F* timingHistVsModule = FEDsAndTimingVsModuleHists_[FEDid];

if(uRecHist==0)
if(uRecHist==nullptr)
{
initHists(FEDid);
uRecHist = FEDsAndHists_[FEDid];
Expand Down Expand Up @@ -1067,7 +1067,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
// << " crossedEcalRecHits size: " << info.crossedEcalRecHits.size();
numberofCrossedEcalIdsHist_->Fill(info.crossedEcalIds.size());
tracks++;
if(info.crossedEcalIds.size()>0)
if(!info.crossedEcalIds.empty())
trackDetIdMap.insert(std::pair<int,std::vector<DetId> > (tracks,info.crossedEcalIds));
}

Expand All @@ -1078,7 +1078,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
edm::LogVerbatim("TrackAssociator") << "Matching cosmic clusters to tracks...";
int numSeeds = seeds.size();
int numTracks = trackDetIdMap.size();
while(seeds.size() > 0 && trackDetIdMap.size() > 0)
while(!seeds.empty() && !trackDetIdMap.empty())
{
double bestDr = 1000;
double bestDPhi = 1000;
Expand Down Expand Up @@ -1194,7 +1194,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
double phi = clus->phi();
double eta = clus->eta();

if (recoTracksBarrel->size()==0) HighEnergy_0tracks_occu3D->Fill(phi,eta,energy);
if (recoTracksBarrel->empty()) HighEnergy_0tracks_occu3D->Fill(phi,eta,energy);
if (recoTracksBarrel->size()==1) HighEnergy_1tracks_occu3D->Fill(phi,eta,energy);
if (recoTracksBarrel->size()==2) HighEnergy_2tracks_occu3D->Fill(phi,eta,energy);

Expand All @@ -1210,7 +1210,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
int ieta = ((EBDetId)(*detitr).first).ieta();
int iphi = ((EBDetId)(*detitr).first).iphi();
if (rechitenergy > minRecHitAmpEB_) {
if (recoTracksBarrel->size()==0) HighEnergy_0tracks_occu3DXtal->Fill(iphi,ieta,rechitenergy);
if (recoTracksBarrel->empty()) HighEnergy_0tracks_occu3DXtal->Fill(iphi,ieta,rechitenergy);
if (recoTracksBarrel->size()==1) HighEnergy_1tracks_occu3DXtal->Fill(iphi,ieta,rechitenergy);
if (recoTracksBarrel->size()==2) HighEnergy_2tracks_occu3DXtal->Fill(iphi,ieta,rechitenergy);

Expand Down Expand Up @@ -1426,23 +1426,23 @@ void EcalCosmicsHists::initHists(int FED)
int numBins = 200;//(int)round(histRangeMax_-histRangeMin_)+1;
TH1F* hist = new TH1F(name1.c_str(),title1.c_str(), numBins, histRangeMin_, histRangeMax_);
FEDsAndHists_[FED] = hist;
FEDsAndHists_[FED]->SetDirectory(0);
FEDsAndHists_[FED]->SetDirectory(nullptr);

TH1F* E2hist = new TH1F(Form("E2_FED_%d",FED),Form("E2_FED_%d",FED), numBins, histRangeMin_, histRangeMax_);
FEDsAndE2Hists_[FED] = E2hist;
FEDsAndE2Hists_[FED]->SetDirectory(0);
FEDsAndE2Hists_[FED]->SetDirectory(nullptr);

TH1F* energyhist = new TH1F(Form("Energy_FED_%d",FED),Form("Energy_FED_%d",FED), numBins, histRangeMin_, histRangeMax_);
FEDsAndenergyHists_[FED] = energyhist;
FEDsAndenergyHists_[FED]->SetDirectory(0);
FEDsAndenergyHists_[FED]->SetDirectory(nullptr);

TH2F* E2vsE1hist = new TH2F(Form("E2vsE1_FED_%d",FED),Form("E2vsE1_FED_%d",FED), numBins, histRangeMin_, histRangeMax_, numBins, histRangeMin_, histRangeMax_);
FEDsAndE2vsE1Hists_[FED] = E2vsE1hist;
FEDsAndE2vsE1Hists_[FED]->SetDirectory(0);
FEDsAndE2vsE1Hists_[FED]->SetDirectory(nullptr);

TH2F* energyvsE1hist = new TH2F(Form("EnergyvsE1_FED_%d",FED),Form("EnergyvsE1_FED_%d",FED), numBins, histRangeMin_, histRangeMax_, numBins, histRangeMin_, histRangeMax_);
FEDsAndenergyvsE1Hists_[FED] = energyvsE1hist;
FEDsAndenergyvsE1Hists_[FED]->SetDirectory(0);
FEDsAndenergyvsE1Hists_[FED]->SetDirectory(nullptr);

title1 = "Time for ";
title1.append(fedMap_->getSliceFromFed(FED));
Expand All @@ -1451,47 +1451,47 @@ void EcalCosmicsHists::initHists(int FED)
name1.append(intToString(FED));
TH1F* timingHist = new TH1F(name1.c_str(),title1.c_str(),78,-7,7);
FEDsAndTimingHists_[FED] = timingHist;
FEDsAndTimingHists_[FED]->SetDirectory(0);
FEDsAndTimingHists_[FED]->SetDirectory(nullptr);

TH1F* freqHist = new TH1F(Form("Frequency_FED_%d",FED),Form("Frequency for FED %d;Event Number",FED),100,0.,100000);
FEDsAndFrequencyHists_[FED] = freqHist;
FEDsAndFrequencyHists_[FED]->SetDirectory(0);
FEDsAndFrequencyHists_[FED]->SetDirectory(nullptr);

TH1F* iphiProfileHist = new TH1F(Form("iPhi_Profile_FED_%d",FED),Form("iPhi Profile for FED %d",FED),360,1.,361);
FEDsAndiPhiProfileHists_[FED] = iphiProfileHist;
FEDsAndiPhiProfileHists_[FED]->SetDirectory(0);
FEDsAndiPhiProfileHists_[FED]->SetDirectory(nullptr);

TH1F* ietaProfileHist = new TH1F(Form("iEta_Profile_FED_%d",FED),Form("iEta Profile for FED %d",FED),172,-86,86);
FEDsAndiEtaProfileHists_[FED] = ietaProfileHist;
FEDsAndiEtaProfileHists_[FED]->SetDirectory(0);
FEDsAndiEtaProfileHists_[FED]->SetDirectory(nullptr);

TH2F* timingHistVsFreq = new TH2F(Form("timeVsFreqFED_%d",FED),Form("time Vs Freq FED %d",FED),78,-7,7,100,0.,100000);
FEDsAndTimingVsFreqHists_[FED] = timingHistVsFreq;
FEDsAndTimingVsFreqHists_[FED]->SetDirectory(0);
FEDsAndTimingVsFreqHists_[FED]->SetDirectory(nullptr);

TH2F* timingHistVsAmp = new TH2F(Form("timeVsAmpFED_%d",FED),Form("time Vs Amp FED %d",FED),78,-7,7,numBins,histRangeMin_,histRangeMax_);
FEDsAndTimingVsAmpHists_[FED] = timingHistVsAmp;
FEDsAndTimingVsAmpHists_[FED]->SetDirectory(0);
FEDsAndTimingVsAmpHists_[FED]->SetDirectory(nullptr);

TH1F* numXtalInClusterHist = new TH1F(Form("NumXtalsInCluster_FED_%d",FED),Form("Num active Xtals In Cluster for FED %d;Num Active Xtals",FED),25,0,25);
FEDsAndNumXtalsInClusterHists_[FED] = numXtalInClusterHist;
FEDsAndNumXtalsInClusterHists_[FED]->SetDirectory(0);
FEDsAndNumXtalsInClusterHists_[FED]->SetDirectory(nullptr);

TH2F* OccupHist = new TH2F(Form("occupFED_%d",FED),Form("Occupancy FED %d;i#eta;i#phi",FED),85,1,86,20,1,21);
FEDsAndOccupancyHists_[FED] = OccupHist;
FEDsAndOccupancyHists_[FED]->SetDirectory(0);
FEDsAndOccupancyHists_[FED]->SetDirectory(nullptr);

TH2F* timingHistVsPhi = new TH2F(Form("timeVsPhiFED_%d",FED),Form("time Vs Phi FED %d;Relative Time (1 clock = 25ns);i#phi",FED),78,-7,7,20,1,21);
FEDsAndTimingVsPhiHists_[FED] = timingHistVsPhi;
FEDsAndTimingVsPhiHists_[FED]->SetDirectory(0);
FEDsAndTimingVsPhiHists_[FED]->SetDirectory(nullptr);

TH2F* timingHistVsModule = new TH2F(Form("timeVsModuleFED_%d",FED),Form("time Vs Module FED %d;Relative Time (1 clock = 25ns);i#eta",FED),78,-7,7,4,1,86);
FEDsAndTimingVsModuleHists_[FED] = timingHistVsModule;
FEDsAndTimingVsModuleHists_[FED]->SetDirectory(0);
FEDsAndTimingVsModuleHists_[FED]->SetDirectory(nullptr);

TH2F* dccRuntypeVsBxFED = new TH2F(Form("DCCRuntypeVsBxFED_%d",FED),Form("DCC Runtype vs. BX FED %d",FED),3600,0,3600,24,0,24);
FEDsAndDCCRuntypeVsBxHists_[FED] = dccRuntypeVsBxFED;
FEDsAndDCCRuntypeVsBxHists_[FED]->SetDirectory(0);
FEDsAndDCCRuntypeVsBxHists_[FED]->SetDirectory(nullptr);

}

Expand Down Expand Up @@ -1906,14 +1906,14 @@ EcalCosmicsHists::endJob()
FEDdir->cd();

TH1F* hist = itr->second;
if(hist!=0)
if(hist!=nullptr)
hist->Write();
else {
cerr << "EcalCosmicsHists: Error: This shouldn't happen!" << endl;
}
// Write out timing hist
hist = FEDsAndTimingHists_[itr->first];
if(hist!=0)
if(hist!=nullptr)
hist->Write();
else {
cerr << "EcalCosmicsHists: Error: This shouldn't happen!" << endl;
Expand Down
8 changes: 4 additions & 4 deletions CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.h
View file
Expand Up @@ -70,13 +70,13 @@
class EcalCosmicsHists : public edm::EDAnalyzer {
public:
explicit EcalCosmicsHists(const edm::ParameterSet&);
~EcalCosmicsHists();
~EcalCosmicsHists() override;


private:
virtual void beginRun(edm::Run const &, edm::EventSetup const &) ;
virtual void analyze(edm::Event const &, edm::EventSetup const &);
virtual void endJob() ;
void beginRun(edm::Run const &, edm::EventSetup const &) override ;
void analyze(edm::Event const &, edm::EventSetup const &) override;
void endJob() override ;
std::string intToString(int num);
void initHists(int);
std::vector<bool> determineTriggers(const edm::Event&, const edm::EventSetup& eventSetup);
Expand Down
2 changes: 1 addition & 1 deletion CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h
View file
Expand Up @@ -24,7 +24,7 @@ class EcalDCCHeaderDisplay: public edm::EDAnalyzer{

protected:

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

private:
edm::InputTag EcalDCCHeaderCollection_;
Expand Down
6 changes: 3 additions & 3 deletions CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.cc
View file
Expand Up @@ -203,7 +203,7 @@ void EcalDigiDisplay::analyze( edm::Event const & e, edm::EventSetup const & c)
edm::Handle<EBDigiCollection> eb_digis;
try {
e.getByLabel(digiProducer_,ebDigiCollection_, eb_digis);
if ( eb_digis->size() != 0 )
if ( !eb_digis->empty() )
ebDigisFound = true;
} catch (cms::Exception& ex) {
edm::LogError("EcalDigiUnpackerModule") << "EB Digis were not found!";
Expand All @@ -213,7 +213,7 @@ void EcalDigiDisplay::analyze( edm::Event const & e, edm::EventSetup const & c)
edm::Handle<EEDigiCollection> ee_digis;
try {
e.getByLabel(digiProducer_,eeDigiCollection_, ee_digis);
if ( ee_digis->size() != 0 )
if ( !ee_digis->empty() )
eeDigisFound = true;
} catch (cms::Exception& ex) {
edm::LogError("EcalDigiUnpackerModule") << "EE Digis were not found!";
Expand All @@ -223,7 +223,7 @@ void EcalDigiDisplay::analyze( edm::Event const & e, edm::EventSetup const & c)
edm::Handle<EcalPnDiodeDigiCollection> pn_digis;
try {
e.getByLabel(digiProducer_, pn_digis);
if ( pn_digis->size() != 0)
if ( !pn_digis->empty())
pnDigisFound = true;
} catch (cms::Exception& ex) {
edm::LogError("EcalDigiUnpackerModule") << "PNs were not found!";
Expand Down
8 changes: 4 additions & 4 deletions CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.h
View file
Expand Up @@ -22,12 +22,12 @@ class EcalDigiDisplay : public edm::EDAnalyzer {
//Constractor
EcalDigiDisplay(const edm::ParameterSet& ps);
//Distractor
~EcalDigiDisplay();
~EcalDigiDisplay() override;

private:
virtual void analyze( edm::Event const & e, edm::EventSetup const & c);
virtual void beginRun(edm::Run const &, edm::EventSetup const & c);
virtual void endJob();
void analyze( edm::Event const & e, edm::EventSetup const & c) override;
void beginRun(edm::Run const &, edm::EventSetup const & c) override;
void endJob() override;

protected:
void readEBDigis (edm::Handle<EBDigiCollection> digis, int Mode);
Expand Down
6 changes: 3 additions & 3 deletions CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.cc
View file
Expand Up @@ -168,9 +168,9 @@ EcalDisplaysByEvent::analyze(edm::Event const & iEvent, edm::EventSetup const &

bool hasEBdigis = false;
bool hasEEdigis = false;
if(EBdigisHandle->size() > 0)
if(!EBdigisHandle->empty())
hasEBdigis = true;
if(EEdigisHandle->size() > 0)
if(!EEdigisHandle->empty())
hasEEdigis = true;

// Produce the digi graphs
Expand Down Expand Up @@ -578,7 +578,7 @@ void EcalDisplaysByEvent::makeHistos(Handle<EcalRecHitCollection> hits)
}
// Fill FED-by-FED timing histos (all events)
TH1F* timingHist = FEDsAndTimingHists_[FEDid];
if(timingHist==0)
if(timingHist==nullptr)
{
initHists(FEDid);
timingHist = FEDsAndTimingHists_[FEDid];
Expand Down
8 changes: 4 additions & 4 deletions CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h
View file
Expand Up @@ -64,13 +64,13 @@
class EcalDisplaysByEvent : public edm::EDAnalyzer {
public:
explicit EcalDisplaysByEvent(const edm::ParameterSet&);
~EcalDisplaysByEvent();
~EcalDisplaysByEvent() override;


private:
virtual void beginRun(edm::Run const &, edm::EventSetup const &) ;
virtual void analyze(edm::Event const &, edm::EventSetup const &);
virtual void endJob() ;
void beginRun(edm::Run const &, edm::EventSetup const &) override ;
void analyze(edm::Event const &, edm::EventSetup const &) override;
void endJob() override ;
std::string intToString(int num);
std::string floatToString(float num);
void initHists(int);
Expand Down
4 changes: 2 additions & 2 deletions CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.h
View file
Expand Up @@ -38,10 +38,10 @@
class EcalExclusiveTrigFilter : public edm::EDFilter {
public:
explicit EcalExclusiveTrigFilter(const edm::ParameterSet&);
~EcalExclusiveTrigFilter();
~EcalExclusiveTrigFilter() override;

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

// ----------member data ---------------------------
edm::InputTag l1GTReadoutRecTag_;
Expand Down
4 changes: 2 additions & 2 deletions CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.h
View file
Expand Up @@ -45,10 +45,10 @@ Description: <one line class summary>
class EcalFEDErrorFilter : public HLTFilter {
public:
explicit EcalFEDErrorFilter(const edm::ParameterSet&);
~EcalFEDErrorFilter();
~EcalFEDErrorFilter() override;

private:
virtual bool hltFilter(edm::Event&, const edm::EventSetup&, trigger::TriggerFilterObjectWithRefs & filterproduct) const override;
bool hltFilter(edm::Event&, const edm::EventSetup&, trigger::TriggerFilterObjectWithRefs & filterproduct) const override;

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

Expand Down
4 changes: 2 additions & 2 deletions CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc
View file
Expand Up @@ -46,10 +46,10 @@ class EcalFEDWithCRCErrorProducer : public edm::EDProducer
{
public:
explicit EcalFEDWithCRCErrorProducer(const edm::ParameterSet&);
~EcalFEDWithCRCErrorProducer();
~EcalFEDWithCRCErrorProducer() override;

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

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

Expand Down
4 changes: 2 additions & 2 deletions CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h
View file
Expand Up @@ -18,7 +18,7 @@
#include <iostream>
#include <vector>
#include <string>
#include <stdio.h>
#include <cstdio>
#include <fstream>

#include <iomanip>
Expand All @@ -39,7 +39,7 @@ class EcalHexDisplay: public edm::EDAnalyzer {
bool writeDcc_;
std::string filename_;

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

private:
edm::InputTag fedRawDataCollectionTag_;
Expand Down
2 changes: 1 addition & 1 deletion CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.cc
View file
Expand Up @@ -332,7 +332,7 @@ void EcalMipGraphs::selectHits(Handle<EcalRecHitCollection> hits,
}

TH1F* timingHist = FEDsAndTimingHists_[FEDid];
if(timingHist==0)
if(timingHist==nullptr)
{
initHists(FEDid);
timingHist = FEDsAndTimingHists_[FEDid];
Expand Down
8 changes: 4 additions & 4 deletions CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h
View file
Expand Up @@ -61,13 +61,13 @@
class EcalMipGraphs : public edm::EDAnalyzer {
public:
explicit EcalMipGraphs(const edm::ParameterSet&);
~EcalMipGraphs();
~EcalMipGraphs() override;


private:
virtual void beginRun(edm::Run const &, edm::EventSetup const &) ;
virtual void analyze(edm::Event const &, edm::EventSetup const &);
virtual void endJob() ;
void beginRun(edm::Run const &, edm::EventSetup const &) override ;
void analyze(edm::Event const &, edm::EventSetup const &) override;
void endJob() override ;
std::string intToString(int num);
std::string floatToString(float num);
void writeGraphs();
Expand Down

0 comments on commit bce75f1

Please sign in to comment.