DD4hep: Legacy DD Shape ID Support and Mapping #27946

ianna · 2019-09-06T11:30:26Z

PR description:

Add mapping between the old DD and the new DD4hep shape identifiers
Add unit test to check the conversion
Add a convenience LegacySolidShape legacyShape(const cms::DDSolidShape shape) const function to request an old shape ID from the cms::DDFilteredView

Example:

LegacySolidShape legacySphere = cms::dd::value(cms::LegacySolidShapeMap, cms::DDSolidShape::ddsphere);

PR validation:

Run unit test:

testDD4hepDDSolidLegacyShapes

if this PR is a backport please specify the original PR:

Before submitting your pull requests, make sure you followed this checklist:

verify that the PR is really intended for the chosen branch
verify that changes follow CMS Naming, Coding, And Style Rules
verify that the PR passes the basic test procedure suggested in the CMSSW PR instructions

cmsbuild · 2019-09-06T11:30:57Z

The code-checks are being triggered in jenkins.

cmsbuild · 2019-09-06T11:33:00Z

The code-checks are being triggered in jenkins.

cmsbuild · 2019-09-06T11:39:03Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27946/11794

This PR adds an extra 28KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File DetectorDescription/DDCMS/data/cms-mf-geometry.xml modified in PR(s): Magnetic field geometry builder DD4hep migration (part 1) #27886
- File DetectorDescription/DDCMS/interface/DDFilteredView.h modified in PR(s): DD4hep: Tracker Builder, Numbering and GeometricDet pre-migration #27926
- File DetectorDescription/DDCMS/interface/DDSolidShapes.h modified in PR(s): Remove second DDSolidShape until migration is over #27933, DD4hep: Tracker Builder, Numbering and GeometricDet pre-migration #27926
- File DetectorDescription/DDCMS/src/DDFilteredView.cc modified in PR(s): DD4hep: Tracker Builder, Numbering and GeometricDet pre-migration #27926

cmsbuild · 2019-09-06T11:39:30Z

A new Pull Request was created by @ianna (Ianna Osborne) for master.

It involves the following packages:

DetectorDescription/DDCMS

@civanch, @Dr15Jones, @cvuosalo, @ianna, @mdhildreth, @cmsbuild can you please review it and eventually sign? Thanks.
@vargasa 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

ianna · 2019-09-06T11:42:03Z

please test

cmsbuild · 2019-09-06T11:42:33Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/2397/console Started: 2019/09/06 13:43

cmsbuild · 2019-09-06T13:09:58Z

+1
Tested at: edea4a6
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3863c8/2397/summary.html

cmsbuild · 2019-09-06T13:10:01Z

Comparison job queued.

cmsbuild · 2019-09-06T15:07:15Z

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

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 0 differences found in the comparisons
DQMHistoTests: Total files compared: 34
DQMHistoTests: Total histograms compared: 2955796
DQMHistoTests: Total failures: 1
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2955454
DQMHistoTests: Total skipped: 341
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
Checked 145 log files, 15 edm output root files, 34 DQM output files

ianna · 2019-09-06T15:08:37Z

+1

cmsbuild · 2019-09-06T15:09:09Z

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)

cmsbuild · 2019-09-07T06:24:37Z

The code-checks are being triggered in jenkins.

cmsbuild · 2019-09-07T06:31:00Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27946/11806

This PR adds an extra 28KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File DetectorDescription/DDCMS/data/cms-mf-geometry.xml modified in PR(s): Magnetic field geometry builder DD4hep migration (part 1) #27886
- File DetectorDescription/DDCMS/interface/DDFilteredView.h modified in PR(s): DD4hep: Tracker Builder, Numbering and GeometricDet pre-migration #27926
- File DetectorDescription/DDCMS/interface/DDSolidShapes.h modified in PR(s): Remove second DDSolidShape until migration is over #27933, DD4hep: Tracker Builder, Numbering and GeometricDet pre-migration #27926
- File DetectorDescription/DDCMS/src/DDFilteredView.cc modified in PR(s): DD4hep: Tracker Builder, Numbering and GeometricDet pre-migration #27926

cmsbuild · 2019-09-07T06:31:28Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/2420/console Started: 2019/09/07 08:32

cmsbuild · 2019-09-07T06:31:29Z

Pull request #27946 was updated. @civanch, @Dr15Jones, @cvuosalo, @ianna, @mdhildreth, @cmsbuild can you please check and sign again.

ianna · 2019-09-07T06:59:39Z

+1

@fabiocos - all @cvuosalo comments were addressed, I think this PR can go in now

cmsbuild · 2019-09-07T07:00:09Z

This pull request is fully signed and it will be integrated in one of the next master IBs after it passes the integration tests. 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)

cmsbuild · 2019-09-07T08:04:24Z

+1
Tested at: 6fb1378
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3863c8/2420/summary.html

cmsbuild · 2019-09-07T08:04:28Z

Comparison job queued.

cmsbuild · 2019-09-07T10:17:46Z

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

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 2 differences found in the comparisons
DQMHistoTests: Total files compared: 34
DQMHistoTests: Total histograms compared: 2955796
DQMHistoTests: Total failures: 2
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2955453
DQMHistoTests: Total skipped: 341
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
Checked 145 log files, 15 edm output root files, 34 DQM output files

fabiocos · 2019-09-08T16:19:42Z

@cvuosalo so what is you conclusion, based on the latest updates by @ianna ?

cvuosalo · 2019-09-09T16:24:03Z

@fabiocos: I see the problem was fixed. I say go forward with this PR.

fabiocos · 2019-09-10T19:55:24Z

+1

Legacy shape support

522699f

cmsbuild added this to the CMSSW_11_0_X milestone Sep 6, 2019

cmsbuild added code-checks-pending comparison-pending geometry-pending orp-pending pending-signatures tests-pending labels Sep 6, 2019

Code format

edea4a6

cmsbuild added code-checks-approved and removed code-checks-pending labels Sep 6, 2019

cmsbuild added tests-started and removed tests-pending labels Sep 6, 2019

ianna mentioned this pull request Sep 6, 2019

Remove second DDSolidShape until migration is over #27933

Closed

cmsbuild added tests-approved and removed tests-started labels Sep 6, 2019

cmsbuild added comparison-available and removed comparison-pending labels Sep 6, 2019

cmsbuild removed the geometry-pending label Sep 6, 2019

cmsbuild added the tests-pending label Sep 7, 2019

cmsbuild added code-checks-approved and removed code-checks-pending labels Sep 7, 2019

cmsbuild added tests-started and removed tests-pending labels Sep 7, 2019

cmsbuild added fully-signed geometry-approved and removed geometry-pending pending-signatures labels Sep 7, 2019

cmsbuild added tests-approved and removed tests-started labels Sep 7, 2019

cmsbuild added comparison-available and removed comparison-pending labels Sep 7, 2019

cmsbuild mentioned this pull request Sep 9, 2019

DD4hep: Strip off Residual Namespace while Calculating the History #27954

Merged

cmsbuild added orp-approved and removed orp-pending labels Sep 10, 2019

cmsbuild merged commit a85e860 into cms-sw:master Sep 10, 2019

cmsbuild mentioned this pull request Sep 11, 2019

Run3-sim45 Remove reference to G4DataQuestionaire #27965

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DD4hep: Legacy DD Shape ID Support and Mapping #27946

DD4hep: Legacy DD Shape ID Support and Mapping #27946

ianna commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

ianna commented Sep 6, 2019

cmsbuild commented Sep 6, 2019 •

edited

Loading

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

ianna commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019 •

edited

Loading

cmsbuild commented Sep 7, 2019

ianna commented Sep 7, 2019 •

edited

Loading

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

fabiocos commented Sep 8, 2019

cvuosalo commented Sep 9, 2019

fabiocos commented Sep 10, 2019

DD4hep: Legacy DD Shape ID Support and Mapping #27946

DD4hep: Legacy DD Shape ID Support and Mapping #27946

Conversation

ianna commented Sep 6, 2019

PR description:

PR validation:

if this PR is a backport please specify the original PR:

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

ianna commented Sep 6, 2019

cmsbuild commented Sep 6, 2019 • edited Loading

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

ianna commented Sep 6, 2019

cmsbuild commented Sep 6, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019 • edited Loading

cmsbuild commented Sep 7, 2019

ianna commented Sep 7, 2019 • edited Loading

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

cmsbuild commented Sep 7, 2019

fabiocos commented Sep 8, 2019

cvuosalo commented Sep 9, 2019

fabiocos commented Sep 10, 2019

cmsbuild commented Sep 6, 2019 •

edited

Loading

cmsbuild commented Sep 7, 2019 •

edited

Loading

ianna commented Sep 7, 2019 •

edited

Loading