DD: Replace PseudoTrap shape by TruncTubs

[ianna]

PR description:

• Replace use of PseudoTrap by TruncTubs in order to minimize the number of supported shapes

The PseudoTrap shape was used only in Muon Yoke definition.

@cvuosalo - as we have discussed

PR validation:

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]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27632/11125

• This PR adds an extra 36KB to repository

[cmsbuild]

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

It involves the following packages:

Fireworks/Geometry
Geometry/CMSCommonData
Geometry/MuonCommonData

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

please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/1692/console Started: 2019/07/29 20:37

[cmsbuild]

-1

Tested at: f1c805f

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-984407/1692/summary.html

I found follow errors while testing this PR

Failed tests: UnitTests

• Unit Tests:

I found errors in the following unit tests:

---> test test2026Geometry had ERRORS

[cmsbuild]

Comparison job queued.

[cvuosalo]

What about Geometry/MuonCommonData/data/muonYoke.xml? It contains PseudoTrap. Shouldn't it be removed or revised?

[cvuosalo]

For DD4hep, is it true we will not support the v1 muon yokes?

[kpedro88]

@ianna a reminder that it is forbidden to edit the 2026 geometry configs directly. Instead please modify dict2026Geometry.py and rerun generate2026Geometry.py to maintain consistency between the concrete scenarios and the source dictionaries used to generate new scenarios.

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-984407/1692/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: 2628546
• DQMHistoTests: Total failures: 1
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2628228
• DQMHistoTests: Total skipped: 317
• 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

[cmsbuild]

+1
Tested at: afbf47b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-984407/1744/summary.html

[cmsbuild]

Comparison job queued.

[ianna]

+1

[cmsbuild]

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

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

• /build/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-984407/22034.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2026D46_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D46+RecoFullGlobal_2026D46+HARVESTFullGlobal_2026D46

Comparison Summary:

• You potentially added 512 lines to the logs
• Reco comparison results: 13380 differences found in the comparisons
• DQMHistoTests: Total files compared: 31
• DQMHistoTests: Total histograms compared: 2405079
• DQMHistoTests: Total failures: 32853
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2371921
• DQMHistoTests: Total skipped: 305
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: -0.016 KiB( 30 files compared)
• DQMHistoSizes: changed ( 25202.0 ): -0.016 KiB SiStrip/MechanicalView
• Checked 128 log files, 14 edm output root files, 31 DQM output files

[cmsbuild]

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

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

• /build/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-984407/22034.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2026D46_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D46+RecoFullGlobal_2026D46+HARVESTFullGlobal_2026D46

Comparison Summary:

• You potentially added 654 lines to the logs
• Reco comparison results: 9152 differences found in the comparisons
• DQMHistoTests: Total files compared: 32
• DQMHistoTests: Total histograms compared: 2484130
• DQMHistoTests: Total failures: 16480
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2467333
• DQMHistoTests: Total skipped: 317
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
• Checked 132 log files, 14 edm output root files, 32 DQM output files

[slava77]

+1

for #27632 afbf47b

• there are no changes in reco category files
• jenkins tests show differences only in phase-2 workflows, where the geometry is built from XML and it looks like there are usual random number sequence changes at SIM, which make it somewhat impossible to see subtle features using 10 events. There are no significant indications of something broken.

[kpedro88]

+upgrade

[ianna]

@alja - I've updated the Magnetic field geometry dump configuration to use correct XML files. Please, review.

[alja]

+1

[cmsbuild]

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)

[kpedro88]

+1