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 DataFormats #20789

Merged
merged 1 commit into from Oct 9, 2017
Merged

Clang-tidy checks for DataFormats #20789

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions DataFormats/Alignment/interface/SiStripLaserRecHit2D.h
View file
Open in desktop
Expand Up @@ -14,12 +14,12 @@ class SiStripLaserRecHit2D : public RecHit2DLocalPos {
public:

SiStripLaserRecHit2D(): RecHit2DLocalPos(0) {}
~SiStripLaserRecHit2D() {}
~SiStripLaserRecHit2D() override {}
SiStripLaserRecHit2D( const LocalPoint& p, const LocalError& e, const SiStripDetId& id ) : RecHit2DLocalPos( id ), position( p ), error( e ) { detId = id; }

virtual LocalPoint localPosition() const { return position; }
virtual LocalError localPositionError() const { return error; }
virtual SiStripLaserRecHit2D* clone() const { return new SiStripLaserRecHit2D( *this ); }
LocalPoint localPosition() const override { return position; }
LocalError localPositionError() const override { return error; }
SiStripLaserRecHit2D* clone() const override { return new SiStripLaserRecHit2D( *this ); }

const SiStripDetId& getDetId( void ) const { return detId; }

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Alignment/interface/TkFittedLasBeam.h
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ class TkFittedLasBeam : public TkLasBeam {

TkFittedLasBeam();
TkFittedLasBeam(const TkLasBeam &lasBeam);
virtual ~TkFittedLasBeam() {} // anyway virtual since inherited...
~TkFittedLasBeam() override {} // anyway virtual since inherited...

/// the parametrisation type used (0 means undefined...)
unsigned int parametrisation() const { return parametrisation_;}
Expand Down
8 changes: 4 additions & 4 deletions DataFormats/BTauReco/interface/BoostedDoubleSVTagInfo.h
View file
Open in desktop
Expand Up @@ -19,13 +19,13 @@ class BoostedDoubleSVTagInfo : public BaseTagInfo {
m_list(list),
m_svTagInfoRef(svTagInfoRef) { }

virtual ~BoostedDoubleSVTagInfo(void) { }
~BoostedDoubleSVTagInfo(void) override { }

virtual BoostedDoubleSVTagInfo* clone(void) const { return new BoostedDoubleSVTagInfo(*this); }
BoostedDoubleSVTagInfo* clone(void) const override { return new BoostedDoubleSVTagInfo(*this); }

virtual edm::RefToBase<Jet> jet(void) const { return m_svTagInfoRef->jet(); }
edm::RefToBase<Jet> jet(void) const override { return m_svTagInfoRef->jet(); }

virtual TaggingVariableList taggingVariables(void) const { return m_list; }
TaggingVariableList taggingVariables(void) const override { return m_list; }

protected:
TaggingVariableList m_list;
Expand Down
10 changes: 5 additions & 5 deletions DataFormats/BTauReco/interface/IPTagInfo.h
View file
Open in desktop
Expand Up @@ -68,10 +68,10 @@ class IPTagInfo : public Base {

IPTagInfo() {}

virtual ~IPTagInfo() {}
~IPTagInfo() override {}

/// clone
virtual IPTagInfo * clone(void) const
IPTagInfo * clone(void) const override
{ return new IPTagInfo(*this); }

/**
Expand Down Expand Up @@ -128,7 +128,7 @@ class IPTagInfo : public Base {
Container sorted(const std::vector<size_t>& indexes) const;
Container sortedTracks(const std::vector<size_t>& indexes) const {return sorted(indexes);}

virtual TaggingVariableList taggingVariables(void) const;
TaggingVariableList taggingVariables(void) const override;

const edm::Ref<VertexCollection> & primaryVertex() const { return m_pv; }

Expand Down Expand Up @@ -173,7 +173,7 @@ template <class Container, class Base> TaggingVariableList IPTagInfo<Container,B
using namespace ROOT::Math;
const Track * track = selectedTrack(*it);
const btag::TrackIPData *data = &m_data[*it];
math::XYZVector trackMom = track->momentum();
const math::XYZVector& trackMom = track->momentum();
double trackMag = std::sqrt(trackMom.Mag2());

vars.insert(btau::trackMomentum, trackMag, true);
Expand Down Expand Up @@ -222,7 +222,7 @@ template<class Container, class Base> std::vector<bool> IPTagInfo<Container,Base
//Track parameters
const Track * track = selectedTrack(i);
double trackpT = track->pt();
math::XYZVector trackMom = track->momentum();
const math::XYZVector& trackMom = track->momentum();

// do the math in passVariableJTA
result.push_back(passVariableJTA( params, jetpT, trackpT, ROOT::Math::VectorUtil::DeltaR(trackMom, jetDir)));
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/BTauReco/interface/IsolatedTauTagInfo.h
View file
Open in desktop
Expand Up @@ -33,15 +33,15 @@ namespace reco {
{ }

//destructor
virtual ~IsolatedTauTagInfo() {}
~IsolatedTauTagInfo() override {}

//get the tracks from the jetTag
const TrackRefVector allTracks() const { return tracks(); }

//get the selected tracks used to computed the isolation
const TrackRefVector selectedTracks() const {return selectedTracks_;}

virtual IsolatedTauTagInfo* clone() const { return new IsolatedTauTagInfo( *this ); }
IsolatedTauTagInfo* clone() const override { return new IsolatedTauTagInfo( *this ); }

// default discriminator: returns the value of the discriminator of the jet tag, i.e. the one computed with the parameters taken from the cfg file
float discriminator() const { return m_discriminator; }
Expand Down
10 changes: 5 additions & 5 deletions DataFormats/BTauReco/interface/JTATagInfo.h
View file
Open in desktop
Expand Up @@ -13,15 +13,15 @@ class JTATagInfo : public BaseTagInfo {
JTATagInfo(void) : m_jetTracksAssociation() { }
JTATagInfo(const JetTracksAssociationRef & jtaRef) : m_jetTracksAssociation(jtaRef) { }

virtual ~JTATagInfo(void) { }
~JTATagInfo(void) override { }

virtual JTATagInfo* clone(void) const { return new JTATagInfo(*this); }
JTATagInfo* clone(void) const override { return new JTATagInfo(*this); }

virtual edm::RefToBase<Jet> jet(void) const { return m_jetTracksAssociation->first ; }
virtual TrackRefVector tracks(void) const { return m_jetTracksAssociation->second; }
edm::RefToBase<Jet> jet(void) const override { return m_jetTracksAssociation->first ; }
TrackRefVector tracks(void) const override { return m_jetTracksAssociation->second; }
const JetTracksAssociationRef & jtaRef(void) const { return m_jetTracksAssociation; }

virtual bool hasTracks(void) const { return true; }
bool hasTracks(void) const override { return true; }

void setJTARef(const JetTracksAssociationRef & jtaRef) { m_jetTracksAssociation = jtaRef; }

Expand Down
6 changes: 3 additions & 3 deletions DataFormats/BTauReco/interface/JetTagInfo.h
View file
Open in desktop
Expand Up @@ -15,11 +15,11 @@ class JetTagInfo : public BaseTagInfo {

JetTagInfo(const edm::RefToBase<Jet> & jetRef) : m_jet(jetRef) { }

virtual ~JetTagInfo(void) { }
~JetTagInfo(void) override { }

virtual JetTagInfo* clone(void) const { return new JetTagInfo(*this); }
JetTagInfo* clone(void) const override { return new JetTagInfo(*this); }

virtual edm::RefToBase<Jet> jet(void) const { return m_jet; }
edm::RefToBase<Jet> jet(void) const override { return m_jet; }

template <typename T>
void setJetRef(const edm::Ref<T> & jetRef) { m_jet = edm::RefToBase<Jet>( jetRef ); }
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/BTauReco/interface/TauMassTagInfo.h
View file
Open in desktop
Expand Up @@ -21,9 +21,9 @@ namespace reco {
typedef ClusterTrackAssociationCollection::value_type ClusterTrackAssociation;

TauMassTagInfo() {}
virtual ~TauMassTagInfo() {}
~TauMassTagInfo() override {}

virtual TauMassTagInfo* clone() const { return new TauMassTagInfo( * this ); }
TauMassTagInfo* clone() const override { return new TauMassTagInfo( * this ); }

//default discriminator: returns the discriminator of the jet tag
float discriminator() const {return -1. ;}
Expand Down
8 changes: 4 additions & 4 deletions DataFormats/BTauReco/interface/TemplatedSecondaryVertexTagInfo.h
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ class TemplatedSecondaryVertexTagInfo : public BaseTagInfo {
typedef typename IPTI::input_container input_container;

TemplatedSecondaryVertexTagInfo() {}
virtual ~TemplatedSecondaryVertexTagInfo() {}
~TemplatedSecondaryVertexTagInfo() override {}

TemplatedSecondaryVertexTagInfo(
const std::vector<IndexedTrackData> &trackData,
Expand All @@ -105,14 +105,14 @@ class TemplatedSecondaryVertexTagInfo : public BaseTagInfo {
const edm::Ref<std::vector<IPTI> >&);

/// clone
virtual TemplatedSecondaryVertexTagInfo * clone(void) const {
TemplatedSecondaryVertexTagInfo * clone(void) const override {
return new TemplatedSecondaryVertexTagInfo(*this);
}

const edm::Ref<std::vector<IPTI> > &trackIPTagInfoRef() const
{ return m_trackIPTagInfoRef; }

virtual edm::RefToBase<Jet> jet(void) const
edm::RefToBase<Jet> jet(void) const override
{ return m_trackIPTagInfoRef->jet(); }

// virtual input_container ipTracks(void) const
Expand Down Expand Up @@ -155,7 +155,7 @@ class TemplatedSecondaryVertexTagInfo : public BaseTagInfo {
}
const GlobalVector &flightDirection(unsigned int index) const
{ return m_svData[index].direction; }
virtual TaggingVariableList taggingVariables() const;
TaggingVariableList taggingVariables() const override;

// Used by ROOT storage
CMS_CLASS_VERSION(11)
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/BTauReco/interface/TemplatedSoftLeptonTagInfo.h
View file
Open in desktop
Expand Up @@ -120,9 +120,9 @@ class TemplatedSoftLeptonTagInfo : public JetTagInfo {

TemplatedSoftLeptonTagInfo(void) : m_leptons() {}

virtual ~TemplatedSoftLeptonTagInfo(void) {}
~TemplatedSoftLeptonTagInfo(void) override {}

virtual TemplatedSoftLeptonTagInfo* clone(void) const { return new TemplatedSoftLeptonTagInfo(*this); }
TemplatedSoftLeptonTagInfo* clone(void) const override { return new TemplatedSoftLeptonTagInfo(*this); }

unsigned int leptons(void) const {
return m_leptons.size();
Expand All @@ -141,7 +141,7 @@ class TemplatedSoftLeptonTagInfo : public JetTagInfo {
}

/// returns a description of the extended informations in a TaggingVariableList
virtual TaggingVariableList taggingVariables(void) const;
TaggingVariableList taggingVariables(void) const override;

// Used by ROOT storage
CMS_CLASS_VERSION(2)
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/BTauReco/interface/TrackCountingTagInfo.h
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ class TrackCountingTagInfo : public JTATagInfo

TrackCountingTagInfo() {}

virtual ~TrackCountingTagInfo() {}
~TrackCountingTagInfo() override {}

/* virtual const Track & track(size_t n,int ipType) const
{
Expand Down Expand Up @@ -75,7 +75,7 @@ class TrackCountingTagInfo : public JTATagInfo
else return m_significance2d.size();
}

virtual TrackCountingTagInfo* clone() const { return new TrackCountingTagInfo( * this ); }
TrackCountingTagInfo* clone() const override { return new TrackCountingTagInfo( * this ); }

private:
std::vector<double> m_significance2d; //create a smarter container instead of
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/BTauReco/interface/TrackProbabilityTagInfo.h
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ class TrackProbabilityTagInfo : public JTATagInfo

TrackProbabilityTagInfo() {}

virtual ~TrackProbabilityTagInfo() {}
~TrackProbabilityTagInfo() override {}

int factorial(int n) const
{
Expand Down Expand Up @@ -124,7 +124,7 @@ int factorial(int n) const
return *tracks()[trackIndex(n,ipType)];
}

virtual TrackProbabilityTagInfo* clone() const { return new TrackProbabilityTagInfo( * this ); }
TrackProbabilityTagInfo* clone() const override { return new TrackProbabilityTagInfo( * this ); }

private:
std::vector<double> m_probability2d; //
Expand Down
12 changes: 6 additions & 6 deletions DataFormats/BTauReco/src/IsolatedTauTagInfo.cc
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ const TrackRef IsolatedTauTagInfo::leadingSignalTrack(const float rm_cone, const
const RefVector<TrackCollection> sTracks = tracksInCone(jet3Vec, rm_cone, pt_min);
TrackRef leadTk;
float pt_cut = pt_min;
if (sTracks.size() >0)
if (!sTracks.empty())
{
RefVector<TrackCollection>::const_iterator myTrack =sTracks.begin();
for(;myTrack!=sTracks.end();myTrack++)
Expand All @@ -77,7 +77,7 @@ const TrackRef IsolatedTauTagInfo::leadingSignalTrack(const math::XYZVector& my
const RefVector<TrackCollection> sTracks = tracksInCone(myVector, rm_cone, pt_min);
TrackRef leadTk;
float pt_cut = pt_min;
if (sTracks.size() >0)
if (!sTracks.empty())
{
RefVector<TrackCollection>::const_iterator myTrack =sTracks.begin();
for(;myTrack!=sTracks.end();myTrack++)
Expand Down Expand Up @@ -106,7 +106,7 @@ float IsolatedTauTagInfo::discriminator(float m_cone, float sig_cone, float iso_
const RefVector<TrackCollection> signalTracks = tracksInCone(trackMomentum, sig_cone, pt_min_tk);
const RefVector<TrackCollection> isolationTracks = tracksInCone(trackMomentum, iso_cone, pt_min_tk);

if (signalTracks.size() > 0 && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
if (!signalTracks.empty() && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
myDiscriminator=1;

return myDiscriminator;
Expand All @@ -128,7 +128,7 @@ const TrackRef leadTk = leadingSignalTrack(myVector, m_cone, pt_min_lt);
const RefVector<TrackCollection> signalTracks = tracksInCone(trackMomentum, sig_cone, pt_min_tk);
const RefVector<TrackCollection> isolationTracks = tracksInCone(trackMomentum, iso_cone, pt_min_tk);

if (signalTracks.size() > 0 && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
if (!signalTracks.empty() && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
myDiscriminator=1;

return myDiscriminator;
Expand All @@ -151,7 +151,7 @@ float IsolatedTauTagInfo::discriminator(float m_cone, float sig_cone, float iso_
const RefVector<TrackCollection> signalTracks = tracksInCone(trackMomentum, sig_cone, pt_min_tk, z_pv, dz_lt);
const RefVector<TrackCollection> isolationTracks = tracksInCone(trackMomentum, iso_cone, pt_min_tk, z_pv, dz_lt);

if (signalTracks.size() > 0 && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
if (!signalTracks.empty() && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
myDiscriminator=1;

return myDiscriminator;
Expand All @@ -171,7 +171,7 @@ const TrackRef leadTk = leadingSignalTrack(myVector, m_cone, pt_min_lt);
const RefVector<TrackCollection> signalTracks = tracksInCone(trackMomentum, sig_cone, pt_min_tk, z_pv, dz_lt);
const RefVector<TrackCollection> isolationTracks = tracksInCone(trackMomentum, iso_cone, pt_min_tk, z_pv, dz_lt);

if (signalTracks.size() > 0 && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
if (!signalTracks.empty() && (int)(isolationTracks.size() - signalTracks.size()) <= nTracksIsoRing)
myDiscriminator=1;

return myDiscriminator;
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/BTauReco/src/TauImpactParameterInfo.cc
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ const reco::TauImpactParameterTrackData* TauImpactParameterInfo::getTrackData(co

if (iter != trackDataMap.end()) return &(iter->val);

return 0; // if track not found return 0
return nullptr; // if track not found return 0
}

void reco::TauImpactParameterInfo::storeTrackData(const reco::TrackRef & trackRef,
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/BTauReco/src/TauMassTagInfo.cc
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ bool reco::TauMassTagInfo::calculateTrkP4(double matching_cone,
const RefVector<TrackCollection> signalTracks =
isolatedTau->tracksInCone(momentum,signal_cone,1.0);
// if (signalTracks.size() == 0 || signalTracks.size()%2 == 0) return false;
if (signalTracks.size() == 0) return false;
if (signalTracks.empty()) return false;

double px_inv = 0.0;
double py_inv = 0.0;
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CSCDigi/src/CSCCFEBStatusDigi.cc
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ void CSCCFEBStatusDigi::print() const {

std::ostringstream ost;
ost << " SCAFullCond: ";
if(getSCAFullCond().size()!=0){
if(!getSCAFullCond().empty()){
for (size_t i = 0; i<4; ++i ){ ost << " " <<(getSCAFullCond())[i]; }
}
else {
Expand Down
10 changes: 5 additions & 5 deletions DataFormats/CSCRecHit/interface/CSCRecHit2D.h
View file
Open in desktop
Expand Up @@ -42,13 +42,13 @@ class CSCRecHit2D final : public RecHit2DLocalPos {
int scaledWireTime=0,
float energyDeposit=-995.);

~CSCRecHit2D();
~CSCRecHit2D() override;


/// RecHit2DLocalPos base class interface
CSCRecHit2D* clone() const { return new CSCRecHit2D( *this ); }
LocalPoint localPosition() const { return theLocalPosition; }
LocalError localPositionError() const { return theLocalError; }
CSCRecHit2D* clone() const override { return new CSCRecHit2D( *this ); }
LocalPoint localPosition() const override { return theLocalPosition; }
LocalError localPositionError() const override { return theLocalError; }
CSCDetId cscDetId() const { return geographicalId(); }

/// Extracting strip channel numbers comprising the rechit - low
Expand Down Expand Up @@ -100,7 +100,7 @@ class CSCRecHit2D final : public RecHit2DLocalPos {
float energyDepositedInLayer() const { return theEnergyDeposit; }

/// Returns true if the two TrackingRecHits are using the same input information, false otherwise. In this case, looks at the geographical ID and channel numbers for strips and wires.
virtual bool sharesInput(const TrackingRecHit *other, TrackingRecHit::SharedInputType what) const;
bool sharesInput(const TrackingRecHit *other, TrackingRecHit::SharedInputType what) const override;

/// Returns true if the two TrackingRecHits are using the same input information, false otherwise. In this case, looks at the geographical ID and channel numbers for strips and wires.
bool sharesInput(const TrackingRecHit *other, CSCRecHit2D::SharedInputType what) const;
Expand Down