Skip to content

Commit

Permalink
Merge pull request #20799 from davidlange6/clangTidyCleanT2_SUSYBSMAn…
Browse files Browse the repository at this point in the history 
…alysis

Clang-tidy checks for SUSYBSMAnalysis
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 8, 2017
2 parents 9033855 + 178bfe7 commit f3c70c2
Show file tree
Hide file tree
Showing 19 changed files with 65 additions and 65 deletions.
2 changes: 1 addition & 1 deletion SUSYBSMAnalysis/HSCP/plugins/HSCPDeDxInfoProducer.cc
View file
Expand Up @@ -67,7 +67,7 @@ HSCPDeDxInfoProducer::~HSCPDeDxInfoProducer(){}
// ------------ method called once each job just before starting event loop ------------
void HSCPDeDxInfoProducer::beginRun(edm::Run const& run, const edm::EventSetup& iSetup)
{
if(useCalibration && calibGains.size()==0){
if(useCalibration && calibGains.empty()){
edm::ESHandle<TrackerGeometry> tkGeom;
iSetup.get<TrackerDigiGeometryRecord>().get( tkGeom );
m_off = tkGeom->offsetDU(GeomDetEnumerators::PixelBarrel); //index start at the first pixel
Expand Down
6 changes: 3 additions & 3 deletions SUSYBSMAnalysis/HSCP/plugins/HSCPDeDxInfoProducer.h
View file
Expand Up @@ -33,11 +33,11 @@
class HSCPDeDxInfoProducer : public edm::stream::EDProducer<> {
public:
explicit HSCPDeDxInfoProducer(const edm::ParameterSet&);
~HSCPDeDxInfoProducer();
~HSCPDeDxInfoProducer() override;

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

void makeCalibrationMap(const TrackerGeometry& tkGeom);
void processHit(const TrackingRecHit* recHit, float trackMomentum, float& cosine, susybsm::HSCPDeDxInfo& hscpDeDxInfo, LocalPoint HitLocalPos);
Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/HSCPHLTFilter.cc
View file
Expand Up @@ -24,12 +24,12 @@ using namespace edm;
class HSCPHLTFilter : public edm::EDFilter {
public:
explicit HSCPHLTFilter(const edm::ParameterSet&);
~HSCPHLTFilter();
~HSCPHLTFilter() override;

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

bool IncreasedTreshold(const trigger::TriggerEvent& trEv, const edm::InputTag& InputPath, double NewThreshold, double etaCut, int NObjectAboveThreshold, bool averageThreshold);
Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc
View file
Expand Up @@ -117,13 +117,13 @@ using namespace __gnu_cxx;
class HSCPTreeBuilder : public edm::EDFilter {
public:
explicit HSCPTreeBuilder(const edm::ParameterSet&);
~HSCPTreeBuilder();
~HSCPTreeBuilder() override;


private:
virtual void beginJob() override ;
virtual bool filter(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() override ;
void beginJob() override ;
bool filter(edm::Event&, const edm::EventSetup&) override;
void endJob() override ;
int ClosestMuonIndex(reco::TrackRef track, std::vector<reco::MuonRef>);

const edm::EventSetup* iSetup_;
Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/HSCPValidator.cc
View file
Expand Up @@ -516,7 +516,7 @@ void HSCPValidator::makeSimDigiPlotsECAL(const edm::Event& iEvent)
// 3) Match to digis
int numMatchedSimHitsEventEB = 0;
int numMatchedDigisEventEB = 0;
const PCaloHitContainer* phitsEB=0;
const PCaloHitContainer* phitsEB=nullptr;
phitsEB = ebSimHits.product();
for(SimTrackContainer::const_iterator simTrack = simTracks->begin(); simTrack != simTracks->end(); ++simTrack)
{
Expand All @@ -537,7 +537,7 @@ void HSCPValidator::makeSimDigiPlotsECAL(const edm::Event& iEvent)
mySimHitsEB.push_back(*simHitItr);
++simHitItr;
}
if(mySimHitsEB.size()==0)
if(mySimHitsEB.empty())
{
std::cout << "Could not find matching EB PCaloHits for SimTrack id: " << trackId << ". Skipping this SimTrack" << std::endl;
continue;
Expand Down Expand Up @@ -597,7 +597,7 @@ void HSCPValidator::makeSimDigiPlotsECAL(const edm::Event& iEvent)
// EE next
int numMatchedSimHitsEventEE = 0;
int numMatchedDigisEventEE = 0;
const PCaloHitContainer* phitsEE=0;
const PCaloHitContainer* phitsEE=nullptr;
phitsEE = eeSimHits.product();
for(SimTrackContainer::const_iterator simTrack = simTracks->begin(); simTrack != simTracks->end(); ++simTrack)
{
Expand All @@ -618,7 +618,7 @@ void HSCPValidator::makeSimDigiPlotsECAL(const edm::Event& iEvent)
mySimHitsEE.push_back(*simHitItr);
++simHitItr;
}
if(mySimHitsEE.size()==0)
if(mySimHitsEE.empty())
{
std::cout << "Could not find matching EE PCaloHits for SimTrack id: " << trackId << ". Skipping this SimTrack" << std::endl;
continue;
Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/HSCPValidator.h
View file
Expand Up @@ -44,13 +44,13 @@
class HSCPValidator : public edm::EDAnalyzer {
public:
explicit HSCPValidator(const edm::ParameterSet&);
~HSCPValidator();
~HSCPValidator() 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 ;
std::string intToString(int num);
void makeGenPlots(const edm::Event& iEvent);
void makeSimTrackPlots(const edm::Event& iEvent);
Expand Down
2 changes: 1 addition & 1 deletion SUSYBSMAnalysis/HSCP/plugins/HSCParticleProducer.cc
View file
Expand Up @@ -166,7 +166,7 @@ HSCParticleProducer::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
i--;
}
}
bool filterResult = !Filter_ || (Filter_ && hscp->size()>=1);
bool filterResult = !Filter_ || (Filter_ && !hscp->empty());



Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/HSCParticleProducer.h
View file
Expand Up @@ -54,12 +54,12 @@
class HSCParticleProducer : public edm::EDFilter {
public:
explicit HSCParticleProducer(const edm::ParameterSet&);
~HSCParticleProducer();
~HSCParticleProducer() override;

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

std::vector<susybsm::HSCParticle> getHSCPSeedCollection(edm::Handle<reco::TrackCollection>& trackCollectionHandle, edm::Handle<reco::MuonCollection>& muonCollectionHandle, edm::Handle<reco::MuonCollection>& MTmuonCollectionHandle);

Expand Down
10 changes: 5 additions & 5 deletions SUSYBSMAnalysis/HSCP/plugins/HSCParticleSelector.cc
View file
Expand Up @@ -16,12 +16,12 @@
class HSCParticleSelector : public edm::EDFilter {
public:
explicit HSCParticleSelector(const edm::ParameterSet&);
~HSCParticleSelector();
~HSCParticleSelector() override;

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

edm::EDGetTokenT<susybsm::HSCParticleCollection> sourceToken_;

Expand Down Expand Up @@ -85,7 +85,7 @@ bool HSCParticleSelector::filter(edm::Event& iEvent, const edm::EventSetup& iSet
}
}

bool filterResult = !Filter_ || (Filter_ && output->size()>=1);
bool filterResult = !Filter_ || (Filter_ && !output->empty());

iEvent.put(std::move(result));

Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/MuonSegmentProducer.cc
View file
Expand Up @@ -48,12 +48,12 @@
class MuonSegmentProducer : public edm::EDProducer {
public:
explicit MuonSegmentProducer(const edm::ParameterSet&);
~MuonSegmentProducer();
~MuonSegmentProducer() override;

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

edm::EDGetTokenT< CSCSegmentCollection > m_cscSegmentToken;
edm::EDGetTokenT< DTRecSegment4DCollection > m_dtSegmentToken;
Expand Down
10 changes: 5 additions & 5 deletions SUSYBSMAnalysis/HSCP/plugins/SimHitShifter.cc
View file
Expand Up @@ -108,17 +108,17 @@
class SimHitShifter : public edm::EDProducer {
public:
explicit SimHitShifter(const edm::ParameterSet&);
~SimHitShifter();
~SimHitShifter() override;
//edm::ESHandle <RPCGeometry> rpcGeo;
virtual void beginRun(const edm::Run&, const edm::EventSetup&) override;
void beginRun(const edm::Run&, const edm::EventSetup&) override;
std::map<int,float> shiftinfo;


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

};

Expand Down
10 changes: 5 additions & 5 deletions SUSYBSMAnalysis/HSCP/plugins/Skim_HSCPFilter.cc
View file
Expand Up @@ -51,12 +51,12 @@
class HSCPFilter : public edm::EDFilter {
public:
explicit HSCPFilter(const edm::ParameterSet&);
~HSCPFilter();
~HSCPFilter() override;

private:
virtual void beginJob() override ;
virtual bool filter(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() override ;
void beginJob() override ;
bool filter(edm::Event&, const edm::EventSetup&) override;
void endJob() override ;
bool filterFlag;
#ifdef THIS_IS_AN_EVENT_EXAMPLE
edm::EDGetTokenT<ExampleData> pInToken;
Expand Down Expand Up @@ -141,7 +141,7 @@ HSCPFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)

if(!filterFlag) return true;

if(recoVertex.size()<1) return false;
if(recoVertex.empty()) return false;

using reco::MuonCollection;

Expand Down
6 changes: 3 additions & 3 deletions SUSYBSMAnalysis/HSCP/plugins/Skim_HighPtTrackEcalDetIdProducer.cc
View file
Expand Up @@ -57,7 +57,7 @@
class HighPtTrackEcalDetIdProducer : public edm::EDProducer {
public:
explicit HighPtTrackEcalDetIdProducer(const edm::ParameterSet&);
~HighPtTrackEcalDetIdProducer();
~HighPtTrackEcalDetIdProducer() override;
void beginRun(const edm::Run&, const edm::EventSetup&) override;
void produce(edm::Event&, const edm::EventSetup&) override;
private:
Expand Down Expand Up @@ -133,9 +133,9 @@ HighPtTrackEcalDetIdProducer::produce(edm::Event& iEvent, const edm::EventSetup&
++itTrack) {
if(itTrack->pt()>ptcut_){
TrackDetMatchInfo info = trackAssociator_.associate(iEvent, iSetup, *itTrack, parameters_, TrackDetectorAssociator::InsideOut);
if(info.crossedEcalIds.size()==0) break;
if(info.crossedEcalIds.empty()) break;

if(info.crossedEcalIds.size()>0){
if(!info.crossedEcalIds.empty()){
DetId centerId = info.crossedEcalIds.front();

const CaloSubdetectorTopology* topology = caloTopology_->getSubdetectorTopology(DetId::Ecal,centerId.subdetId());
Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/Skim_MonoPhotonSkimmer.cc
View file
Expand Up @@ -42,12 +42,12 @@
class MonoPhotonSkimmer : public edm::EDFilter {
public:
explicit MonoPhotonSkimmer(const edm::ParameterSet&);
~MonoPhotonSkimmer();
~MonoPhotonSkimmer() override;

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

// ----------member data ---------------------------
edm::EDGetTokenT<reco::PhotonCollection> _phoToken;
Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/Skim_ProduceIsolationMap.cc
View file
Expand Up @@ -71,8 +71,8 @@ using namespace edm;
class ProduceIsolationMap : public edm::EDProducer {
public:
explicit ProduceIsolationMap(const edm::ParameterSet&);
~ProduceIsolationMap();
virtual void produce(edm::Event&, const edm::EventSetup&) override;
~ProduceIsolationMap() override;
void produce(edm::Event&, const edm::EventSetup&) override;
private:
edm::EDGetTokenT<reco::TrackCollection> TKToken_;
edm::EDGetTokenT<reco::TrackCollection> inputCollectionToken_;
Expand Down Expand Up @@ -144,8 +144,8 @@ ProduceIsolationMap::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
TrackDetMatchInfo info = trackAssociator_.associate(iEvent, iSetup, *itTrack, parameters_, TrackDetectorAssociator::InsideOut);


if(info.ecalRecHits.size()>0){IsolationInfoColl[TkIndex].Set_ECAL_Energy(info.coneEnergy(IsolationConeDR_, TrackDetMatchInfo::EcalRecHits));}
if(info.hcalRecHits.size()>0){IsolationInfoColl[TkIndex].Set_HCAL_Energy(info.coneEnergy(IsolationConeDR_, TrackDetMatchInfo::HcalRecHits));}
if(!info.ecalRecHits.empty()){IsolationInfoColl[TkIndex].Set_ECAL_Energy(info.coneEnergy(IsolationConeDR_, TrackDetMatchInfo::EcalRecHits));}
if(!info.hcalRecHits.empty()){IsolationInfoColl[TkIndex].Set_HCAL_Energy(info.coneEnergy(IsolationConeDR_, TrackDetMatchInfo::HcalRecHits));}
// if(info.hcalRecHits.size()>0){IsolationInfoColl[TkIndex].Set_HCAL_Energy(info.hcalConeEnergy());}
// if(info.ecalRecHits.size()>0){IsolationInfoColl[TkIndex].Set_ECAL_Energy(info.ecalConeEnergy());}

Expand Down
6 changes: 3 additions & 3 deletions SUSYBSMAnalysis/HSCP/plugins/Skim_ReduceHcalRecHitCollectionProducer.cc
View file
Expand Up @@ -65,8 +65,8 @@
class ReduceHcalRecHitCollectionProducer : public edm::EDProducer {
public:
explicit ReduceHcalRecHitCollectionProducer(const edm::ParameterSet&);
~ReduceHcalRecHitCollectionProducer();
virtual void produce(edm::Event&, const edm::EventSetup&) override;
~ReduceHcalRecHitCollectionProducer() override;
void produce(edm::Event&, const edm::EventSetup&) override;
private:
edm::EDGetTokenT<HBHERecHitCollection> recHitsToken_;
std::string reducedHitsCollection_;
Expand Down Expand Up @@ -156,7 +156,7 @@ ReduceHcalRecHitCollectionProducer::produce(edm::Event& iEvent, const edm::Event

TrackDetMatchInfo info = trackAssociator_.associate(iEvent, iSetup, *itTrack, parameters_, TrackDetectorAssociator::InsideOut);

if(info.crossedHcalIds.size()>0){
if(!info.crossedHcalIds.empty()){
//loop through hits in the cone
for(std::vector<const HBHERecHit*>::const_iterator hit = info.hcalRecHits.begin();
hit != info.hcalRecHits.end(); ++hit)
Expand Down
8 changes: 4 additions & 4 deletions SUSYBSMAnalysis/HSCP/plugins/Skim_UpdatedMuonInnerTrackRef.cc
View file
Expand Up @@ -19,12 +19,12 @@
class UpdatedMuonInnerTrackRef : public edm::EDProducer {
public:
explicit UpdatedMuonInnerTrackRef(const edm::ParameterSet&);
~UpdatedMuonInnerTrackRef();
~UpdatedMuonInnerTrackRef() override;

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

reco::TrackRef findNewRef(reco::TrackRef oldTrackRef, edm::Handle<reco::TrackCollection>& newTrackCollection);

Expand Down
4 changes: 2 additions & 2 deletions SUSYBSMAnalysis/HSCP/src/BetaCalculatorECAL.cc
View file
Expand Up @@ -148,7 +148,7 @@ void BetaCalculatorECAL::addInfoToCandidate(HSCParticle& candidate, edm::Handle<
trackExitMapIt++;
}

if(crossedRecHits.size() > 0)
if(!crossedRecHits.empty())
{
setCalo = true;
sort(crossedRecHits.begin(),crossedRecHits.end(),EcalRecHitLess());
Expand Down Expand Up @@ -186,7 +186,7 @@ void BetaCalculatorECAL::addInfoToCandidate(HSCParticle& candidate, edm::Handle<
}
}

if(info.crossedHcalRecHits.size() > 0)
if(!info.crossedHcalRecHits.empty())
{
// HCAL (not ECAL) info
result.hcalCrossedEnergy = info.crossedEnergy(TrackDetMatchInfo::HcalRecHits);
Expand Down
2 changes: 1 addition & 1 deletion SUSYBSMAnalysis/HSCP/src/BetaCalculatorRPC.cc
View file
Expand Up @@ -105,7 +105,7 @@ void BetaCalculatorRPC::algo(const std::vector<susybsm::RPCHit4D>& uHSCPRPCRecHi
betavalue = 1.;
}

if(HSCPRPCRecHits.size()==0){
if(HSCPRPCRecHits.empty()){
//std::cout<<"Inside BetaCalculatorRPC \t WARINNG EMPTY RPC4DRecHits CONTAINER!!!"<<std::endl;
betavalue = 1.;
}
Expand Down

0 comments on commit f3c70c2

Please sign in to comment.