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

Clean up DQM/HLTEvF based on Clang warnings/errors #6359

Merged
merged 3 commits into from Nov 13, 2014
Merged

Clean up DQM/HLTEvF based on Clang warnings/errors #6359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22509f5
Resolve unused variable 'SECS_PER_LUMI' error
Nov 12, 2014
82c0ec2
Resolve all -Wunused-private-field warnings
Nov 12, 2014
5ff99b2
std::fabs ==> std::abs if argument is int
Nov 12, 2014
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
6 changes: 0 additions & 6 deletions DQM/HLTEvF/interface/FourVectorHLT.h
View file
Open in desktop
Expand Up @@ -68,19 +68,13 @@ class FourVectorHLT : public edm::EDAnalyzer {
int nev_;
DQMStore * dbe_;

MonitorElement* total_;

bool plotAll_;
bool resetMe_;
int currentRun_;

unsigned int nBins_;
double ptMin_ ;
double ptMax_ ;

std::string dirname_;
bool monitorDaemon_;
int theHLTOutputType;
edm::InputTag triggerSummaryLabel_;
edm::InputTag triggerResultLabel_;

Expand Down
6 changes: 1 addition & 5 deletions DQM/HLTEvF/interface/FourVectorHLTOnline.h
View file
Open in desktop
Expand Up @@ -148,8 +148,6 @@ class FourVectorHLTOnline : public edm::EDAnalyzer {
unsigned int Nbx_;

bool plotAll_;
bool resetMe_;
int currentRun_;

unsigned int nBins_;
unsigned int nBinsOneOverEt_;
Expand Down Expand Up @@ -200,8 +198,6 @@ class FourVectorHLTOnline : public edm::EDAnalyzer {
std::string dirname_;
std::string processname_;
std::string muonRecoCollectionName_;
bool monitorDaemon_;
int theHLTOutputType;
edm::InputTag triggerSummaryLabel_;
edm::InputTag triggerResultsLabel_;
HLTConfigProvider hltConfig_;
Expand Down Expand Up @@ -695,7 +691,7 @@ bool objMonData<T>::isL1TriggerType(int t)
for(std::vector<int>::const_iterator it = l1triggerType_.begin(); it != l1triggerType_.end(); ++it)
{

if(fabs(t) == fabs(*it)) { rc = true; break; }
if(std::abs(t) == std::abs(*it)) { rc = true; break; }

} // end for

Expand Down
12 changes: 0 additions & 12 deletions DQM/HLTEvF/interface/HLTAlCaMonPi0.h
View file
Open in desktop
Expand Up @@ -32,9 +32,6 @@ class ecalRecHitLess : public std::binary_function<EcalRecHit, EcalRecHit, bool>
}
};




class DQMStore;
class MonitorElement;

Expand Down Expand Up @@ -245,9 +242,6 @@ class HLTAlCaMonPi0 : public edm::EDAnalyzer {
edm::InputTag productMonitoredEEpi0_;
edm::InputTag productMonitoredEEeta_;

int gammaCandEtaSize_;
int gammaCandPhiSize_;

double seleXtalMinEnergy_;
double seleXtalMinEnergyEndCap_;

Expand Down Expand Up @@ -304,12 +298,6 @@ class HLTAlCaMonPi0 : public edm::EDAnalyzer {
double seleEtaBeltDetaEndCap_;


bool ParameterLogWeighted_;
double ParameterX0_;
double ParameterT0_barl_;
double ParameterT0_endc_;
double ParameterT0_endcPresh_;
double ParameterW0_;



Expand Down
1 change: 0 additions & 1 deletion DQM/HLTEvF/interface/HLTEventInfoClient.h
View file
Open in desktop
Expand Up @@ -70,7 +70,6 @@ class HLTEventInfoClient: public edm::EDAnalyzer {
int counterEvt_; ///counter
int prescaleLS_; ///units of lumi sections
int prescaleEvt_; ///prescale on number of events
int nChannels;
Float_t reportSummary;
Float_t summarySum;
Float_t summaryContent[20];
Expand Down
2 changes: 0 additions & 2 deletions DQM/HLTEvF/interface/HLTMon.h
View file
Open in desktop
Expand Up @@ -85,9 +85,7 @@ class HLTMon : public edm::EDAnalyzer {
unsigned int theNbins ;

std::string dirname_;
bool monitorDaemon_;
std::ofstream logFile_;
int theHLTOutputType;
std::string outputFile_;

std::string histoTitle;
Expand Down
2 changes: 0 additions & 2 deletions DQM/HLTEvF/interface/HLTMonElectron.h
View file
Open in desktop
Expand Up @@ -81,9 +81,7 @@ class HLTMonElectron : public edm::EDAnalyzer {
unsigned int theNbins ;

std::string dirname_;
bool monitorDaemon_;
std::ofstream logFile_;
int theHLTOutputType;
std::string outputFile_;

};
Expand Down
1 change: 0 additions & 1 deletion DQM/HLTEvF/interface/HLTMonElectronConsumer.h
View file
Open in desktop
Expand Up @@ -80,7 +80,6 @@ class HLTMonElectronConsumer : public edm::EDAnalyzer {
std::string dirname_;
std::string pixeldirname_;
std::string isodirname_;
bool monitorDaemon_;
std::ofstream logFile_;
std::string outputFile_;

Expand Down
2 changes: 0 additions & 2 deletions DQM/HLTEvF/interface/HLTMonHcalIsoTrack.h
View file
Open in desktop
Expand Up @@ -28,8 +28,6 @@ class HLTMonHcalIsoTrack : public edm::EDAnalyzer {

private:

int evtBuf;

DQMStore* dbe_;

virtual void beginJob() ;
Expand Down
2 changes: 0 additions & 2 deletions DQM/HLTEvF/interface/HLTMonMuonClient.h
View file
Open in desktop
Expand Up @@ -49,8 +49,6 @@ class HLTMonMuonClient: public edm::EDAnalyzer {

static const int NTRIG = 20;

int nTriggers_;

DQMStore* dbe_;
std::string indir_, outdir_;

Expand Down
1 change: 0 additions & 1 deletion DQM/HLTEvF/interface/HLTMonPhotonClient.h
View file
Open in desktop
Expand Up @@ -56,7 +56,6 @@ class HLTMonPhotonClient : public edm::EDAnalyzer {

std::string dirname_;
std::string sourcedirname_;
bool monitorDaemon_;
std::ofstream logFile_;
std::string outputFile_;
std::vector<edm::InputTag> theHLTCollectionLabels;
Expand Down
2 changes: 0 additions & 2 deletions DQM/HLTEvF/interface/HLTMonPhotonSource.h
View file
Open in desktop
Expand Up @@ -68,9 +68,7 @@ class HLTMonPhotonSource : public edm::EDAnalyzer {


std::string dirname_;
bool monitorDaemon_;
std::ofstream logFile_;
int theHLTOutputType;
std::string outputFile_;

};
Expand Down
7 changes: 0 additions & 7 deletions DQM/HLTEvF/interface/HLTMonSimpleBTag.h
View file
Open in desktop
Expand Up @@ -76,19 +76,12 @@ class HLTMonSimpleBTag : public edm::EDAnalyzer {
int refresheff_;
DQMStore * dbe_;

MonitorElement* total_;

bool resetMe_;
int currentRun_;

unsigned int nBins_;
double ptMin_ ;
double ptMax_ ;
double dRTrigObjMatch_;

std::string dirname_;
bool monitorDaemon_;
int theHLTOutputType;
edm::InputTag triggerSummaryLabel_;
edm::InputTag triggerResultLabel_;

Expand Down
6 changes: 0 additions & 6 deletions DQM/HLTEvF/interface/PathTimerService.h
View file
Open in desktop
Expand Up @@ -40,13 +40,7 @@ namespace edm {
edm::EventID curr_event_;
double curr_job_; // seconds
double curr_event_time_; // seconds
double curr_module_time_; // seconds

//
// Min Max and average event times for summary
// at end of job
double max_event_time_; // seconds
double min_event_time_; // seconds
int total_event_count_;

ParameterSet _myPS;
Expand Down
40 changes: 0 additions & 40 deletions DQM/HLTEvF/interface/TrigResRateMon.h
View file
Open in desktop
Expand Up @@ -158,7 +158,6 @@ class TrigResRateMon : public edm::EDAnalyzer {

bool jmsDebug;
bool jmsFakeZBCounts;
unsigned int zbIndex;
bool found_zbIndex;

MonitorElement* ME_HLTAll_LS;
Expand Down Expand Up @@ -236,7 +235,6 @@ class TrigResRateMon : public edm::EDAnalyzer {
bool plotAll_;
bool doCombineRuns_;
bool doVBTFMuon_;
int currentRun_;

unsigned int nBins_;
unsigned int nBins2D_;
Expand All @@ -247,42 +245,6 @@ class TrigResRateMon : public edm::EDAnalyzer {
double dRMax_ ;
double dRMaxElectronMuon_ ;

double electronEtaMax_;
double electronEtMin_;
double electronDRMatch_;
double electronL1DRMatch_;
double muonEtaMax_;
double muonEtMin_;
double muonDRMatch_;
double muonL1DRMatch_;
double tauEtaMax_;
double tauEtMin_;
double tauDRMatch_;
double tauL1DRMatch_;
double jetEtaMax_;
double jetEtMin_;
double jetDRMatch_;
double jetL1DRMatch_;
double bjetEtaMax_;
double bjetEtMin_;
double bjetDRMatch_;
double bjetL1DRMatch_;
double photonEtaMax_;
double photonEtMin_;
double photonDRMatch_;
double photonL1DRMatch_;
double trackEtaMax_;
double trackEtMin_;
double trackDRMatch_;
double trackL1DRMatch_;
double metEtaMax_;
double metMin_;
double metDRMatch_;
double metL1DRMatch_;
double htEtaMax_;
double htMin_;
double htDRMatch_;
double htL1DRMatch_;
double sumEtMin_;

// Muon quality cuts
Expand Down Expand Up @@ -313,8 +275,6 @@ class TrigResRateMon : public edm::EDAnalyzer {
std::string dirname_;
std::string processname_;
std::string muonRecoCollectionName_;
bool monitorDaemon_;
int theHLTOutputType;
edm::InputTag triggerSummaryLabel_;
edm::InputTag triggerResultsLabel_;
edm::InputTag recHitsEBTag_, recHitsEETag_;
Expand Down
3 changes: 1 addition & 2 deletions DQM/HLTEvF/plugins/FourVectorHLT.cc
View file
Open in desktop
Expand Up @@ -14,8 +14,7 @@

using namespace edm;

FourVectorHLT::FourVectorHLT(const edm::ParameterSet& iConfig):
resetMe_(true), currentRun_(-99)
FourVectorHLT::FourVectorHLT(const edm::ParameterSet& iConfig)
{
LogDebug("FourVectorHLT") << "constructor...." ;

Expand Down
3 changes: 1 addition & 2 deletions DQM/HLTEvF/plugins/FourVectorHLTOnline.cc
View file
Open in desktop
Expand Up @@ -11,8 +11,7 @@ using namespace edm;
using namespace trigger;
using namespace std;

FourVectorHLTOnline::FourVectorHLTOnline(const edm::ParameterSet& iConfig):
resetMe_(true), currentRun_(-99)
FourVectorHLTOnline::FourVectorHLTOnline(const edm::ParameterSet& iConfig)
{

LogDebug("FourVectorHLTOnline") << "constructor...." ;
Expand Down
3 changes: 1 addition & 2 deletions DQM/HLTEvF/plugins/HLTMonSimpleBTag.cc
View file
Open in desktop
Expand Up @@ -18,8 +18,7 @@

using namespace edm;

HLTMonSimpleBTag::HLTMonSimpleBTag(const edm::ParameterSet& iConfig):
resetMe_(true), currentRun_(-99)
HLTMonSimpleBTag::HLTMonSimpleBTag(const edm::ParameterSet& iConfig)
{
LogDebug("HLTMonSimpleBTag") << "constructor...." ;

Expand Down
2 changes: 1 addition & 1 deletion DQM/HLTEvF/plugins/TrigResRateMon.cc
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ using namespace edm;
using namespace trigger;
using namespace std;

TrigResRateMon::TrigResRateMon(const edm::ParameterSet& iConfig): currentRun_(-99)
TrigResRateMon::TrigResRateMon(const edm::ParameterSet& iConfig)
{

LogDebug("TrigResRateMon") << "constructor...." ;
Expand Down
3 changes: 0 additions & 3 deletions DQM/HLTEvF/plugins/TriggerRatesMonitor.cc
View file
Open in desktop
Expand Up @@ -40,9 +40,6 @@
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
#include "DQMServices/Core/interface/MonitorElement.h"

// length of a lumisections, corresponding to 2**18 LHC orbits, or 23.31 seconds
static const double SECS_PER_LUMI = 23.31040958083832;

// helper functions
template <typename T>
static
Expand Down