Skip to content

Fixing FastTimerClient Hist Remaking Issue : 12_4_X #37402

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 2 commits into from
Mar 31, 2022
Merged

Fixing FastTimerClient Hist Remaking Issue : 12_4_X #37402

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0aa423
disabling remaking the plots every lumi section and fixing checks for…
Sam-Harper Mar 28, 2022
4b84728
adding option to fill each ls
Sam-Harper Mar 30, 2022
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
20 changes: 12 additions & 8 deletions HLTrigger/Timer/plugins/FastTimerServiceClient.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ class FastTimerServiceClient : public DQMEDHarvester {
MEPSet scalLumiMEPSet_;
MEPSet pixelLumiMEPSet_;
MEPSet puMEPSet_;

bool fillEveryLumiSection_;
};

FastTimerServiceClient::FastTimerServiceClient(edm::ParameterSet const& config)
Expand All @@ -80,7 +82,8 @@ FastTimerServiceClient::FastTimerServiceClient(edm::ParameterSet const& config)
: MEPSet{}),
pixelLumiMEPSet_(doPlotsVsPixelLumi_ ? getHistoPSet(config.getParameter<edm::ParameterSet>("pixelLumiME"))
: MEPSet{}),
puMEPSet_(doPlotsVsPU_ ? getHistoPSet(config.getParameter<edm::ParameterSet>("puME")) : MEPSet{}) {}
puMEPSet_(doPlotsVsPU_ ? getHistoPSet(config.getParameter<edm::ParameterSet>("puME")) : MEPSet{}),
fillEveryLumiSection_(config.getParameter<bool>("fillEveryLumiSection")) {}

FastTimerServiceClient::~FastTimerServiceClient() = default;

Expand All @@ -92,7 +95,8 @@ void FastTimerServiceClient::dqmEndLuminosityBlock(DQMStore::IBooker& booker,
DQMStore::IGetter& getter,
edm::LuminosityBlock const& lumi,
edm::EventSetup const& setup) {
fillSummaryPlots(booker, getter);
if (fillEveryLumiSection_)
fillSummaryPlots(booker, getter);
}

void FastTimerServiceClient::fillSummaryPlots(DQMStore::IBooker& booker, DQMStore::IGetter& getter) {
Expand Down Expand Up @@ -251,7 +255,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);
Expand All @@ -266,7 +270,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);
Expand All @@ -282,7 +286,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);
Expand All @@ -297,7 +301,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);
Expand All @@ -313,7 +317,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);
Expand Down Expand Up @@ -488,7 +492,7 @@ void FastTimerServiceClient::fillDescriptions(edm::ConfigurationDescriptions& de
edm::ParameterSetDescription puMEPSet;
fillPUMePSetDescription(puMEPSet);
desc.add<edm::ParameterSetDescription>("puME", puMEPSet);

desc.add<bool>("fillEveryLumiSection", true);
Copy link
Contributor

@perrotta perrotta Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the default be "false", according to what you write in the comments?

Copy link
Contributor

@missirol missirol Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's just that the description does not take into account the latest changes applied to the PR.

In the description, replacing this sentence

  1. removing the per lumisection making of the histograms

with this sentence

  1. adding an option to disable the per-lumisection updating of the histograms (which remains enabled by default)

would better reflect the content of the PR.

Copy link
Contributor

@perrotta perrotta Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@missirol in #37402 (comment) you were also suggesting to keep "disable per-LS updates" as the default, which is the same as written in the PR description.
@Sam-Harper , @missirol could you please agree on what's your actual intent here, and either fix the PR or its description? It can be merged right after.

Copy link
Contributor

@missirol missirol Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perrotta , I wrote that, but later comments clarified that it was safer to keep the default unchanged (per-LS update enabled by default), see #37402 (comment).

In summary, the PR description needs to be updated (it is already correct in the backport PR). @Sam-Harper could you please edit ? (I don't think I can)

Copy link
Contributor Author

@Sam-Harper Sam-Harper Mar 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry the intent changed. So 99% of people will want it to default to false. However changing the default behaviour will mess up online DQM and for the quiet life, I decided it was better to just keep the old behaviour (which is fine just inefficient) and have users update. Regardless the majority of users will actually be running a config we control not them so we can just disable it there.

So just to sumarise: Andrea raised the point that turning this off will effect online DQM. Therefore we have kept the old behaviour as default otherwise we would need to adapt DQM workflows and this is a late fix.

descriptions.add("fastTimerServiceClient", desc);
}

Expand Down