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 Fireworks #20861

Merged
merged 1 commit into from Oct 9, 2017
Merged

Clang-tidy checks for Fireworks #20861

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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Fireworks/Calo/interface/FWBoxRecHit.h
View file
Open in desktop
Expand Up @@ -51,8 +51,8 @@ class FWBoxRecHit
void setIsTallest( );

private:
FWBoxRecHit( const FWBoxRecHit& ); // Disable default
const FWBoxRecHit& operator=( const FWBoxRecHit& ); // Disable default
FWBoxRecHit( const FWBoxRecHit& ) = delete; // Disable default
const FWBoxRecHit& operator=( const FWBoxRecHit& ) = delete; // Disable default

// --------------------- Member Functions --------------------------
void setupEveBox( std::vector<TEveVector> &corners, float scale );
Expand Down
8 changes: 4 additions & 4 deletions Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h
View file
Open in desktop
Expand Up @@ -12,13 +12,13 @@ class FWCaloDataHistProxyBuilder : public FWCaloDataProxyBuilderBase
{
public:
FWCaloDataHistProxyBuilder();
virtual ~FWCaloDataHistProxyBuilder();
~FWCaloDataHistProxyBuilder() override;

protected:
virtual bool assertCaloDataSlice();
bool assertCaloDataSlice() override;
virtual FWHistSliceSelector* instantiateSliceSelector() = 0;
virtual void itemBeingDestroyed(const FWEventItem*);
virtual void setCaloData(const fireworks::Context&);
void itemBeingDestroyed(const FWEventItem*) override;
void setCaloData(const fireworks::Context&) override;
void addEntryToTEveCaloData(float eta, float phi, float Et, bool isSelected);

TH2F* m_hist;
Expand Down
16 changes: 8 additions & 8 deletions Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h
View file
Open in desktop
Expand Up @@ -35,19 +35,19 @@ class FWCaloDataProxyBuilderBase : public FWProxyBuilderBase
{
public:
FWCaloDataProxyBuilderBase();
virtual ~FWCaloDataProxyBuilderBase();
~FWCaloDataProxyBuilderBase() override;

// ---------- const member functions ---------------------

virtual bool willHandleInteraction() const { return true; }
bool willHandleInteraction() const override { return true; }

// ---------- static member functions --------------------

// ---------- member functions ---------------------------

protected:
virtual void build(const FWEventItem* iItem,
TEveElementList* product, const FWViewContext*);
void build(const FWEventItem* iItem,
TEveElementList* product, const FWViewContext*) override;

virtual void setCaloData(const fireworks::Context&) = 0;
virtual void fillCaloData() = 0;
Expand All @@ -56,17 +56,17 @@ class FWCaloDataProxyBuilderBase : public FWProxyBuilderBase
// ---------- member data --------------------------------
TEveCaloData* m_caloData;
Int_t m_sliceIndex;
virtual void itemBeingDestroyed(const FWEventItem*);
void itemBeingDestroyed(const FWEventItem*) override;

private:
FWCaloDataProxyBuilderBase(const FWCaloDataProxyBuilderBase&); // stop default
FWCaloDataProxyBuilderBase(const FWCaloDataProxyBuilderBase&) = delete; // stop default

const FWCaloDataProxyBuilderBase& operator=(const FWCaloDataProxyBuilderBase&); // stop default
const FWCaloDataProxyBuilderBase& operator=(const FWCaloDataProxyBuilderBase&) = delete; // stop default

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


virtual void modelChanges(const FWModelIds&, Product*);
void modelChanges(const FWModelIds&, Product*) override;

void clearCaloDataSelection();
};
Expand Down
6 changes: 3 additions & 3 deletions Fireworks/Calo/interface/FWECALDetailViewBase.h
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ template <typename T>
class FWECALDetailViewBase : public FWDetailViewGL<T> {
public:
FWECALDetailViewBase ();//: m_data(0), m_builder(0), m_legend(0) {}
virtual ~FWECALDetailViewBase();// { delete m_data; }
~FWECALDetailViewBase() override;// { delete m_data; }


protected:
Expand All @@ -23,10 +23,10 @@ class FWECALDetailViewBase : public FWDetailViewGL<T> {

private:
using FWDetailView<T>::build;
void build(const FWModelId &id, const T*);
void build(const FWModelId &id, const T*) override;

using FWDetailViewGL<T>::setTextInfo;
void setTextInfo(const FWModelId &id, const T*);
void setTextInfo(const FWModelId &id, const T*) override;

};

Expand Down
6 changes: 3 additions & 3 deletions Fireworks/Calo/interface/FWHistSliceSelector.h
View file
Open in desktop
Expand Up @@ -8,10 +8,10 @@ class FWHistSliceSelector : public FWFromSliceSelector
{
public:
FWHistSliceSelector(TH2F* h, const FWEventItem* item);
virtual ~FWHistSliceSelector();
~FWHistSliceSelector() override;

virtual void doSelect(const TEveCaloData::CellId_t&);
virtual void doUnselect(const TEveCaloData::CellId_t&);
void doSelect(const TEveCaloData::CellId_t&) override;
void doUnselect(const TEveCaloData::CellId_t&) override;

virtual bool aggregatePhiCells() const { return true; }

Expand Down
20 changes: 10 additions & 10 deletions Fireworks/Calo/interface/FWTauProxyBuilderBase.h
View file
Open in desktop
Expand Up @@ -43,27 +43,27 @@ class FWTauProxyBuilderBase : public FWProxyBuilderBase
{
public:
FWTauProxyBuilderBase();
virtual ~FWTauProxyBuilderBase();
~FWTauProxyBuilderBase() override;

virtual bool haveSingleProduct() const { return false; }
virtual bool havePerViewProduct(FWViewType::EType) const { return true; }
virtual void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc);
virtual void cleanLocal();
bool haveSingleProduct() const override { return false; }
bool havePerViewProduct(FWViewType::EType) const override { return true; }
void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc) override;
void cleanLocal() override;

virtual void setItem(const FWEventItem* iItem);
void setItem(const FWEventItem* iItem) override;

protected:
float m_minTheta;
float m_maxTheta;
std::vector<double> m_phis;
void buildBaseTau( const reco::BaseTau& iTau, const reco::Jet* iJet, TEveElement* comp, FWViewType::EType type, const FWViewContext* vc);

virtual void localModelChanges(const FWModelId& iId, TEveElement* iCompound,
FWViewType::EType viewType, const FWViewContext* vc);
void localModelChanges(const FWModelId& iId, TEveElement* iCompound,
FWViewType::EType viewType, const FWViewContext* vc) override;
private:
FWTauProxyBuilderBase(const FWTauProxyBuilderBase&); // stop default
FWTauProxyBuilderBase(const FWTauProxyBuilderBase&) = delete; // stop default

const FWTauProxyBuilderBase& operator=(const FWTauProxyBuilderBase&); // stop default
const FWTauProxyBuilderBase& operator=(const FWTauProxyBuilderBase&) = delete; // stop default

// ---------- member data --------------------------------
// Add Tracks which passed quality cuts and
Expand Down
12 changes: 6 additions & 6 deletions Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc
View file
Open in desktop
Expand Up @@ -9,16 +9,16 @@ class FWCaloClusterProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Calo
{
public:
FWCaloClusterProxyBuilder( void ) {}
virtual ~FWCaloClusterProxyBuilder( void ) {}
~FWCaloClusterProxyBuilder( void ) override {}

REGISTER_PROXYBUILDER_METHODS();

private:
FWCaloClusterProxyBuilder( const FWCaloClusterProxyBuilder& ); // stop default
const FWCaloClusterProxyBuilder& operator=( const FWCaloClusterProxyBuilder& ); // stop default
FWCaloClusterProxyBuilder( const FWCaloClusterProxyBuilder& ) = delete; // stop default
const FWCaloClusterProxyBuilder& operator=( const FWCaloClusterProxyBuilder& ) = delete; // stop default

using FWSimpleProxyBuilderTemplate<reco::CaloCluster>::build;
void build( const reco::CaloCluster& iData, unsigned int iIndex, TEveElement& oItemHolder, const FWViewContext* );
void build( const reco::CaloCluster& iData, unsigned int iIndex, TEveElement& oItemHolder, const FWViewContext* ) override;
};

void
Expand All @@ -29,13 +29,13 @@ FWCaloClusterProxyBuilder::build( const reco::CaloCluster& iData, unsigned int i
TEveBoxSet* boxset = new TEveBoxSet();
boxset->Reset(TEveBoxSet::kBT_FreeBox, true, 64);
boxset->UseSingleColor();
boxset->SetPickable(1);
boxset->SetPickable(true);

for( std::vector<std::pair<DetId, float> >::iterator it = clusterDetIds.begin(), itEnd = clusterDetIds.end();
it != itEnd; ++it )
{
const float* corners = item()->getGeom()->getCorners( (*it).first );
if( corners == 0 ) {
if( corners == nullptr ) {
continue;
}
std::vector<float> pnts(24);
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWCaloRecHitDigitSetProxyBuilder.cc
View file
Open in desktop
Expand Up @@ -127,7 +127,7 @@ FWCaloRecHitDigitSetProxyBuilder::scaleProduct(TEveElementList* parent, FWViewTy
{
const CaloRecHit* hit = (const CaloRecHit*)item()->modelData(index);
const float* corners = item()->getGeom()->getCorners(hit->detid());
if (corners == 0) continue;
if (corners == nullptr) continue;

FWDigitSetProxyBuilder::BFreeBox_t* b = (FWDigitSetProxyBuilder::BFreeBox_t*)boxSet->GetPlex()->Atom(index);

Expand Down
14 changes: 7 additions & 7 deletions Fireworks/Calo/plugins/FWCaloRecHitDigitSetProxyBuilder.h
View file
Open in desktop
Expand Up @@ -10,22 +10,22 @@ class FWCaloRecHitDigitSetProxyBuilder : public FWDigitSetProxyBuilder
{
public:
FWCaloRecHitDigitSetProxyBuilder();
virtual ~FWCaloRecHitDigitSetProxyBuilder( void ) {}
~FWCaloRecHitDigitSetProxyBuilder( void ) override {}

virtual void setItem(const FWEventItem* iItem);
void setItem(const FWEventItem* iItem) override;

virtual bool havePerViewProduct(FWViewType::EType) const { return true; }
virtual void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc);
virtual void build( const FWEventItem* iItem, TEveElementList* product, const FWViewContext* );
bool havePerViewProduct(FWViewType::EType) const override { return true; }
void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc) override;
void build( const FWEventItem* iItem, TEveElementList* product, const FWViewContext* ) override;

virtual float scaleFactor(const FWViewContext* vc);
virtual void invertBox(bool x ) { m_invertBox = x ;}
virtual void viewContextBoxScale( const float* corners, float scale, bool plotEt, std::vector<float>& scaledCorners, const CaloRecHit*);

private:

FWCaloRecHitDigitSetProxyBuilder( const FWCaloRecHitDigitSetProxyBuilder& );
const FWCaloRecHitDigitSetProxyBuilder& operator=( const FWCaloRecHitDigitSetProxyBuilder& );
FWCaloRecHitDigitSetProxyBuilder( const FWCaloRecHitDigitSetProxyBuilder& ) = delete;
const FWCaloRecHitDigitSetProxyBuilder& operator=( const FWCaloRecHitDigitSetProxyBuilder& ) = delete;

bool m_invertBox;
bool m_ignoreGeoShapeSize;
Expand Down
14 changes: 7 additions & 7 deletions Fireworks/Calo/plugins/FWCaloTauProxyBuilder.cc
View file
Open in desktop
Expand Up @@ -34,25 +34,25 @@ class FWCaloTauProxyBuilder : public FWTauProxyBuilderBase
{
public:
FWCaloTauProxyBuilder() {}
virtual ~FWCaloTauProxyBuilder() {}
~FWCaloTauProxyBuilder() override {}

REGISTER_PROXYBUILDER_METHODS();

private:
FWCaloTauProxyBuilder(const FWCaloTauProxyBuilder&); // stop default
const FWCaloTauProxyBuilder& operator=(const FWCaloTauProxyBuilder&); // stop default
FWCaloTauProxyBuilder(const FWCaloTauProxyBuilder&) = delete; // stop default
const FWCaloTauProxyBuilder& operator=(const FWCaloTauProxyBuilder&) = delete; // stop default

using FWTauProxyBuilderBase::buildViewType;
virtual void buildViewType( const FWEventItem* iItem, TEveElementList* product, FWViewType::EType viewType , const FWViewContext* vc);
void buildViewType( const FWEventItem* iItem, TEveElementList* product, FWViewType::EType viewType , const FWViewContext* vc) override;

};

void
FWCaloTauProxyBuilder::buildViewType( const FWEventItem* iItem, TEveElementList* product, FWViewType::EType viewType , const FWViewContext* vc)
{
reco::CaloTauCollection const * caloTaus = 0;
reco::CaloTauCollection const * caloTaus = nullptr;
iItem->get( caloTaus );
if( caloTaus == 0 ) return;
if( caloTaus == nullptr ) return;


Int_t idx = 0;
Expand Down Expand Up @@ -98,7 +98,7 @@ FWCaloTauProxyBuilder::buildViewType( const FWEventItem* iItem, TEveElementList*
catch (std::exception& e)
{
fwLog(fwlog::kInfo) << "FWPFTauProxyBuilder missing PFTauTagInfo. Skip drawing of jets.\n";
buildBaseTau(*it, 0, comp, viewType, vc);
buildBaseTau(*it, nullptr, comp, viewType, vc);
}
}
setupAddElement( comp, product );
Expand Down
6 changes: 3 additions & 3 deletions Fireworks/Calo/plugins/FWCaloTowerDetailView.cc
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@
// constructors and destructor
//
FWCaloTowerDetailView::FWCaloTowerDetailView():
m_data(0),
m_builder(0)
m_data(nullptr),
m_builder(nullptr)
{
}

Expand Down Expand Up @@ -48,7 +48,7 @@ void FWCaloTowerDetailView::build(const FWModelId &id, const CaloTower* iTower)
overlay->SetShowPlane(kFALSE);
overlay->SetShowPerspective(kFALSE);
overlay->SetCaloLego(lego);
overlay->SetShowScales(1); // temporary
overlay->SetShowScales(true); // temporary
viewerGL()->AddOverlayElement(overlay);

// set event handler and flip camera to top view at beginning
Expand Down
6 changes: 3 additions & 3 deletions Fireworks/Calo/plugins/FWCaloTowerDetailView.h
View file
Open in desktop
Expand Up @@ -19,12 +19,12 @@ class FWCaloTowerDetailView : public FWDetailViewGL<CaloTower> {

public:
FWCaloTowerDetailView();
virtual ~FWCaloTowerDetailView();
~FWCaloTowerDetailView() override;

using FWDetailViewGL<CaloTower>::build;
virtual void build (const FWModelId &id, const CaloTower*);
void build (const FWModelId &id, const CaloTower*) override;
private:
virtual void setTextInfo(const FWModelId&, const CaloTower*);
void setTextInfo(const FWModelId&, const CaloTower*) override;
TEveCaloData* m_data;
FWECALDetailViewBuilder* m_builder;
};
Expand Down
6 changes: 3 additions & 3 deletions Fireworks/Calo/plugins/FWCaloTowerProxyBuilder.cc
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
//

// system includes
#include <math.h>
#include <cmath>

// user includes
#include "TEveCaloData.h"
Expand All @@ -35,7 +35,7 @@
//
FWCaloTowerProxyBuilderBase::FWCaloTowerProxyBuilderBase():
FWCaloDataHistProxyBuilder(),
m_towers(0)
m_towers(nullptr)
{
}

Expand All @@ -48,7 +48,7 @@ void
FWCaloTowerProxyBuilderBase::build(const FWEventItem* iItem,
TEveElementList* el, const FWViewContext* ctx)
{
m_towers=0;
m_towers=nullptr;
if (iItem)
{
iItem->get(m_towers);
Expand Down