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

Run3-gex14 Remove some overlap in Run3 geometry #31574

Merged
merged 2 commits into from
Sep 26, 2020

Conversation

bsunanda
Copy link
Contributor

PR description:

Remove some overlaps coming in the PPS part of Run3 geometry

PR validation:

Tested using the G4 overlap tool

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

Nothing special

@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/cms-sw-PR-31574/18607

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @bsunanda (Sunanda Banerjee) for master.

It involves the following packages:

Configuration/Geometry
Geometry/CMSCommonData
Geometry/VeryForwardData
SimG4Core/PrintGeomInfo

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please review it and eventually sign? Thanks.
@vargasa, @makortel, @forthommel, @jan-kaspar, @rovere, @Martin-Grunewald, @fabiocos, @slomeo 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

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 24, 2020

The tests are being triggered in jenkins.

@@ -0,0 +1,7 @@
----- Begin Fatal Exception 24-Sep-2020 19:32:24 CEST-----------------------
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this file be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry - I missed it. I did a "git add ." without realizing the consequence

Copy link
Contributor

Choose a reason for hiding this comment

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

Could the two commits be squashed together to avoid the file appearing in the git history (even if it is small)?

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31574/18611

  • This PR adds an extra 36KB to repository

  • Found files with invalid states:

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 2539438
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2539415
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 149 log files, 22 edm output root files, 35 DQM output files

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 2539438
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2539415
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 149 log files, 22 edm output root files, 35 DQM output files

@cvuosalo
Copy link
Contributor

+1

@kpedro88
Copy link
Contributor

+upgrade

@civanch
Copy link
Contributor

civanch commented Sep 26, 2020

+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 Sep 26, 2020

+1

@cmsbuild cmsbuild merged commit 051d43f into cms-sw:master Sep 26, 2020
@makortel
Copy link
Contributor

Apparently this PR caused two unit tests in DetectorDescription/DDCMS to fail

==== Let's go to #45
>>> 5 level: PixelBarrelSuppBox is a Box
Full path to it is world_volume/OCMS_1/CMSE_1/Tracker_1/PixelBarrel_1/PixelBarrelSuppBox_2
    copy Nos: 1, 1, 1, 1, 2, 
    levels  : 0, 0, 6, 2, 2, 
F

DDFilteredView.goto.cppunit.cc:68:Assertion
Test name: testDDFilteredViewGoTo::checkFilteredView
assertion failed
- Expression: it == refPos_[i++]

Failures !!!
Run: 1   Failure total: 1   Failures: 1   Errors: 0

---> test testDD4hepFilteredViewGoTo had ERRORS

and

Go to #45
5 level: PixelBarrelSuppBox is a Box
Full path to it is world_volume/OCMS_1/CMSE_1/Tracker_1/PixelBarrel_1/PixelBarrelSuppBox_2
2, 1, 1, 1, 1, 
0, 0, 6, 2, 2, 
0, 0, 6, F

DDFilteredView.level.cppunit.cc:93:Assertion
Test name: testDDFilteredViewLevel::checkFilteredView
assertion failed
- Expression: it == refPos_[count++]

Failures !!!
Run: 1   Failure total: 1   Failures: 1   Errors: 0

---> test testDD4hepFilteredViewLevel had ERRORS

For more information see http://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc820/CMSSW_11_2_X_2020-09-27-0000/unitTestLogs/DetectorDescription/DDCMS

@bsunanda
Copy link
Contributor Author

@markotel This PR has nothing to do with that failure. PixelBarrelSuppBox belongs to Tracker and this PR deals with PPS related xml's> One needs to investigate the failures independently

@silviodonato
Copy link
Contributor

@bsunanda these errors appeared since CMSSW_11_2_X_2020-09-27-0000 and this PR is the only PR merged between CMSSW_11_2_X_2020-09-26-1100 and CMSSW_11_2_X_2020-09-27-0000, so they seem related to this PR. Anyway I will double check this manually.

@silviodonato
Copy link
Contributor

@bsunanda
I tried in CMSSW_11_2_X_2020-09-27-2300
Baseline: error in testDD4hepFilteredViewLevel and testDD4hepFilteredViewGoTo
I tried again after having copied
cp Geometry/CMSCommonData/data/extend/v2/cmsextent.xml Geometry/CMSCommonData/data/extend/v3/cmsextent.xml
and I got

---> test testDD4hepFilteredViewLevel succeeded
---> test testDD4hepFilteredViewGoTo succeeded 

@silviodonato
Copy link
Contributor

@bsunanda I investigated a bit the issue.
You can compare the log from CMSSW_11_2_X_2020-09-26-1100 and from CMSSW_11_2_X_2020-09-27-0000.
In particular there is a change in the level numbers
from (CMSSW_11_2_X_2020-09-26-1100)

#1: >>> 1 level: OCMS is a Box
Full path to it is world_volume/OCMS_1
    copy Nos: 1, 
    levels  : 0, 
#2: >>> 2 level: CMSE is a Box
Full path to it is world_volume/OCMS_1/CMSE_1
    copy Nos: 1, 1, 
    levels  : 0, 0, 
#3: >>> 3 level: CMStoZDC is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/CMStoZDC_1
    copy Nos: 1, 1, 1, 
    levels  : 0, 0, 0, 
#4: >>> 3 level: CMStoZDC is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/CMStoZDC_2
    copy Nos: 1, 1, 2, 
    levels  : 0, 0, 1, 
#5: >>> 3 level: ZDCtoFP420 is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/ZDCtoFP420_1
    copy Nos: 1, 1, 1, 
    levels  : 0, 0, 2, 
#6: >>> 3 level: ZDCtoFP420 is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/ZDCtoFP420_2
    copy Nos: 1, 1, 2, 
    levels  : 0, 0, 3, 
#7: >>> 3 level: Tracker is a Polycone
Full path to it is world_volume/OCMS_1/CMSE_1/Tracker_1
    copy Nos: 1, 1, 1, 
    levels  : 0, 0, 4, 

to (CMSSW_11_2_X_2020-09-27-0000)

#1: >>> 1 level: OCMS is a Box
Full path to it is world_volume/OCMS_1
    copy Nos: 1, 
    levels  : 0, 
#2: >>> 2 level: CMSE is a Box
Full path to it is world_volume/OCMS_1/CMSE_1
    copy Nos: 1, 1, 
    levels  : 0, 0, 
#3: >>> 3 level: CMStoZDC is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/CMStoZDC_1
    copy Nos: 1, 1, 1, 
    levels  : 0, 0, 0, 
#4: >>> 3 level: CMStoZDC is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/CMStoZDC_2
    copy Nos: 1, 1, 2, 
    levels  : 0, 0, 1, 
#5: >>> 3 level: ZDCtoFP4201 is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/ZDCtoFP4201_1
    copy Nos: 1, 1, 1, 
    levels  : 0, 0, 2, 
#6: >>> 3 level: ZDCtoFP4201 is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/ZDCtoFP4201_2
    copy Nos: 1, 1, 2, 
    levels  : 0, 0, 3, 
#7: >>> 3 level: ZDCtoFP4202 is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/ZDCtoFP4202_1
    copy Nos: 1, 1, 1, 
    levels  : 0, 0, 4, 
#8: >>> 3 level: ZDCtoFP4202 is a Tube
Full path to it is world_volume/OCMS_1/CMSE_1/ZDCtoFP4202_2
    copy Nos: 1, 1, 2, 
    levels  : 0, 0, 5, 
#9: >>> 3 level: Tracker is a Polycone
Full path to it is world_volume/OCMS_1/CMSE_1/Tracker_1
    copy Nos: 1, 1, 1, 
    levels  : 0, 0, 6, 

If we remove two out of ZDCtoFP4201_1, ZDCtoFP4201_2, ZDCtoFP4202_1, ZDCtoFP4202_2, the level numbers do not change (eg. levels : 0, 0, 4, for Tracker) and then the tests pass.
I'm not sure if this means there is an error in the geometry or in the unit test.

@bsunanda
Copy link
Contributor Author

bsunanda commented Sep 28, 2020 via email

@bsunanda
Copy link
Contributor Author

It is better to remove levels from the unit test - can you let me know the name of the unit test?

@makortel
Copy link
Contributor

@ianna already made a fix in #31605.

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.

9 participants