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

Change the return type of ESProducer templates L1ConfigOnlineProdBase… #22146

Merged
merged 6 commits into from Mar 1, 2018
Merged

Change the return type of ESProducer templates L1ConfigOnlineProdBase… #22146

merged 6 commits into from Mar 1, 2018

Conversation

gartung
Copy link
Member

@gartung gartung commented Feb 7, 2018

… and L1ObjectKeysOnlineProdBase to std::unique_ptr

… and L1ObjectKeysOnlineProdBase to std::unique_ptr
@gartung
Copy link
Member Author

gartung commented Feb 7, 2018

Don't test yet. For review only.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

The code-checks are being triggered in jenkins.

@gartung
Copy link
Member Author

gartung commented Feb 7, 2018

@Dr15Jones please review.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

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

It involves the following packages:

CondTools/L1Trigger
L1TriggerConfig/CSCTFConfigProducers
L1TriggerConfig/GMTConfigProducers

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

@@ -161,7 +161,7 @@ L1ConfigOnlineProdBase<TRcd, TData>::produce( const TRcd& iRecord )
if( !payloadToken.empty() )
{
m_dbSession.transaction().start() ;
pData = m_dbSession.fetchPayload<TData>( payloadToken ) ;
pData = std::make_unique<TData>(*(m_dbSession.fetchPayload<TData>( payloadToken ).get())) ;
Copy link
Member Author

Choose a reason for hiding this comment

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

@Dr15Jones fetchPayload returns a shared_ptr. Here I make a copy of the object and create a unique_ptr for return.

Copy link
Contributor

Choose a reason for hiding this comment

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

In this case, I think it would be better to just keep return a std::shared_ptr.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

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

@@ -24,7 +24,7 @@ L1MuCSCPtLutConfigOnlineProd::newObject( const std::string& objectKey )
{
edm::LogError( "L1-O2O" ) << "Problem with L1MuCSCPtLutParameters key" ;
// return empty object
return std::shared_ptr< L1MuCSCPtLut >() ;
return std::make_shared< L1MuCSCPtLut >() ;
Copy link
Contributor

Choose a reason for hiding this comment

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

These are different. The original created an empty shared_ptr. Your code makes a shared_ptr containing a defaultly constructed object.

Please set the code back to what it was.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 7, 2018

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-22146/25959/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-22146/1325.7_TTbar_13_94XNanoAODINPUT+TTbar_13_94XNanoAODINPUT+NANOEDMMC2017+HARVESTNANOAODMC2017

Comparison Summary:

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

@ggovi
Copy link
Contributor

ggovi commented Feb 13, 2018

+1

@fabiocos
Copy link
Contributor

@thomreis @rekovic @nsmith- could you please check and sign in case?

@thomreis
Copy link
Contributor

+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

fabiocos commented Mar 1, 2018

+1

@cmsbuild cmsbuild merged commit 783236f into cms-sw:master Mar 1, 2018
@gartung gartung deleted the CondTools-L1Trigger-Template-ESProducers-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