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

[DD4Hep] Use Placement instead of TGeoCombiTrans #33178

Merged
merged 1 commit into from Mar 15, 2021

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Mar 15, 2021

PR description:

The PR should fix the sign discrepancy observed by @bsunanda in rotations

DD: 37 overlaps are displayed in cm
Screenshot 2021-03-15 at 11 10 57
DD4hep: 36 identical overlaps displayed in mm
Screenshot 2021-03-15 at 11 11 15

Shapes:
DD (in cm):

*** Shape eregalgo:EBAR: TGeoPcon ***
    Nz    = 4
    phi1  =     0.00000
    dphi  =   360.00000
     plane 0: z= -304.50000 Rmin=  145.52200 Rmax=  177.50000
     plane 1: z= -268.67000 Rmin=  123.80000 Rmax=  177.50000
     plane 2: z=  268.67000 Rmin=  123.80000 Rmax=  177.50000
     plane 3: z=  304.50000 Rmin=  145.52200 Rmax=  177.50000
 Bounding box:
*** Shape eregalgo:EBAR: TGeoBBox ***
    dX =   177.50000
    dY =   177.50000
    dZ =   304.50000
    origin: x=    0.00000 y=    0.00000 z=    0.00000
*** TGeoCompositeShape : ebalgo:ESPM = 
 Bounding box:
*** Shape ebalgo:ESPM: TGeoBBox ***
    dX =    27.87442
    dY =    32.80927
    dZ =   152.20000
    origin: x=  148.02558 y=    0.75404 z=  152.20000

DD4hep (in mm):

*** Shape eregalgo:EBAR_shape_0x7f18b1503500: TGeoPcon ***
    Nz    = 4
    phi1  =     0.00000
    dphi  =   360.00000
     plane 0: z=-3045.00000 Rmin= 1455.22000 Rmax= 1775.00000
     plane 1: z=-2686.70000 Rmin= 1238.00000 Rmax= 1775.00000
     plane 2: z= 2686.70000 Rmin= 1238.00000 Rmax= 1775.00000
     plane 3: z= 3045.00000 Rmin= 1455.22000 Rmax= 1775.00000
 Bounding box:
*** Shape eregalgo:EBAR_shape_0x7f18b1503500: TGeoBBox ***
    dX =  1775.00000
    dY =  1775.00000
    dZ =  3045.00000
    origin: x=    0.00000 y=    0.00000 z=    0.00000
*** TGeoCompositeShape : ebalgo:ESPM_shape_0x7f18bbc17100 = Subtraction
 Bounding box:
*** Shape ebalgo:ESPM_shape_0x7f18bbc17100: TGeoBBox ***
    dX =   278.74416
    dY =   328.09266
    dZ =  1522.00000
    origin: x= 1480.25584 y=    7.54037 z= 1522.00000

Overlaps in DD and DD4hep at a prescission level:
Screenshot 2021-03-15 at 11 36 09

 = Overlap ov00036: eregalgo:EFAW extruded by: eregalgo:EFAW/eregalgo:EHAWR_2 ovlp=1.00141e-06
 - first volume: eregalgo:EFAW at position:
matrix Identity - tr=0  rot=0  refl=0  scl=0 shr=0 reg=1 own=0
  1.000000    0.000000    0.000000    Tx =   0.000000
  0.000000    1.000000    0.000000    Ty =   0.000000
  0.000000    0.000000    1.000000    Tz =   0.000000
*** TGeoCompositeShape : eregalgo:EFAW = 
 Bounding box:
*** Shape eregalgo:EFAW: TGeoBBox ***
    dX =     2.72562
    dY =    14.75000
    dZ =   152.20000
    origin: x=   -0.00000 y=    2.75000 z=    0.00000
 - second volume: eregalgo:EHAWR at position:
matrix  - tr=1  rot=1  refl=1  scl=0 shr=0 reg=0 own=0
 -1.000000    0.000000   -0.000000    Tx =  -1.210159
  0.000000    1.000000    0.000000    Ty =  -0.000000
 -0.000000   -0.000000    1.000000    Tz =  -0.000000
*** TGeoCompositeShape : eregalgo:EHAWR = 
 Bounding box:
*** Shape eregalgo:EHAWR: TGeoBBox ***
    dX =     1.36281
    dY =    14.75000
    dZ =   152.20000
    origin: x=    0.15265 y=    2.75000 z=    0.00000

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

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

@ianna
Copy link
Contributor Author

ianna commented Mar 15, 2021

please test

@ianna
Copy link
Contributor Author

ianna commented Mar 15, 2021

@civanch and @cvernier - FYI

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33178/21585

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

Geometry/EcalCommonData

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth can you please review it and eventually sign? Thanks.
@rchatter, @simonepigazzini, @fabiocos, @thomreis, @argiro this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@ianna
Copy link
Contributor Author

ianna commented Mar 15, 2021

Total DD4hep overlaps with precision of 0.001 mm reported by ROOT overlap checker is 41:
Screenshot 2021-03-15 at 11 47 47
if there are more in G4 geometry, it would indicate a problem with a shape or unit conversion in the DD4hep G4 converter.

@ianna
Copy link
Contributor Author

ianna commented Mar 15, 2021

GDML produced from the DD4hep-produced geometry also agrees with 41 overlap at a 0.05 mm precision:
Screenshot 2021-03-15 at 13 59 47

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-118307/13505/summary.html
COMMIT: 7089310
CMSSW: CMSSW_11_3_X_2021-03-14-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33178/13505/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 37
  • DQMHistoTests: Total histograms compared: 2635087
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2635058
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 36 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 155 log files, 37 edm output root files, 37 DQM output files

@ianna
Copy link
Contributor Author

ianna commented Mar 15, 2021

ECal simhits also present:
Screenshot 2021-03-15 at 14 19 59

@ianna
Copy link
Contributor Author

ianna commented Mar 15, 2021

@civanch and @cvuosalo - geometry-wise everything looks good to me.

@ianna
Copy link
Contributor Author

ianna commented Mar 15, 2021

+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. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Mar 15, 2021

+1

@cmsbuild cmsbuild merged commit a2d8ea4 into cms-sw:master Mar 15, 2021
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

3 participants