Skip to content

Commit

Permalink
clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
lwang046 committed Apr 23, 2020
1 parent 6182e2c commit 5695eab
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 34 deletions.
3 changes: 2 additions & 1 deletion DQM/HcalCommon/interface/DQTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ namespace hcaldqm {
void analyze(edm::Event const &, edm::EventSetup const &) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
Expand Down
5 changes: 3 additions & 2 deletions DQM/HcalCommon/src/DQTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,13 @@ namespace hcaldqm {
this->_resetMonitors(f100LS);
}

std::shared_ptr<hcaldqm::Cache> DQTask::globalBeginLuminosityBlock(edm::LuminosityBlock const &lb, edm::EventSetup const &es) const {
std::shared_ptr<hcaldqm::Cache> DQTask::globalBeginLuminosityBlock(edm::LuminosityBlock const &lb,
edm::EventSetup const &es) const {
auto d = std::make_shared<hcaldqm::Cache>();
d->currentLS = lb.luminosityBlock();
d->EvtCntLS = 0;

/* //// these resets were not useful anymore
/* //// these resets were not useful anymore
this->_resetMonitors(f1LS);
if (_procLSs % 10 == 0)
this->_resetMonitors(f10LS);
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/interface/DigiPhase1Task.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class DigiPhase1Task : public hcaldqm::DQTask {
~DigiPhase1Task() override {}

void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/interface/DigiTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class DigiTask : public hcaldqm::DQTask {
~DigiTask() override {}

void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
Expand Down
11 changes: 6 additions & 5 deletions DQM/HcalTasks/interface/NoCQTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@

class NoCQTask : public hcaldqm::DQTask {
public:
NoCQTask(edm::ParameterSet const&);
NoCQTask(edm::ParameterSet const &);
~NoCQTask() override {}

void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
void _process(edm::Event const&, edm::EventSetup const&) override;
void _process(edm::Event const &, edm::EventSetup const &) override;
void _resetMonitors(hcaldqm::UpdateFreq) override;

edm::InputTag _tagHBHE;
Expand Down
15 changes: 8 additions & 7 deletions DQM/HcalTasks/interface/PedestalTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,20 @@

class PedestalTask : public hcaldqm::DQTask {
public:
PedestalTask(edm::ParameterSet const&);
PedestalTask(edm::ParameterSet const &);
~PedestalTask() override {}

void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void dqmEndRun(edm::Run const&, edm::EventSetup const&) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
void dqmEndRun(edm::Run const &, edm::EventSetup const &) override;

protected:
// funcs
void _process(edm::Event const&, edm::EventSetup const&) override;
void _process(edm::Event const &, edm::EventSetup const &) override;
void _resetMonitors(hcaldqm::UpdateFreq) override;
bool _isApplicable(edm::Event const&) override;
bool _isApplicable(edm::Event const &) override;
virtual void _dump();

// tags and tokens
Expand Down
11 changes: 6 additions & 5 deletions DQM/HcalTasks/interface/RawTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@

class RawTask : public hcaldqm::DQTask {
public:
RawTask(edm::ParameterSet const&);
RawTask(edm::ParameterSet const &);
~RawTask() override {}

void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
void _process(edm::Event const&, edm::EventSetup const&) override;
void _process(edm::Event const &, edm::EventSetup const &) override;
void _resetMonitors(hcaldqm::UpdateFreq) override;

edm::InputTag _tagFEDs;
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/interface/RecHitTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class RecHitTask : public hcaldqm::DQTask {
~RecHitTask() override {}

void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/interface/TPTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ class TPTask : public hcaldqm::DQTask {
~TPTask() override {}

void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) const override;
std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
edm::EventSetup const &) const override;
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/plugins/DigiComparisonTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ DigiComparisonTask::DigiComparisonTask(edm::ParameterSet const& ps) : DQTask(ps)
}

/* virtual */ void DigiComparisonTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) {
edm::EventSetup const& es) {
// in the end always
DQTask::globalEndLuminosityBlock(lb, es);
}
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/plugins/DigiPhase1Task.cc
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,8 @@ DigiPhase1Task::DigiPhase1Task(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

std::shared_ptr<hcaldqm::Cache> DigiPhase1Task::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) const {
std::shared_ptr<hcaldqm::Cache> DigiPhase1Task::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) const {
return DQTask::globalBeginLuminosityBlock(lb, es);
}

Expand Down
6 changes: 4 additions & 2 deletions DQM/HcalTasks/plugins/DigiTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,8 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) : DQTask(ps) {
_xQuality.reset();
_xQuality = lumiCache->xQuality;

if (_ptype == fOnline && lumiCache->EvtCntLS == 1) { // Reset the bin for _cCapid_BadvsFEDvsLSmod60 at the beginning of each new LS
if (_ptype == fOnline &&
lumiCache->EvtCntLS == 1) { // Reset the bin for _cCapid_BadvsFEDvsLSmod60 at the beginning of each new LS
for (std::vector<uint32_t>::const_iterator it = _vhashFEDs.begin(); it != _vhashFEDs.end(); ++it) {
HcalElectronicsId eid = HcalElectronicsId(*it);
_cCapid_BadvsFEDvsLSmod60.setBinContent(eid, _currentLS % 50, 0);
Expand Down Expand Up @@ -1412,7 +1413,8 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

std::shared_ptr<hcaldqm::Cache> DigiTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) const {
std::shared_ptr<hcaldqm::Cache> DigiTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) const {
return DQTask::globalBeginLuminosityBlock(lb, es);
}

Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/plugins/NoCQTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ NoCQTask::NoCQTask(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

std::shared_ptr<hcaldqm::Cache> NoCQTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) const {
std::shared_ptr<hcaldqm::Cache> NoCQTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) const {
return DQTask::globalBeginLuminosityBlock(lb, es);
}

Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/plugins/PedestalTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,8 @@ PedestalTask::PedestalTask(edm::ParameterSet const& ps) : DQTask(ps) {
_xPedEntries1LS.reset();
}

std::shared_ptr<hcaldqm::Cache> PedestalTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) const {
std::shared_ptr<hcaldqm::Cache> PedestalTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) const {
return DQTask::globalBeginLuminosityBlock(lb, es);
}

Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/plugins/RawTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,8 @@ RawTask::RawTask(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

std::shared_ptr<hcaldqm::Cache> RawTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) const {
std::shared_ptr<hcaldqm::Cache> RawTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) const {
return DQTask::globalBeginLuminosityBlock(lb, es);
// _cBadQualityvsLS.extendAxisRange(_currentLS);
// _cSummaryvsLS_FED.extendAxisRange(_currentLS);
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/plugins/RecHitTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,8 @@ RecHitTask::RecHitTask(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

std::shared_ptr<hcaldqm::Cache> RecHitTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) const {
std::shared_ptr<hcaldqm::Cache> RecHitTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) const {
return DQTask::globalBeginLuminosityBlock(lb, es);
}

Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/plugins/TPComparisonTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ TPComparisonTask::TPComparisonTask(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

/* virtual */ void TPComparisonTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void TPComparisonTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) {
// in the end always
DQTask::globalEndLuminosityBlock(lb, es);
}
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalTasks/plugins/TPTask.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,8 @@ TPTask::TPTask(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

std::shared_ptr<hcaldqm::Cache> TPTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) const {
std::shared_ptr<hcaldqm::Cache> TPTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) const {
return DQTask::globalBeginLuminosityBlock(lb, es);
}

Expand Down

0 comments on commit 5695eab

Please sign in to comment.