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

Geant4 sensitive detectors cleanup 1 #21489

Merged
merged 9 commits into from Dec 7, 2017

Conversation

civanch
Copy link
Contributor

@civanch civanch commented Nov 29, 2017

Geant4 sensitive detectors were developed at different time by different developers, it turn out that there are a lot of duplicated code, variable shadowing, many protected members in base and derived classes. There is a possibility to make code faster and be more clean but any such change requires editions in many files. This is a first clean-up, which includes:

  1. use of const pointers and references were possible
  2. removal of all protected members from the base class
  3. implement common intialisation in the base class
  4. substitute remaining auto_ptr by std::unique_ptr
    No change of algorithms, so expected unchanged results.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21489/2250

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @civanch (Vladimir Ivantchenko) for master.

It involves the following packages:

SimG4CMS/Calo
SimG4CMS/CherenkovAnalysis
SimG4CMS/EcalTestBeam
SimG4CMS/FP420
SimG4CMS/Forward
SimG4CMS/HGCalTestBeam
SimG4CMS/HcalTestBeam
SimG4CMS/Muon
SimG4CMS/ShowerLibraryProducer
SimG4CMS/Tracker
SimG4Core/Application
SimG4Core/GeometryProducer
SimG4Core/SensitiveDetector

@cmsbuild, @civanch, @kpedro88, @mdhildreth can you please review it and eventually sign? Thanks.
@makortel, @argiro this is something you requested to watch as well.
@davidlange6, @slava77 you are the release manager for this.

cms-bot commands are listed here

@civanch
Copy link
Contributor Author

civanch commented Nov 29, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 29, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/24757/console Started: 2017/11/29 23:29

@cmsbuild
Copy link
Contributor

@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-21489/24757/summary.html

There are some workflows for which there are errors in the baseline:
10824.0 step 5
The results for the comparisons for these workflows could be incomplete
This means most likely that the IB is having errors in the relvals.The error does NOT come from this pull request

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 7556 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2788080
  • DQMHistoTests: Total failures: 85040
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2702861
  • DQMHistoTests: Total skipped: 178
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.900000000147 KiB( 23 files compared)
  • Checked 111 log files, 8 edm output root files, 27 DQM output files

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21489/2456

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

Pull request #21489 was updated. @cmsbuild, @civanch, @mdhildreth, @kpedro88 can you please check and sign again.

@civanch
Copy link
Contributor Author

civanch commented Dec 6, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

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

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

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

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: 2835085
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2834906
  • DQMHistoTests: Total skipped: 178
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.819999999847 KiB( 23 files compared)
  • Checked 113 log files, 9 edm output root files, 27 DQM output files

@civanch
Copy link
Contributor Author

civanch commented Dec 6, 2017

+1

@civanch
Copy link
Contributor Author

civanch commented Dec 6, 2017

@kpedro88 , @davidlange6 , this is not the last PR for sensitive detectors, I want to optimise and clean-up them in several iterations. Hope that in each new PRs less number of classes will be touched, because this one if intended to clean-up common interfaces.

@kpedro88
Copy link
Contributor

kpedro88 commented Dec 6, 2017

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2017

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 (and backports should be raised in the release meeting by the corresponding L2)

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 8ded5ce into cms-sw:master Dec 7, 2017
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