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

CommonTools/TrackerMap : fix for bug flagged by gcc 6.0 misleading-indentation warning #15025

Merged
merged 2 commits into from Jul 12, 2016
Merged

CommonTools/TrackerMap : fix for bug flagged by gcc 6.0 misleading-indentation warning #15025

merged 2 commits into from Jul 12, 2016

Conversation

gartung
Copy link
Member

@gartung gartung commented Jun 28, 2016

/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/TrackerMap/src/TrackerMap.cc: In member function 'void TrackerMap::save_as_fectrackermap(bool, float, float, std::string, int, int)':
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/TrackerMap/src/TrackerMap.cc:1484:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/TrackerMap/src/TrackerMap.cc:1486:11: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
vc.push_back(c);
^~
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/TrackerMap/src/TrackerMap.cc: In member function 'void TrackerMap::save_as_HVtrackermap(bool, float, float, std::string, int, int)':
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/TrackerMap/src/TrackerMap.cc:1765:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/TrackerMap/src/TrackerMap.cc:1767:4: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
vc.push_back(c);
^~

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

CommonTools/TrackerMap

@cvuosalo, @dmitrijus, @cmsbuild, @slava77, @vanbesien, @davidlange6 can you please review it and eventually sign? Thanks.
@threus, @venturia this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

c = new TColor(ncolor+100,(Double_t)(red/255.),(Double_t)(green/255.),(Double_t)(blue/255.));
vc.push_back(c);
Copy link
Member Author

Choose a reason for hiding this comment

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

Without the curly braces this pushes back a pointer to the last TColor set instead of the new one just created.

@slava77
Copy link
Contributor

slava77 commented Jun 28, 2016

@venturia @boudoul please check if the change is OK

@cvuosalo
Copy link
Contributor

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 29, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/13788/console

@cmsbuild
Copy link
Contributor

-1

Tested at: 198278b

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15025/13788/summary.html

I found follow errors while testing this PR

Failed tests: RelVals

  • RelVals:

When I ran the RelVals I found an error in the following worklfows:
25202.0 step3

runTheMatrix-results/25202.0_TTbar_13+TTbar_13+DIGIUP15_PU25+RECOUP15_PU25+HARVESTUP15_PU25/step3_TTbar_13+TTbar_13+DIGIUP15_PU25+RECOUP15_PU25+HARVESTUP15_PU25.log

@slava77
Copy link
Contributor

slava77 commented Jul 1, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/13843/console

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2016

Pull request #15025 was updated. @cvuosalo, @dmitrijus, @cmsbuild, @slava77, @vanbesien, @davidlange6 can you please check and sign again.

@cvuosalo
Copy link
Contributor

cvuosalo commented Jul 7, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/13938/console

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 8, 2016

@cvuosalo
Copy link
Contributor

cvuosalo commented Jul 8, 2016

+1

For #15025 602ee1f

Fixing bug with missing braces in TrackerMap.cc. The fix only alters the color of entries in plots, so there should be no change in monitored quantities.

The code changes are satisfactory, and Jenkins tests against baseline CMSSW_8_1_X_2016-07-07-1100 show no significant differences, as expected.

@davidlange6 davidlange6 merged commit 35f05d4 into cms-sw:CMSSW_8_1_X Jul 12, 2016
@gartung gartung deleted the CommonTools-TrackerMap-fix-indent-not-guard branch July 20, 2016 14:13
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

6 participants