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

Remove duplicated functions in Provenance.h #13765

Merged
merged 1 commit into from Mar 18, 2016

Conversation

wmtan
Copy link
Contributor

@wmtan wmtan commented Mar 17, 2016

For historical reasons, the class "Provenance" has three different member functions that are identical except for the function name. This PR removes two of them, constBranchDescription() and product(), and replaces calls to them with calls to the existing identical function, branchDescription().
It also replaces two iterator loops with two C++11 range based for loops in a file that was modified anyway. This PR should not cause any functional changes whatever.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @wmtan for CMSSW_8_1_X.

It involves the following packages:

DataFormats/Provenance
FWCore/Framework
FWCore/Modules
HLTrigger/btau
IOPool/Input
Validation/GlobalHits

@perrotta, @smuzaffar, @Dr15Jones, @Martin-Grunewald, @cmsbuild, @deguio, @fwyzard, @vanbesien, @davidlange6 can you please review it and eventually sign? Thanks.
@imarches, @acaudron, @wddgit, @Martin-Grunewald, @ferencek, @pvmulder 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

@wmtan
Copy link
Contributor Author

wmtan commented Mar 17, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

@Dr15Jones
Copy link
Contributor

+1

@perrotta
Copy link
Contributor

+1
(Provided it passes the tests)

@cmsbuild
Copy link
Contributor

Comparison not run due to Build errors (RelVals and Igprof tests were also skipped)

@cmsbuild
Copy link
Contributor

-1
Tested at: 8d56aac
I found an error when building:

/cvmfs/cms-ib.cern.ch/week0/slc6_amd64_gcc530/cms/cmssw-patch/CMSSW_8_1_X_2016-03-17-1100/src/SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h:1:1: warning: null character(s) ignored
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_1_X_2016-03-17-1100/src/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByPositionProducer.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_1_X_2016-03-17-1100/src/SimTracker/TrackAssociatorProducers/plugins/QuickTrackAssociatorByHitsImpl.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_1_X_2016-03-17-1100/src/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc 
/build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_1_X_2016-03-17-1100/src/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.cc: In member function 'void TrackingMaterialPlotter::plotSegmentUnassigned(const MaterialAccountingStep&)':
/build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_1_X_2016-03-17-1100/src/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.cc:125:14: error: invalid use of incomplete type 'const class MaterialAccountingStep'
   w[0] = step.radiationLengths();
              ^
In file included from /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_1_X_2016-03-17-1100/src/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.cc:10:0:
/build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_1_X_2016-03-17-1100/src/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.h:14:7: note: forward declaration of 'class MaterialAccountingStep'
 class MaterialAccountingStep;


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

@Dr15Jones
Copy link
Contributor

Please test

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

-1

Tested at: 8d56aac
I found errors in the following unit tests:

---> test testRecoMETMETProducers had ERRORS
---> test runtestTqafTopEventSelection had ERRORS

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

@cmsbuild
Copy link
Contributor

davidlange6 added a commit that referenced this pull request Mar 18, 2016
Remove duplicated functions in Provenance.h
@davidlange6 davidlange6 merged commit 758b1f1 into cms-sw:CMSSW_8_1_X Mar 18, 2016
@wmtan wmtan deleted the RemoveDuplicateFunctions branch May 26, 2016 04:37
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