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

RecoLocalTracker/SiStripClusterizer: clean up clang warnings: #22535

Merged
merged 2 commits into from Mar 12, 2018
Merged

RecoLocalTracker/SiStripClusterizer: clean up clang warnings: #22535

merged 2 commits into from Mar 12, 2018

Conversation

gartung
Copy link
Member

@gartung gartung commented Mar 8, 2018

src/RecoLocalTracker/SiStripClusterizer/interface/StripClusterizerAlgorithm.h:30:91: warning: while loop has empty body [-Wempty-body]
bool allBadBetween(uint16_t L, const uint16_t& R) const { while( ++L < R && bad(L) ); return L == R; }
^

src/RecoLocalTracker/SiStripClusterizer/interface/ThreeThresholdAlgorithm.h:23:8: warning: 'ThreeThresholdAlgorithm::addFed' hides overloaded virtual function [-Woverloaded-virtual]
void addFed(State & state, sistrip::FEDZSChannelUnpacker & unpacker, uint16_t ipair, std::vector& out) const {
^

src/RecoLocalTracker/SiStripClusterizer/interface/StripClusterizerAlgorithm.h:30:91: warning: while loop has empty body [-Wempty-body]
     bool allBadBetween(uint16_t L, const uint16_t& R) const { while( ++L < R  &&  bad(L) ); return L == R; }
                                                                                          ^

src/RecoLocalTracker/SiStripClusterizer/interface/ThreeThresholdAlgorithm.h:23:8: warning: 'ThreeThresholdAlgorithm::addFed' hides overloaded virtual function [-Woverloaded-virtual]
   void addFed(State & state, sistrip::FEDZSChannelUnpacker & unpacker, uint16_t ipair, std::vector<SiStripCluster>& out) const {
       ^
@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2018

The code-checks are being triggered in jenkins.

@gartung
Copy link
Member Author

gartung commented Mar 8, 2018

@Dr15Jones

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2018

@@ -27,7 +27,7 @@ class StripClusterizerAlgorithm {
float noise(const uint16_t& strip) const { return SiStripNoises::getNoise( strip, noiseRange ); }
float gain(const uint16_t& strip) const { return SiStripGain::getStripGain( strip, gainRange ); }
bool bad(const uint16_t& strip) const { return quality->IsStripBad( qualityRange, strip ); }
bool allBadBetween(uint16_t L, const uint16_t& R) const { while( ++L < R && bad(L) ); return L == R; }
bool allBadBetween(uint16_t L, const uint16_t& R) const { while( ++L < R && bad(L)) {}; { return L == R;} }
Copy link
Contributor

Choose a reason for hiding this comment

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

The braces around the return do not seem to be needed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry. Left over from when I was trying to figure out what they were doing.

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2018

A new Pull Request was created by @gartung (Patrick Gartung) for master.

It involves the following packages:

RecoLocalTracker/SiStripClusterizer

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@makortel, @felicepantaleo, @forthommel, @yduhm, @GiacomoSguazzoni, @gbenelli, @rovere, @VinInn, @nickmccoll, @jlagram, @gpetruc, @OlivierBondu, @mmusich, @threus, @ebrondol 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

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2018

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

@slava77
Copy link
Contributor

slava77 commented Mar 10, 2018

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 10, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/26761/console Started: 2018/03/10 15:32

@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-22535/26761/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 29
  • DQMHistoTests: Total histograms compared: 2484711
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2484534
  • DQMHistoTests: Total skipped: 176
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.2200000002 KiB( 23 files compared)
  • Checked 118 log files, 9 edm output root files, 29 DQM output files

@slava77
Copy link
Contributor

slava77 commented Mar 12, 2018

+1

for #22535 c0d3f6f

  • technical
  • jenkins tests pass

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

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit da2d0a7 into cms-sw:master Mar 12, 2018
@gartung gartung deleted the RecoLocalTracker-SiStripClusterizer-cleanup-clang-warn branch March 26, 2018 16:09
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