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

HCAL: bug fixed in DPGAnalysis/HcalTools for 2023 Run3 #40732

Merged

Conversation

zhokin2
Copy link
Contributor

@zhokin2 zhokin2 commented Feb 9, 2023

PR description:

this is an additional PR to overcome serious warning seen only with command " scram b checker " and concerns only file plugin/[CMTRawAnalyzer.cc] (https://github.com/cms-sw/cmssw/blob/master/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc)

PR validation:

scram build code-format

scram b checker

scram build code-checks

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2023

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40732/34132

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2023

A new Pull Request was created by @zhokin2 (zhokin) for master.

It involves the following packages:

  • DPGAnalysis/HcalTools (dqm)

@emanueleusai, @cmsbuild, @syuvivida, @rvenditti, @micsucmed, @pmandrik can you please review it and eventually sign? Thanks.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

@@ -8821,23 +8818,23 @@ void CMTRawAnalyzer::fillDigiAmplitude(HBHEDigiCollection::const_iterator& digiI
pedestalaver4 /= c4;
pedestalwaver9 = sqrt(pedestalwaver9 / TSsize);
pedestalwaver4 = sqrt(pedestalwaver4 / c4);
if (ts_with_max_signal > -1 && ts_with_max_signal < 10)
if (ts_with_max_signal > 0 && ts_with_max_signal < TSsize)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why here and in the following you have "> 0" and you have "> -1" in all other cases?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

in principle, it does not matter, but -1 is more correct, Thank you !

@@ -9662,7 +9659,7 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) {
double amplitude345 = 0.;
double ampl = 0.;
double ampl3ts = 0.;
double amplmaxts = 0.;
// double amplmaxts = 0.;
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove the commented out code with these useless variables, here and below

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, these commented lines can be removed - thanks.

@zhokin2
Copy link
Contributor Author

zhokin2 commented Feb 9, 2023 via email

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2023

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40732/34133

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2023

Pull request #40732 was updated. @emanueleusai, @cmsbuild, @syuvivida, @rvenditti, @micsucmed, @pmandrik can you please check and sign again.

@emanueleusai
Copy link
Member

type hcal

@emanueleusai
Copy link
Member

type bug

@emanueleusai
Copy link
Member

please test

@perrotta
Copy link
Contributor

perrotta commented Feb 9, 2023

@zhokin2 there are still commented out lines to remove:

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2023

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-bd099d/30556/summary.html
COMMIT: bbebe9e
CMSSW: CMSSW_13_0_X_2023-02-09-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40732/30556/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially removed 10 lines from the logs
  • Reco comparison results: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3555852
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3555824
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-bd099d/30564/summary.html
COMMIT: 301c6e6
CMSSW: CMSSW_13_0_X_2023-02-09-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40732/30564/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

The relvals timed out after 4 hours.

Comparison Summary

Summary:

  • You potentially removed 19 lines from the logs
  • Reco comparison results: 3 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3555852
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3555827
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@perrotta
Copy link
Contributor

@zhokin2 @abdoulline this PR is not in conflict with #40721 (which I think was the conclusion you reached in the thread ending with #40721 (comment))
If you closed this PR because of some different reason, instead, feel free to close it again

@zhokin2
Copy link
Contributor Author

zhokin2 commented Feb 10, 2023

@zhokin2 @abdoulline this PR is not in conflict with #40721 (which I think was the conclusion you reached in the thread ending with #40721 (comment)) If you closed this PR because of some different reason, instead, feel free to close it again

frankly, there is no idea what is the problem in runTheMatrix, because in the last edit, I just deleted three commented lines

@perrotta
Copy link
Contributor

frankly, there is no idea what is the problem in runTheMatrix, because in the last edit, I just deleted three commented lines

There are no problems at all in runTheMatrix, as far as I can see. RelVals-INPUT time out quite often, independently on the PR. When it is clear, as in this case, that the timeour cannot be given by the PR changes we don't bother to re-run them. But if you like seeing the display all green, we can relaunch the tests here and see whether those timeouts disappear by themselves.

@perrotta
Copy link
Contributor

please test

@abdoulline
Copy link

abdoulline commented Feb 10, 2023

@perrotta I'm a bit confused... No conflict (in the sense that not the same lines are involved) but both PRs modify the same file CMTRawAnalyzer.cc ? -
You mean once this PR will be merged, it will not remove modifications done in #40721 ?

@perrotta
Copy link
Contributor

@perrotta I'm a bit confused... No conflict, but PRs modify the same file CMTRawAnalyzer.cc ?

git can recognize that the modifications appeared in different parts of the file, far away "enough" according to some metrics, and considers them as independent.
In fact, #40721 removed some unused variable, while this PR touches other variables in other parts of the code. As such the modifications applied are independent on each other, and can be integrated independently.
If you feel more confortable, you can also rebase this PR on top of the latest IB: but looking at the code changes, I don't think it is necessary.

@abdoulline
Copy link

abdoulline commented Feb 10, 2023

@perrotta OK, thanks. I see it better now.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-bd099d/30585/summary.html
COMMIT: 301c6e6
CMSSW: CMSSW_13_0_X_2023-02-10-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40732/30585/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially added 13 lines to the logs
  • Reco comparison results: 5 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3555972
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3555947
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@emanueleusai
Copy link
Member

+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, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

@perrotta
Copy link
Contributor

+1

  • The file touched by this PR is used for HCAL local monitoring, and doesn't touch any other workflow: therefore it can be merged in 13_0_X even before switching the master to 13_1_X, to make it already available also in 13_0_X for Run3 monitoring

@cmsbuild cmsbuild merged commit 69a0aee into cms-sw:master Feb 11, 2023
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.

None yet

5 participants