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

Jump to bottom

Fix logic problems in MuScleFitBase #26768

Merged
merged 5 commits into from May 16, 2019
Merged

Fix logic problems in MuScleFitBase #26768

merged 5 commits into from May 16, 2019

Conversation

Dr15Jones
Copy link
Contributor

@Dr15Jones Dr15Jones commented May 13, 2019 •
edited

PR description:

The static analyzer and gcc 9 both identified cases where uninitialized variables could be accessed at run time. The underlying problem was inconsistent logic being applied to the application of the variables.

Additionally, a few minor code improvements were implemented

  • use of std::unique_ptr to own memory of the TFile
  • switch to std::array

PR validation:

The code compiles using gcc 7.
Compiles without warnings using gcc 9.

@Dr15Jones
Use an std::unique_ptr to own the temporary TFile
68ed576
@Dr15Jones
Use consistent logic when using histograms
7c0289e 
Everywhere in readProbabilityDistributionsFromFile where histograms
are used conditionally, the logic for the condition are now identical.

Problems with the logic were identified by the static analyzer and
gcc 9.
@Dr15Jones
Use std::array instead of C arrays
f391429 
This allows specifying the size only once.
@Dr15Jones
Initialize the histogram arrays with nullptr
6bd97bf
@cmsbuild cmsbuild added this to the CMSSW_10_6_X milestone May 13, 2019
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26768/9765

  • This PR adds an extra 16KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26768/9767

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Dr15Jones (Chris Jones) for master.

It involves the following packages:

MuonAnalysis/MomentumScaleCalibration

@cmsbuild, @santocch can you please review it and eventually sign? Thanks.
@bellan, @mmusich, @argiro this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@Dr15Jones
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 13, 2019 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/192/console Started: 2019/05/13 19:38

@cmsbuild
Copy link
Contributor

+1
Tested at: 68030ea
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b9a564/192/summary.html

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b9a564/192/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 3 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3212004
  • DQMHistoTests: Total failures: 132
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3211668
  • DQMHistoTests: Total skipped: 204
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@smuzaffar smuzaffar modified the milestones: CMSSW_10_6_X, CMSSW_11_0_X May 14, 2019
@fabiocos
Copy link
Contributor

@santocch this looks ok to me, I will move forward with the integration. Please have a look

@fabiocos
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit ab14ad9 into cms-sw:master May 16, 2019
@santocch
Copy link

+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 be automatically merged.

@Dr15Jones Dr15Jones deleted the staticAnalyzerMuScleFitBase branch May 26, 2019 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
analysis-approved code-checks-approved comparison-available fully-signed orp-approved tests-approved
Projects
None yet
Milestone
CMSSW_11_0_X
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Dr15Jones @cmsbuild @fabiocos @santocch @smuzaffar