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

Use unique_ptr constructor for PluginFactory plugins in AttachSD #25832

Merged
merged 2 commits into from Feb 1, 2019

Conversation

makortel
Copy link
Contributor

@makortel makortel commented Feb 1, 2019

This PR is preparatory work to change the PluginFactory to return a std::unique_ptr. On the same go I also changed the management of SensitiveDetector object from raw pointer to unique_ptr (within AttachSD::create(), likely the return type could be changed to use unique_ptr as well but I'd leave that out from this PR).

Tested in CMSSW_10_5_X_2019-01-23-1100, no changes expected.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-25832/8278

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

A new Pull Request was created by @makortel (Matti Kortelainen) for master.

It involves the following packages:

SimG4Core/SensitiveDetector

@cmsbuild, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@makortel
Copy link
Contributor Author

makortel commented Feb 1, 2019

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/32950/console Started: 2019/02/01 04:26

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3097440
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3097242
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 133 log files, 14 edm output root files, 32 DQM output files

@civanch
Copy link
Contributor

civanch commented Feb 1, 2019

+1
concerning change the return type I am not sure: SensitiveDetector is a Geant4 object, it should follow G4 interface, deletion is G4 responsibility (good or bad it is).

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2019

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)

@makortel
Copy link
Contributor Author

makortel commented Feb 1, 2019

@civanch Is the second commit 98ad817 actually wrong then?

@civanch
Copy link
Contributor

civanch commented Feb 1, 2019

@makortel , may be I am wrong, but it seems to be fine - you release std::unique_ptr and put it into the std::vector of pointers, I understand this as you give this object to G4.

@fabiocos
Copy link
Contributor

fabiocos commented Feb 1, 2019

+1

@civanch @makortel in any case in this PR the return type is untouched

@cmsbuild cmsbuild merged commit 3f978e2 into cms-sw:master Feb 1, 2019
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

4 participants