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

TrackingTools/Products fix for bug flagged by gcc 6.0 misleading-indentation warning #15071

Merged
merged 2 commits into from Jul 14, 2016
Merged

TrackingTools/Products fix for bug flagged by gcc 6.0 misleading-indentation warning #15071

merged 2 commits into from Jul 14, 2016

Conversation

gartung
Copy link
Member

@gartung gartung commented Jun 30, 2016

The text cannot be equal to the full string and the partial string.

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

TrackingTools/Producers

@cmsbuild, @cvuosalo, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@makortel, @GiacomoSguazzoni, @rovere, @VinInn, @bellan, @gpetruc, @dgulhan 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

@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/13841/console

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2016

@gartung gartung changed the title TrackingTools/Products bug fix for bug flagged by gcc 6.0 misleading-indentation warning TrackingTools/Products fix for bug flagged by gcc 6.0 misleading-indentation warning Jul 1, 2016
@cvuosalo
Copy link
Contributor

cvuosalo commented Jul 7, 2016

@Martin-Grunewald, @perrotta: Could you please OK this change? This bug fix will change the behavior of the StraightLinePropagator that may have been used in the past by HLT.

@perrotta
Copy link
Contributor

perrotta commented Jul 7, 2016

@cvuosalo : as far as I can see, the hltESPStraightLinePropagator is never used in the current HLT menu.
To be honest, by lloking at the commented out line I don't even see what would have changed for the menu if used...

@cvuosalo
Copy link
Contributor

cvuosalo commented Jul 7, 2016

@jhgoh: Could you please check this PR? This bug fix could change the behavior of the StraightLinePropagator that seems to be used by:

RecoMuon/CosmicMuonProducer/python/cosmicMuons_cfi.py

@@ -33,7 +33,7 @@ StraightLinePropagatorESProducer::produce(const TrackingComponentsRecord & iReco

PropagationDirection dir = alongMomentum;

if (pdir == "oppositeToMomentum, alongMomentum, anyDirection")
// if (pdir == "oppositeToMomentum, alongMomentum, anyDirection")
if (pdir == "oppositeToMomentum") dir = oppositeToMomentum;
if (pdir == "alongMomentum") dir = alongMomentum;
if (pdir == "anyDirection") dir = anyDirection;
Copy link
Contributor

Choose a reason for hiding this comment

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

While you're at it, why not add else:

if (pdir == "oppositeToMomentum") dir = oppositeToMomentum;
else if (pdir == "anyDirection") dir = anyDirection;

if for alongMomentum not needed since it's already the default value.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 8, 2016

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

@cvuosalo
Copy link
Contributor

cvuosalo commented Jul 8, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 8, 2016

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 8, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 9, 2016

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

The workflows 140.53 have different files in step1_dasquery.log than the ones found in the baseline. You may want to check and retrigger the tests if necessary. You can check it in the "files" directory in the results of the comparisons

@cvuosalo
Copy link
Contributor

@jhgoh:
This PR is ready for approval, except for your OK that it won't cause problems for cosmics muons.
Jenkins tests are OK.

@cvuosalo
Copy link
Contributor

Piotr Traczyk from the Muon POG approved this change in a separate e-mail thread. Cosmic muons only use the alongMomentum direction, so this change will have no effect for them.

@cvuosalo
Copy link
Contributor

+1

For #15071 0f4875f

Fixing a bug in the StraightLinePropagatorESProducer. Inspection by experts indicates that the bug fix will not change standard workflows because the code is rarely used and then only in a way insensitive to the bug fix.

The code change is satisfactory, and Jenkins tests against baseline CMSSW_8_1_X_2016-07-08-1700 show no significant differences, as expected.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_1_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@davidlange6
Copy link
Contributor

@gartung could you rebase?

cmsbuild pushed a commit that referenced this pull request Jul 14, 2016
…ent-not-guard-warn

TrackingTools/Products fix for bug flagged by gcc 6.0 misleading-indentation warning
@davidlange6 davidlange6 merged commit 0f4875f into cms-sw:CMSSW_8_1_X Jul 14, 2016
@gartung gartung deleted the TrackingTools-Products-fix-indent-not-guard-warn 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