From a0aa4230de68b3eea80f3046b109d663330c31ca Mon Sep 17 00:00:00 2001 From: Sam Harper Date: Mon, 28 Mar 2022 21:33:07 +0200 Subject: [PATCH 1/2] disabling remaking the plots every lumi section and fixing checks for existing hists --- HLTrigger/Timer/plugins/FastTimerServiceClient.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/HLTrigger/Timer/plugins/FastTimerServiceClient.cc b/HLTrigger/Timer/plugins/FastTimerServiceClient.cc index 2c6ad2794ec4e..1bf13f8b609a5 100644 --- a/HLTrigger/Timer/plugins/FastTimerServiceClient.cc +++ b/HLTrigger/Timer/plugins/FastTimerServiceClient.cc @@ -91,9 +91,7 @@ void FastTimerServiceClient::dqmEndJob(DQMStore::IBooker& booker, DQMStore::IGet void FastTimerServiceClient::dqmEndLuminosityBlock(DQMStore::IBooker& booker, DQMStore::IGetter& getter, edm::LuminosityBlock const& lumi, - edm::EventSetup const& setup) { - fillSummaryPlots(booker, getter); -} + edm::EventSetup const& setup) {} void FastTimerServiceClient::fillSummaryPlots(DQMStore::IBooker& booker, DQMStore::IGetter& getter) { if (getter.get(m_dqm_path + "/event time_real")) { @@ -251,7 +249,7 @@ void FastTimerServiceClient::fillPathSummaryPlots(DQMStore::IBooker& booker, MonitorElement* me; booker.setCurrentFolder(subsubdir); - me = getter.get("module_time_real_average"); + me = getter.get(subsubdir + "/module_time_real_average"); if (me) { real_average = me->getTH1F(); assert(me->getTH1F()->GetXaxis()->GetXmin() == min); @@ -266,7 +264,7 @@ void FastTimerServiceClient::fillPathSummaryPlots(DQMStore::IBooker& booker, } } - me = getter.get("module_time_thread_average"); + me = getter.get(subsubdir + "/module_time_thread_average"); if (me) { thread_average = me->getTH1F(); assert(me->getTH1F()->GetXaxis()->GetXmin() == min); @@ -282,7 +280,7 @@ void FastTimerServiceClient::fillPathSummaryPlots(DQMStore::IBooker& booker, } } - me = getter.get("module_time_real_running"); + me = getter.get(subsubdir + "/module_time_real_running"); if (me) { real_running = me->getTH1F(); assert(me->getTH1F()->GetXaxis()->GetXmin() == min); @@ -297,7 +295,7 @@ void FastTimerServiceClient::fillPathSummaryPlots(DQMStore::IBooker& booker, } } - me = getter.get("module_time_thread_running"); + me = getter.get(subsubdir + "/module_time_thread_running"); if (me) { thread_running = me->getTH1F(); assert(me->getTH1F()->GetXaxis()->GetXmin() == min); @@ -313,7 +311,7 @@ void FastTimerServiceClient::fillPathSummaryPlots(DQMStore::IBooker& booker, } } - me = getter.get("module_efficiency"); + me = getter.get(subsubdir + "/module_efficiency"); if (me) { efficiency = me->getTH1F(); assert(me->getTH1F()->GetXaxis()->GetXmin() == min); From 4b84728a0866491c7eda26c70ff9c611184edd02 Mon Sep 17 00:00:00 2001 From: Sam Harper Date: Wed, 30 Mar 2022 09:30:43 +0200 Subject: [PATCH 2/2] adding option to fill each ls --- HLTrigger/Timer/plugins/FastTimerServiceClient.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/HLTrigger/Timer/plugins/FastTimerServiceClient.cc b/HLTrigger/Timer/plugins/FastTimerServiceClient.cc index 1bf13f8b609a5..ba65260281b3d 100644 --- a/HLTrigger/Timer/plugins/FastTimerServiceClient.cc +++ b/HLTrigger/Timer/plugins/FastTimerServiceClient.cc @@ -69,6 +69,8 @@ class FastTimerServiceClient : public DQMEDHarvester { MEPSet scalLumiMEPSet_; MEPSet pixelLumiMEPSet_; MEPSet puMEPSet_; + + bool fillEveryLumiSection_; }; FastTimerServiceClient::FastTimerServiceClient(edm::ParameterSet const& config) @@ -80,7 +82,8 @@ FastTimerServiceClient::FastTimerServiceClient(edm::ParameterSet const& config) : MEPSet{}), pixelLumiMEPSet_(doPlotsVsPixelLumi_ ? getHistoPSet(config.getParameter("pixelLumiME")) : MEPSet{}), - puMEPSet_(doPlotsVsPU_ ? getHistoPSet(config.getParameter("puME")) : MEPSet{}) {} + puMEPSet_(doPlotsVsPU_ ? getHistoPSet(config.getParameter("puME")) : MEPSet{}), + fillEveryLumiSection_(config.getParameter("fillEveryLumiSection")) {} FastTimerServiceClient::~FastTimerServiceClient() = default; @@ -91,7 +94,10 @@ void FastTimerServiceClient::dqmEndJob(DQMStore::IBooker& booker, DQMStore::IGet void FastTimerServiceClient::dqmEndLuminosityBlock(DQMStore::IBooker& booker, DQMStore::IGetter& getter, edm::LuminosityBlock const& lumi, - edm::EventSetup const& setup) {} + edm::EventSetup const& setup) { + if (fillEveryLumiSection_) + fillSummaryPlots(booker, getter); +} void FastTimerServiceClient::fillSummaryPlots(DQMStore::IBooker& booker, DQMStore::IGetter& getter) { if (getter.get(m_dqm_path + "/event time_real")) { @@ -486,7 +492,7 @@ void FastTimerServiceClient::fillDescriptions(edm::ConfigurationDescriptions& de edm::ParameterSetDescription puMEPSet; fillPUMePSetDescription(puMEPSet); desc.add("puME", puMEPSet); - + desc.add("fillEveryLumiSection", true); descriptions.add("fastTimerServiceClient", desc); }