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

L1Trigger/TrackTrigger: Update return type of produce to unique_ptr. #22174

Merged
merged 2 commits into from Feb 20, 2018
Merged

L1Trigger/TrackTrigger: Update return type of produce to unique_ptr. #22174

merged 2 commits into from Feb 20, 2018

Conversation

gartung
Copy link
Member

@gartung gartung commented Feb 10, 2018

Replace shared_ptr class member with function temporary unique_ptr.

Replace shared_ptr class member with function temporary unique_ptr.
@gartung
Copy link
Member Author

gartung commented Feb 10, 2018

@Dr15Jones

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

L1Trigger/TrackTrigger

@nsmith-, @cmsbuild, @kpedro88, @thomreis, @rekovic can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @kreczko, @sviret 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

{
TTClusterAlgorithm< T >* TTClusterAlgo =
new TTClusterAlgorithm_neighbor< T >( );

_theAlgo = std::shared_ptr< TTClusterAlgorithm< T > >( TTClusterAlgo );
std::unique_ptr< TTClusterAlgorithm< T > > _theAlgo;
_theAlgo = std::unique_ptr< TTClusterAlgorithm< T > >( TTClusterAlgo );
return _theAlgo;
Copy link
Contributor

Choose a reason for hiding this comment

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

It should be possible to replace the entire body with

return std::make_unique<TTClusterAlgorithm_neighbor< T >>();

{
TTClusterAlgorithm< T >* TTClusterAlgo =
new TTClusterAlgorithm_official< T >( mWidthCut );

_theAlgo = std::shared_ptr< TTClusterAlgorithm< T > >( TTClusterAlgo );
std::unique_ptr< TTClusterAlgorithm< T > > _theAlgo;
_theAlgo = std::unique_ptr< TTClusterAlgorithm< T > >( TTClusterAlgo );
return _theAlgo;
Copy link
Contributor

Choose a reason for hiding this comment

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

return std::make_unique<TTClusterAlgorithm_official< T >>( mWidthCut );

@@ -112,7 +111,8 @@ class ES_TTStubAlgorithm_cbc3 : public edm::ESProducer
const TrackerTopology* const theTrackerTopo = tTopoHandle.product();

TTStubAlgorithm< T >* TTStubAlgo = new TTStubAlgorithm_cbc3< T >( theTrackerGeom, theTrackerTopo, mPerformZMatching2S );
_theAlgo = std::shared_ptr< TTStubAlgorithm< T > >( TTStubAlgo );
std::unique_ptr< TTStubAlgorithm< T > > _theAlgo;
_theAlgo = std::unique_ptr< TTStubAlgorithm< T > >( TTStubAlgo );
return _theAlgo;
Copy link
Contributor

Choose a reason for hiding this comment

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

return std::make_unique<TTStubAlgorithm_cbc3< T >>( theTrackerGeom, theTrackerTopo, mPerformZMatching2S );

@@ -172,7 +171,8 @@ class ES_TTStubAlgorithm_official : public edm::ESProducer
setBarrelCut, setRingCut, setTiltedCut, setBarrelNTilt,
mPerformZMatchingPS, mPerformZMatching2S);

_theAlgo = std::shared_ptr< TTStubAlgorithm< T > >( TTStubAlgo );
std::unique_ptr< TTStubAlgorithm< T > > _theAlgo;
_theAlgo = std::unique_ptr< TTStubAlgorithm< T > >( TTStubAlgo );
return _theAlgo;
Copy link
Contributor

Choose a reason for hiding this comment

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

return std::make_unique<TTStubAlgorithm_official< T >>( theTrackerGeom, theTrackerTopo,
                                                        setBarrelCut, setRingCut, setTiltedCut, setBarrelNTilt,
                                                        mPerformZMatchingPS, mPerformZMatching2S);

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Pull request #22174 was updated. @nsmith-, @cmsbuild, @kpedro88, @thomreis, @rekovic can you please check and sign again.

@Dr15Jones
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 10, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/26008/console Started: 2018/02/10 22:35

@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-22174/26008/summary.html

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /build/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-22174/1325.7_TTbar_13_94XNanoAODINPUT+TTbar_13_94XNanoAODINPUT+NANOEDMMC2017+HARVESTNANOAODMC2017

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 6 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2464162
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2463992
  • DQMHistoTests: Total skipped: 169
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.620000000061 KiB( 22 files compared)
  • Checked 111 log files, 9 edm output root files, 27 DQM output files

@kpedro88
Copy link
Contributor

+1

@rekovic
Copy link
Contributor

rekovic commented Feb 20, 2018

+1

@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 f3e363a into cms-sw:master Feb 20, 2018
@gartung gartung deleted the L1Trigger-TrackTrigger-ESProducer-returntype branch March 2, 2018 17:32
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