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.

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

Run3-Sim101F Avoid compilation warnings in some of the codes of Validation/RecoTau #36608

Merged
merged 3 commits into from
Jan 7, 2022

Conversation

bsunanda
Copy link
Contributor

PR description:

Avoid compilation warnings in some of the codes of Validation/RecoTau

PR validation:

Use the runTheMatrix test workflows

if this PR is a backport please specify the original PR and why you need to backport that PR:

Nothing special

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36608/27582

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @bsunanda (Sunanda Banerjee) for master.

It involves the following packages:

  • Validation/RecoTau (dqm)

@emanueleusai, @ahmad3213, @cmsbuild, @jfernan2, @pmandrik, @pbo0, @rvenditti can you please review it and eventually sign? Thanks.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54a768/21494/summary.html
COMMIT: ac80bd8
CMSSW: CMSSW_12_3_X_2021-12-28-2300/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36608/21494/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 43
  • DQMHistoTests: Total histograms compared: 3461692
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3461664
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 42 files compared)
  • Checked 181 log files, 42 edm output root files, 43 DQM output files
  • TriggerResults: no differences found

@jfernan2
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@@ -21,7 +21,7 @@
#include <vector>
#include <string>

class TauDQMFileLoader : public edm::EDAnalyzer {
class TauDQMFileLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
typedef dqm::legacy::DQMStore DQMStore;
typedef dqm::legacy::MonitorElement MonitorElement;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the direct use of DQMStore safe in non-legacy modules?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe it is not. I leave the author of the code to make use of DQM codes``

Copy link
Contributor

Choose a reason for hiding this comment

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

Then, to me, it would make more sense to leave these modules as legacy and migrate them properly (or remove) later rather than enabling unsafe code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done that

@@ -27,14 +27,15 @@

using namespace std;

class DQMHistNormalizer : public edm::EDAnalyzer {
class DQMHistNormalizer : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
public:
typedef dqm::legacy::DQMStore DQMStore;
typedef dqm::legacy::MonitorElement MonitorElement;
Copy link
Contributor

Choose a reason for hiding this comment

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

This module appears to use DQMStore directly too.

@@ -24,7 +24,7 @@
#include <vector>
#include <map>

class TauDQMHistPlotter : public edm::EDAnalyzer {
class TauDQMHistPlotter : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
typedef dqm::legacy::DQMStore DQMStore;
typedef dqm::legacy::MonitorElement MonitorElement;
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here.

@@ -19,7 +19,7 @@

#include <string>

class TauDQMSimpleFileSaver : public edm::EDAnalyzer {
class TauDQMSimpleFileSaver : public edm::one::EDAnalyzer<> {
public:
typedef dqm::legacy::DQMStore DQMStore;
typedef dqm::legacy::MonitorElement MonitorElement;
Copy link
Contributor

Choose a reason for hiding this comment

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

And here.

@bsunanda
Copy link
Contributor Author

bsunanda commented Jan 4, 2022

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36608/27632

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2022

Pull request #36608 was updated. @emanueleusai, @ahmad3213, @jfernan2, @rvenditti, @pbo0, @pmandrik can you please check and sign again.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2022

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54a768/21531/summary.html
COMMIT: 8f13cf7
CMSSW: CMSSW_12_3_X_2022-01-04-1100/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36608/21531/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 4 inherits from legacy modules warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54a768/21531/llvm-analysis/legacy-mod-sa.txt for details.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 9 differences found in the comparisons
  • DQMHistoTests: Total files compared: 43
  • DQMHistoTests: Total histograms compared: 3461692
  • DQMHistoTests: Total failures: 10
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3461659
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 42 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 181 log files, 42 edm output root files, 43 DQM output files
  • TriggerResults: no differences found

@jfernan2
Copy link
Contributor

jfernan2 commented Jan 5, 2022

Do we understand why now we get these CMS StaticAnalyzer warnings and in previous test/changes not?
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54a768/21531/llvm-analysis/legacy-mod-sa.txt

@makortel
Copy link
Contributor

makortel commented Jan 5, 2022

I guess those get reported because this PR touches those files. Those changes are not visible in the diff because one commit makes the change, and a later commit undoes those changes. It would be better to squash the commits into one, and maybe change the title of the PR to something along "Remove some unnecessary header includes".

@bsunanda
Copy link
Contributor Author

bsunanda commented Jan 7, 2022

@jfernan2 Can you sign this - we need to fix the other DQM codes later

@jfernan2
Copy link
Contributor

jfernan2 commented Jan 7, 2022

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 7, 2022

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@perrotta
Copy link
Contributor

perrotta commented Jan 7, 2022

+1

  • I wouldn't ask to squash the commits, so that the reason about why the other touched files were not fixed remains in the historyir

@cmsbuild cmsbuild merged commit 5ade6b3 into cms-sw:master Jan 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants