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

Fix clang warnings in EventFilter/SiPixelRawToDigi #25805

Merged
merged 2 commits into from Feb 7, 2019

Conversation

Dr15Jones
Copy link
Contributor

No description provided.

@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-25805/8239

  • 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:

EventFilter/SiPixelRawToDigi

@cmsbuild, @perrotta, @slava77 can you please review it and eventually sign? Thanks.
@makortel, @Martin-Grunewald, @dkotlins, @VinInn 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 Jan 30, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/32911/console Started: 2019/01/30 21:01

@cmsbuild
Copy link
Contributor

@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-25805/32911/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3097440
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3097242
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 133 log files, 14 edm output root files, 32 DQM output files

@@ -63,7 +63,7 @@ class SiPixelDigiToRaw final : public edm::global::EDProducer<edm::LuminosityBlo

private:

mutable std::atomic_flag lock_{ ATOMIC_FLAG_INIT };
mutable std::atomic_flag lock_ = ATOMIC_FLAG_INIT ;
Copy link
Contributor

Choose a reason for hiding this comment

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

this is in #25748 .
@perrotta you may want to follow this PR because of the conflict.

@perrotta
Copy link
Contributor

perrotta commented Feb 6, 2019

@Dr15Jones : after the merging of #25748 the conflict already pointed out by Slava inhttps://github.com//pull/25805#discussion_r252767589 becomes explicit
Since in that PR the same fix that you propose here was already implemented, you can resolve the conflict by simply reverting your commit 1999bdb here

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

The code-checks are being triggered in jenkins.

@Dr15Jones
Copy link
Contributor Author

@perrotta all I had to do was rebase onto master and git automatically dropped the one commit I had that was conflicting with what is now in master.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-25805/8337

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

Pull request #25805 was updated. @cmsbuild, @perrotta, @slava77 can you please check and sign again.

@Dr15Jones
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/33020/console Started: 2019/02/06 15:36

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3097440
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3097242
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 133 log files, 14 edm output root files, 32 DQM output files

@perrotta
Copy link
Contributor

perrotta commented Feb 6, 2019

+1

  • Technical
  • Jenkins tests pass

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2019

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. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

fabiocos commented Feb 7, 2019

+1

@cmsbuild cmsbuild merged commit d7f23cb into cms-sw:master Feb 7, 2019
@Dr15Jones Dr15Jones deleted the clangSiPixelRawToDigi branch February 7, 2019 14:19
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