Skip to content

[DQM] Apply code-checks/format with misc-definitions-in-headers #34039

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

Merged
cmsbuild merged 3 commits into from
Jun 9, 2021
Merged

[DQM] Apply code-checks/format with misc-definitions-in-headers #34039

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
c6696f6
[DQM] Apply code-checks-all with misc-definitions-in-headers addition…
smuzaffar Jun 8, 2021
84e5d38
[DQM] apply code-format
smuzaffar Jun 8, 2021
091d37d
Merge branch 'master' into 12_0-code-checks-DQM
smuzaffar Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 58 additions & 52 deletions DQM/CSCMonitorModule/plugins/CSCDQM_Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,57 +66,63 @@
* Sequence of Global Parameters. Add new line or edit existing in form:
* (( type (C++), name (upper case), default value, "description" )) \
*/
#define CONFIG_PARAMETERS_SEQ \
\
((bool, PROCESS_DDU, true, "enter DDU (and latter Chamber) sections (EventProcessor flag)"))( \
(bool, PROCESS_CSC, true, "enter Chamber section (EventProcessor flag)"))( \
(bool, PROCESS_EFF_HISTOS, true, "calculate efficiency histograms (Dispatcher flag)"))( \
(bool, PROCESS_EFF_PARAMETERS, true, "calculate efficiency parameters (EventProcessor flag)"))( \
(bool, BINCHECKER_CRC_ALCT, false, "check ALCT CRC (CSCDCCExaminer flag)"))( \
(bool, BINCHECKER_CRC_CLCT, false, "check CLCT CRC (CSCDCCExaminer flag)"))( \
(bool, BINCHECKER_CRC_CFEB, false, "check CFEB CRC (CSCDCCExaminer flag)"))( \
(bool, BINCHECKER_MODE_DDU, true, "set DDU mode (CSCDCCExaminer flag)"))( \
(bool, BINCHECKER_OUTPUT, false, "print 1 and 2 output (CSCDCCExaminer flag)"))( \
(bool, \
FRAEFF_AUTO_UPDATE, \
false, \
"start fractional and efficiency histogram update automatically (Dispatcher flag)"))( \
(bool, \
FRAEFF_SEPARATE_THREAD, \
false, \
"start fractional and efficiency histogram update on separate thread (EventProcessor flag)"))( \
(bool, PRINT_STATS_ON_EXIT, true, "print statistics on exit (destruction)"))( \
(bool, IN_FULL_STANDBY, true, "full detector is in standby mode from the beginning of the run"))( \
(std::string, BOOKING_XML_FILE, "", "histogram description (booking) file in XML format (Collection)"))( \
(std::string, FOLDER_EMU, "", "root file folder name to be used for EMU histograms (EventProcessor)"))( \
(std::string, FOLDER_DDU, "", "root file folder name to be used for DDU histograms (EventProcessor)"))( \
(std::string, FOLDER_CSC, "", "root file folder name to be used for CSC histograms (EventProcessor)"))( \
(std::string, FOLDER_PAR, "", "root file folder name to be used for parameters (EventProcessor)"))(( \
unsigned int, DDU_CHECK_MASK, 0xFFFFFFFF, "mask for cumulative EmuFileReader DDU error flags (EventProcessor)"))( \
(unsigned int, DDU_BINCHECK_MASK, 0x02080016, "mask for DDU level examiner errors (CSCDCCExaminer)"))( \
(unsigned int, BINCHECK_MASK, 0xFFFFFFFF, "mask for chamber level examiner errors (CSCDCCExaminer)"))( \
(unsigned int, \
FRAEFF_AUTO_UPDATE_START, \
5, \
"event number to start automatic fractional and efficiency histogram updates from (Dispatcer)"))( \
(unsigned int, \
FRAEFF_AUTO_UPDATE_FREQ, \
1, \
"frequency in events to perform automatic fractional and efficiency histogram updates (Dispatcher)"))(( \
double, EFF_COLD_THRESHOLD, 0.1, "threshold in fraction to check for cold (not reporting) HW (EventProcessor)"))( \
(double, EFF_COLD_SIGFAIL, 5.0, "statistical significance for cold (not reporting) HW (EventProcessor)"))( \
(double, EFF_HOT_THRESHOLD, 0.1, "threshold in fraction to check for hot HW (EventProcessor)"))( \
(double, EFF_HOT_SIGFAIL, 5.0, "statistical significance for hot HW (EventProcessor)"))( \
(double, EFF_ERR_THRESHOLD, 0.1, "threshold in fraction to check for errors in HW (EventProcessor)"))( \
(double, EFF_ERR_SIGFAIL, 5.0, "statistical significance for errors in HW (EventProcessor)"))( \
(double, \
EFF_NODATA_THRESHOLD, \
0.1, \
"threshold in fraction to check for not reporting elements in HW (EventProcessor)"))( \
(double, EFF_NODATA_SIGFAIL, 5.0, "statistical significance for not reportingelements in HW (EventProcessor)"))( \
(unsigned int, EVENTS_ECHO, 1000, "frequency in events to print echo message (EventProcessor)"))( \
(std::string, FOLDER_FED, "", "root file folder name to be used for FED histograms (EventProcessor)"))( \
(bool, PREBOOK_ALL_HISTOS, true, "pre-book all FED, DDU, CSC histogragrams before run begins"))
#define CONFIG_PARAMETERS_SEQ \
\
((bool, PROCESS_DDU, true, "enter DDU (and latter Chamber) sections (EventProcessor flag)"))( \
(bool, PROCESS_CSC, true, "enter Chamber section (EventProcessor flag)"))( \
(bool, PROCESS_EFF_HISTOS, true, "calculate efficiency histograms (Dispatcher flag)"))(( \
bool, PROCESS_EFF_PARAMETERS, true, "calculate efficiency parameters (EventProcessor flag)"))(( \
bool, BINCHECKER_CRC_ALCT, false, "check ALCT CRC (CSCDCCExaminer flag)"))(( \
bool, BINCHECKER_CRC_CLCT, false, "check CLCT CRC (CSCDCCExaminer flag)"))(( \
bool, BINCHECKER_CRC_CFEB, false, "check CFEB CRC (CSCDCCExaminer flag)"))(( \
bool, BINCHECKER_MODE_DDU, true, "set DDU mode (CSCDCCExaminer flag)"))(( \
bool, BINCHECKER_OUTPUT, false, "print 1 and 2 output (CSCDCCExaminer flag)"))(( \
bool, \
FRAEFF_AUTO_UPDATE, \
false, \
"start fractional and efficiency histogram update automatically (Dispatcher flag)"))(( \
bool, \
FRAEFF_SEPARATE_THREAD, \
false, \
"start fractional and efficiency histogram update on separate thread (EventProcessor flag)"))(( \
bool, PRINT_STATS_ON_EXIT, true, "print statistics on exit (destruction)"))(( \
bool, IN_FULL_STANDBY, true, "full detector is in standby mode from the beginning of the run"))(( \
std::string, BOOKING_XML_FILE, "", "histogram description (booking) file in XML format (Collection)"))(( \
std::string, FOLDER_EMU, "", "root file folder name to be used for EMU histograms (EventProcessor)"))(( \
std::string, FOLDER_DDU, "", "root file folder name to be used for DDU histograms (EventProcessor)"))(( \
std::string, FOLDER_CSC, "", "root file folder name to be used for CSC histograms (EventProcessor)"))(( \
std::string, FOLDER_PAR, "", "root file folder name to be used for parameters (EventProcessor)"))(( \
unsigned int, \
DDU_CHECK_MASK, \
0xFFFFFFFF, \
"mask for cumulative EmuFileReader DDU error flags (EventProcessor)"))(( \
unsigned int, DDU_BINCHECK_MASK, 0x02080016, "mask for DDU level examiner errors (CSCDCCExaminer)"))(( \
unsigned int, BINCHECK_MASK, 0xFFFFFFFF, "mask for chamber level examiner errors (CSCDCCExaminer)"))(( \
unsigned int, \
FRAEFF_AUTO_UPDATE_START, \
5, \
"event number to start automatic fractional and efficiency histogram updates from (Dispatcer)"))(( \
unsigned int, \
FRAEFF_AUTO_UPDATE_FREQ, \
1, \
"frequency in events to perform automatic fractional and efficiency histogram updates (Dispatcher)"))(( \
double, \
EFF_COLD_THRESHOLD, \
0.1, \
"threshold in fraction to check for cold (not reporting) HW (EventProcessor)"))(( \
double, EFF_COLD_SIGFAIL, 5.0, "statistical significance for cold (not reporting) HW (EventProcessor)"))(( \
double, EFF_HOT_THRESHOLD, 0.1, "threshold in fraction to check for hot HW (EventProcessor)"))(( \
double, EFF_HOT_SIGFAIL, 5.0, "statistical significance for hot HW (EventProcessor)"))(( \
double, EFF_ERR_THRESHOLD, 0.1, "threshold in fraction to check for errors in HW (EventProcessor)"))(( \
double, EFF_ERR_SIGFAIL, 5.0, "statistical significance for errors in HW (EventProcessor)"))(( \
double, \
EFF_NODATA_THRESHOLD, \
0.1, \
"threshold in fraction to check for not reporting elements in HW (EventProcessor)"))(( \
double, EFF_NODATA_SIGFAIL, 5.0, "statistical significance for not reportingelements in HW (EventProcessor)"))(( \
unsigned int, EVENTS_ECHO, 1000, "frequency in events to print echo message (EventProcessor)"))(( \
std::string, FOLDER_FED, "", "root file folder name to be used for FED histograms (EventProcessor)"))(( \
bool, PREBOOK_ALL_HISTOS, true, "pre-book all FED, DDU, CSC histogragrams before run begins"))

/**
* Global Parameter Manipulation macros.
Expand Down Expand Up @@ -151,7 +157,7 @@
BOOST_PP_CAT(set, BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)) \
(ps.getUntrackedParameter<BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 0, elem)>( \
BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)), \
BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 2, elem)));
BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 2, elem)));

#endif

Expand Down
2 changes: 1 addition & 1 deletion DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class HistogramManagerHolder {
edm::Transition transition = edm::Transition::BeginRun)
: geometryInterface(iConfig.getParameter<edm::ParameterSet>("geometry"), std::move(iC), transition) {
auto histograms = iConfig.getParameter<edm::VParameterSet>("histograms");
for (auto histoconf : histograms) {
for (const auto& histoconf : histograms) {
histo.emplace_back(HistogramManager(histoconf, geometryInterface));
}
};
Expand Down
4 changes: 1 addition & 3 deletions DQM/SiStripMonitorClient/plugins/SiStripOfflineDQM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ SiStripOfflineDQM::SiStripOfflineDQM(edm::ParameterSet const& pSet)
}

if (createTkInfoFile_) {
tkinfoTree_ = edm::Service<TFileService> {}
->make<TTree>("TkDetIdInfo", "");
}
tkinfoTree_ = edm::Service<TFileService> { } -> make<TTree>("TkDetIdInfo", ""); }

// explicit dependency to make sure the QTest reults needed here are present
// already in endRun.
Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/RecoB/interface/FlavourHistorgrams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void FlavourHistograms<T>::fill(const int& flavour, const T& variable, const T&

template <class T>
void FlavourHistograms<T>::fill(const int& flavour, const T* variable) const {
if (theArrayDimension == 0) {
if (theArrayDimension == nullptr) {
// single variable
fillVariable(flavour, *variable, 1.);
} else {
Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/RecoB/interface/FlavourHistorgrams2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ void FlavourHistograms2D<T, G>::fill(const int &flavour, const T &variableX, con

template <class T, class G>
void FlavourHistograms2D<T, G>::fill(const int &flavour, const T *variableX, const G *variableY, const float &w) const {
if (theArrayDimension == 0) {
if (theArrayDimension == nullptr) {
// single variable
fillVariable(flavour, *variableX, *variableY, w);
} else {
Expand Down
3 changes: 3 additions & 0 deletions DQMOffline/Trigger/interface/HLTDQMFilterEffHists.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ template <typename ObjType>
void HLTDQMFilterEffHists<ObjType>::book1D(DQMStore::IBooker& iBooker, const edm::ParameterSet& histConfig) {
auto binLowEdgesDouble = histConfig.getParameter<std::vector<double> >("binLowEdges");
std::vector<float> binLowEdges;
binLowEdges.reserve(binLowEdgesDouble.size());
for (double lowEdge : binLowEdgesDouble)
binLowEdges.push_back(lowEdge);
auto nameSuffex = histConfig.getParameter<std::string>("nameSuffex");
Expand Down Expand Up @@ -154,8 +155,10 @@ void HLTDQMFilterEffHists<ObjType>::book2D(DQMStore::IBooker& iBooker, const edm
auto yBinLowEdgesDouble = histConfig.getParameter<std::vector<double> >("yBinLowEdges");
std::vector<float> xBinLowEdges;
std::vector<float> yBinLowEdges;
xBinLowEdges.reserve(xBinLowEdgesDouble.size());
for (double lowEdge : xBinLowEdgesDouble)
xBinLowEdges.push_back(lowEdge);
yBinLowEdges.reserve(yBinLowEdgesDouble.size());
for (double lowEdge : yBinLowEdgesDouble)
yBinLowEdges.push_back(lowEdge);
auto nameSuffex = histConfig.getParameter<std::string>("nameSuffex");
Expand Down
6 changes: 4 additions & 2 deletions DQMOffline/Trigger/interface/HLTTauRefProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@
#include "DataFormats/METReco/interface/CaloMET.h"
#include "DataFormats/METReco/interface/CaloMETCollection.h"

#include <vector>
#include <memory>

#include <string>
#include <vector>

typedef std::pair<edm::ProcessHistoryID, std::vector<int>> TauIDConfigCache;

Expand All @@ -59,7 +61,7 @@ class HLTTauRefProducer : public edm::global::EDProducer<edm::StreamCache<TauIDC
void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;

std::unique_ptr<TauIDConfigCache> beginStream(edm::StreamID) const override {
return std::unique_ptr<TauIDConfigCache>(new TauIDConfigCache());
return std::make_unique<TauIDConfigCache>();
}

private:
Expand Down
25 changes: 20 additions & 5 deletions DQMOffline/Trigger/interface/HistoWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,32 @@ typedef dqm::legacy::DQMStore DQMStore;
#include "DQMServices/Core/interface/MonitorElement.h"
typedef dqm::legacy::MonitorElement MonitorElement;

enum PL {kEverything, kVital};
enum PL { kEverything, kVital };

class HistoWrapper {
public:
public:
HistoWrapper(const edm::ParameterSet&);
~HistoWrapper();

MonitorElement* book1D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int const nchX, double const lowX, double const highX, int level = kEverything);
MonitorElement* book2D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int nchX, double lowX, double highX, int nchY, double lowY, double highY, int level = kEverything);
MonitorElement* book1D(DQMStore::IBooker& iBooker,
TString const& name,
TString const& title,
int const nchX,
double const lowX,
double const highX,
int level = kEverything);
MonitorElement* book2D(DQMStore::IBooker& iBooker,
TString const& name,
TString const& title,
int nchX,
double lowX,
double highX,
int nchY,
double lowY,
double highY,
int level = kEverything);

private:
private:
PL plotlevel;
int cAllHistograms;
int cPlottedHistograms;
Expand Down
Loading