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

DQM: Allow end lumi work in DQMOneEDAnalyzer #30326

Closed
wants to merge 5 commits into from
Closed

DQM: Allow end lumi work in DQMOneEDAnalyzer #30326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58e3672
Add dqmEndLuminosityBlock to DQMOneEDAnalyzer.
schneiml Jun 22, 2020
49cce0f
Migrate modules to use the new API.
schneiml Jun 22, 2020
e46c584
Code-checks && code-format.
schneiml Jun 22, 2020
3a6a90f
Re-introduce globalEndLuminosityBlock where needed.
schneiml Jun 23, 2020
be52986
Adjust tests for the new module type.
schneiml Jun 23, 2020
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
5 changes: 3 additions & 2 deletions DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ class CTPPSCommonDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<s
void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
std::shared_ptr<std::vector<int>> globalBeginLuminosityBlock(const edm::LuminosityBlock &iLumi,
const edm::EventSetup &c) const override;
void globalEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) override;
void globalEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) override{};
void dqmEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) override;

void analyzeCTPPSRecord(edm::Event const &event, edm::EventSetup const &eventSetup);
void analyzeTracks(edm::Event const &event, edm::EventSetup const &eventSetup);
Expand Down Expand Up @@ -537,7 +538,7 @@ std::shared_ptr<std::vector<int>> CTPPSCommonDQMSource::globalBeginLuminosityBlo

//----------------------------------------------------------------------------------------------------

void CTPPSCommonDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) {
void CTPPSCommonDQMSource::dqmEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) {
auto const &rpstate = *luminosityBlockCache(iLumi.index());
auto currentLS = iLumi.id().luminosityBlock();
for (std::vector<int>::size_type i = 0; i < rpstate.size(); i++)
Expand Down
5 changes: 3 additions & 2 deletions DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ class CTPPSDiamondDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<
void analyze(const edm::Event&, const edm::EventSetup&) override;
std::shared_ptr<dds::Cache> globalBeginLuminosityBlock(const edm::LuminosityBlock&,
const edm::EventSetup&) const override;
void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override{};
void dqmEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;

private:
// Constants
Expand Down Expand Up @@ -1126,7 +1127,7 @@ void CTPPSDiamondDQMSource::analyze(const edm::Event& event, const edm::EventSet

//----------------------------------------------------------------------------------------------------

void CTPPSDiamondDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup&) {
void CTPPSDiamondDQMSource::dqmEndLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup&) {
auto lumiCache = luminosityBlockCache(iLumi.index());
for (auto& plot : potPlots_) {
*(plot.second.hitDistribution2d_lumisection->getTH2F()) = *(lumiCache->hitDistribution2dMap[plot.first]);
Expand Down
5 changes: 3 additions & 2 deletions DQM/CTPPS/plugins/TotemTimingDQMSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ class TotemTimingDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<t
void analyze(const edm::Event &, const edm::EventSetup &) override;
std::shared_ptr<totemds::Cache> globalBeginLuminosityBlock(const edm::LuminosityBlock &,
const edm::EventSetup &) const override;
void globalEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
void globalEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override{};
void dqmEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;

private:
// Constants
Expand Down Expand Up @@ -734,7 +735,7 @@ void TotemTimingDQMSource::analyze(const edm::Event &event, const edm::EventSetu

//----------------------------------------------------------------------------------------------------

void TotemTimingDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &) {
void TotemTimingDQMSource::dqmEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &) {
auto lumiCache = luminosityBlockCache(iLumi.index());
for (auto &plot : potPlots_) {
*(plot.second.hitDistribution2d_lumisection->getTH2F()) = *(lumiCache->hitDistribution2dMap[plot.first]);
Expand Down
3 changes: 2 additions & 1 deletion DQM/HcalCommon/interface/DQTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ namespace hcaldqm {
void dqmBeginRun(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 globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override{};
void dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
// protected funcs
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalCommon/src/DQTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ namespace hcaldqm {
return d;
}

void DQTask::globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) { _procLSs++; }
void DQTask::dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) { _procLSs++; }

void DQTask::_resetMonitors(UpdateFreq uf) {
// reset per event
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/DigiComparisonTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class DigiComparisonTask : public hcaldqm::DQTask {
~DigiComparisonTask() override {}

void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

protected:
// funcs
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/DigiTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class DigiTask : public hcaldqm::DQTask {
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 dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
void _process(edm::Event const &, edm::EventSetup const &) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/LaserTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class LaserTask : public hcaldqm::DQTask {
this->_dump();
}
}
void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
void dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
// funcs
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/NoCQTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class NoCQTask : public hcaldqm::DQTask {
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 dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
void _process(edm::Event const &, edm::EventSetup const &) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/PedestalTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class PedestalTask : public hcaldqm::DQTask {
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 dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
void dqmEndRun(edm::Run const &, edm::EventSetup const &) override;

protected:
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/QIE10Task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class QIE10Task : public hcaldqm::DQTask {
~QIE10Task() override {}

void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

protected:
void _process(edm::Event const&, edm::EventSetup const&) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/QIE11Task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class QIE11Task : public hcaldqm::DQTask {
~QIE11Task() override {}

void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

protected:
void _process(edm::Event const&, edm::EventSetup const&) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/RawTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class RawTask : public hcaldqm::DQTask {
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 dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
void _process(edm::Event const &, edm::EventSetup const &) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/RecHitTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class RecHitTask : public hcaldqm::DQTask {
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 dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
void _process(edm::Event const &, edm::EventSetup const &) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/TPComparisonTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class TPComparisonTask : public hcaldqm::DQTask {
~TPComparisonTask() override {}

void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

protected:
// funcs
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/TPTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class TPTask : public hcaldqm::DQTask {
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 dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;

protected:
void _process(edm::Event const &, edm::EventSetup const &) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/interface/UMNioTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class UMNioTask : public hcaldqm::DQTask {
return;
}
}
void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

protected:
// funcs
Expand Down
6 changes: 3 additions & 3 deletions DQM/HcalTasks/plugins/DigiComparisonTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ DigiComparisonTask::DigiComparisonTask(edm::ParameterSet const& ps) : DQTask(ps)
}
}

/* virtual */ void DigiComparisonTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) {
/* virtual */ void DigiComparisonTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) {
// in the end always
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(DigiComparisonTask);
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/DigiTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ std::shared_ptr<hcaldqm::Cache> DigiTask::globalBeginLuminosityBlock(edm::Lumino
return DQTask::globalBeginLuminosityBlock(lb, es);
}

/* virtual */ void DigiTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void DigiTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
auto lumiCache = luminosityBlockCache(lb.index());
_currentLS = lumiCache->currentLS;
_evsPerLS = lumiCache->EvtCntLS;
Expand Down Expand Up @@ -1540,7 +1540,7 @@ std::shared_ptr<hcaldqm::Cache> DigiTask::globalBeginLuminosityBlock(edm::Lumino
_xBadCapid.reset();

// in the end always do the DQTask::endLumi
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(DigiTask);
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/LaserTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,15 +800,15 @@ void LaserTask::processLaserMon(edm::Handle<QIE10DigiCollection>& col, std::vect
}
}

/* virtual */ void LaserTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void LaserTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
auto lumiCache = luminosityBlockCache(lb.index());
_currentLS = lumiCache->currentLS;

if (_ptype == fLocal)
return;
this->_dump();

DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

/* virtual */ bool LaserTask::_isApplicable(edm::Event const& e) {
Expand Down
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/NoCQTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ std::shared_ptr<hcaldqm::Cache> NoCQTask::globalBeginLuminosityBlock(edm::Lumino
return DQTask::globalBeginLuminosityBlock(lb, es);
}

/* virtual */ void NoCQTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
DQTask::globalEndLuminosityBlock(lb, es);
/* virtual */ void NoCQTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(NoCQTask);
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/PedestalTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ std::shared_ptr<hcaldqm::Cache> PedestalTask::globalBeginLuminosityBlock(edm::Lu
return;
}

/* virtual */ void PedestalTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void PedestalTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
auto lumiCache = luminosityBlockCache(lb.index());
_currentLS = lumiCache->currentLS;
_xQuality.reset();
Expand All @@ -947,7 +947,7 @@ std::shared_ptr<hcaldqm::Cache> PedestalTask::globalBeginLuminosityBlock(edm::Lu
return;
this->_dump();

DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

/* virtual */ void PedestalTask::_process(edm::Event const& e, edm::EventSetup const& es) {
Expand Down
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/QIE10Task.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ QIE10Task::QIE10Task(edm::ParameterSet const& ps) : DQTask(ps) {
_ehashmap.initialize(_emap, electronicsmap::fD2EHashMap);
}

/* virtual */ void QIE10Task::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void QIE10Task::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
// finish
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

/* virtual */ void QIE10Task::_process(edm::Event const& e, edm::EventSetup const&) {
Expand Down
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/QIE11Task.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ QIE11Task::QIE11Task(edm::ParameterSet const& ps) : DQTask(ps) {
_ehashmap.initialize(_emap, electronicsmap::fD2EHashMap, _filter_C34);
}

/* virtual */ void QIE11Task::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void QIE11Task::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
// finish
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

/* virtual */ void QIE11Task::_process(edm::Event const& e, edm::EventSetup const&) {
Expand Down
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/RawTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ std::shared_ptr<hcaldqm::Cache> RawTask::globalBeginLuminosityBlock(edm::Luminos
// _cSummaryvsLS.extendAxisRange(_currentLS);
}

/* virtual */ void RawTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void RawTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
auto lumiCache = luminosityBlockCache(lb.index());
_currentLS = lumiCache->currentLS;
_evsPerLS = lumiCache->EvtCntLS;
Expand Down Expand Up @@ -490,7 +490,7 @@ std::shared_ptr<hcaldqm::Cache> RawTask::globalBeginLuminosityBlock(edm::Luminos
_xBadQLS.reset();

// in the end always do the DQTask::endLumi
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(RawTask);
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/RecHitTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ std::shared_ptr<hcaldqm::Cache> RecHitTask::globalBeginLuminosityBlock(edm::Lumi
return DQTask::globalBeginLuminosityBlock(lb, es);
}

/* virtual */ void RecHitTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void RecHitTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
if (_ptype != fOnline)
return;

Expand Down Expand Up @@ -941,7 +941,7 @@ std::shared_ptr<hcaldqm::Cache> RecHitTask::globalBeginLuminosityBlock(edm::Lumi
}

// in the end always do the DQTask::endLumi
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(RecHitTask);
5 changes: 2 additions & 3 deletions DQM/HcalTasks/plugins/TPComparisonTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,9 @@ TPComparisonTask::TPComparisonTask(edm::ParameterSet const& ps) : DQTask(ps) {
}
}

/* virtual */ void TPComparisonTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb,
edm::EventSetup const& es) {
/* virtual */ void TPComparisonTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
// in the end always
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(TPComparisonTask);
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/TPTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ std::shared_ptr<hcaldqm::Cache> TPTask::globalBeginLuminosityBlock(edm::Luminosi
return DQTask::globalBeginLuminosityBlock(lb, es);
}

/* virtual */ void TPTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
/* virtual */ void TPTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
if (_ptype != fOnline)
return;

Expand Down Expand Up @@ -1285,7 +1285,7 @@ std::shared_ptr<hcaldqm::Cache> TPTask::globalBeginLuminosityBlock(edm::Luminosi
_xEmulTotal.reset();

// in the end always do the DQTask::endLumi
DQTask::globalEndLuminosityBlock(lb, es);
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(TPTask);
4 changes: 2 additions & 2 deletions DQM/HcalTasks/plugins/UMNioTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ int UMNioTask::getOrbitGapIndex(uint8_t eventType, uint32_t laserType) {
_cTotalChargeProfile.fill(it->id(), _currentLS, sumQ);
}
}
/* virtual */ void UMNioTask::globalEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
DQTask::globalEndLuminosityBlock(lb, es);
/* virtual */ void UMNioTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& es) {
DQTask::dqmEndLuminosityBlock(lb, es);
}

DEFINE_FWK_MODULE(UMNioTask);
1 change: 1 addition & 0 deletions DQM/L1TMonitor/interface/L1TdeRCT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class L1TdeRCT : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<l1tderct::Emp
std::shared_ptr<l1tderct::Empty> globalBeginLuminosityBlock(const edm::LuminosityBlock&,
const edm::EventSetup&) const override;
void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final {}
void dqmEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final {}
void readFEDVector(MonitorElement*, const edm::EventSetup&) const;

private:
Expand Down
7 changes: 1 addition & 6 deletions DQM/Physics/src/QcdLowPtDQM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,12 +913,7 @@ void QcdLowPtDQM::filldNdeta(const TH3F *AlphaTracklets,
}
}

std::shared_ptr<qlpd::Cache> QcdLowPtDQM::globalBeginLuminosityBlock(const LuminosityBlock &,
const EventSetup &) const {
return std::shared_ptr<qlpd::Cache>();
}

void QcdLowPtDQM::globalEndLuminosityBlock(const LuminosityBlock &l, const EventSetup &iSetup) {
void QcdLowPtDQM::dqmEndLuminosityBlock(const LuminosityBlock &l, const EventSetup &iSetup) {
// Update various histograms.
repSummary_->Fill(1.);
repSumMap_->Fill(0.5, 0.5, 1.);
Expand Down
Loading