Don't return pointer to principal #641
Conversation
|
A new Pull Request was created by @wmtan for CMSSW_7_0_X. Don't return pointer to principal It involves the following packages: EventFilter/StorageManager @vciulli, @Dr15Jones, @rovere, @deguio, @ktf can you please review it and eventually sign? Thanks. |
|
The following categories have been signed by @rovere: DQM @cms-git-dqm |
| boost::shared_ptr<RunPrincipal> rp(new RunPrincipal(runAuxiliary(), productRegistry_, processConfiguration(), &historyAppender,0)); | ||
| callWithTryCatchAndPrint<boost::shared_ptr<RunPrincipal> >( [this,&rp](){ return readRun_(rp); }, "Calling InputSource::readRun_" ); | ||
| return rp; | ||
| callWithTryCatchAndPrint<void>( [this,&runPrincipal](){ readRun_(runPrincipal); }, "Calling InputSource::readRun_" ); |
There was a problem hiding this comment.
FYI technically, passing runPrincipal by value is fine here since it can't be modified.
|
+1 |
|
@nclopezo please test. |
|
Hi, I ran the tests on top of CMSSW_6_2_X_2013-08-28-0200, all tests passed The logs are here: and the artifacts here: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/303/ |
|
This pull request will possibly be no longer automatically mergeable because EventFilter/StorageManager has been removed from the repository. If so, don't waste any time on this one, because I will be submitting another pull request soon that supersedes this one, and, at that time, I will close this one if it is still unmerged. On the other hand, there is no harm in merging this one now if it is easy to do so. |
|
I believe you meant to say you tested upon CMSSW_7_0_X_2013-08-28-0200 not 6_2_X. |
|
Hi @Dr15Jones, Sorry, I copy pasted the wrong thing, it was CMSSW_7_0_X_2013-08-28-0200, as you an see in the logs. |
|
I am closing this request because it is probably no longer automatically mergeable, and it is superseded by pull request 681. |
…lphatpt add options in the alphat calculation
Functions that read a run, lumi, or an event principal fill in the principal that is passed in by reference. These functions no longer create the principal. Therefore, there is no need for them to return a pointer to the principal.
With this pull request, these functions now return void or bool, as appropriate.
Also, the functions readAndCacheRun and readAndCacheLumi were modified to fill in the principal rather than creating it, and were renamed readRun and readLuminosityBlock respectively, because the caching of the principal
has been moved outside these functions.
The changes outside the framework are just minimal adaptions to the framework changes.
These changes have been tested by runTheMatrix.py -s and unit tests. The full runTheMatrix.py is in progress.