Unify geometry scripts

[kpedro88]

PR description:

• unify operations of 2021 and 2026 geometry scripts, using configurable GeometryGenerator object
• replace optparse w/ argparse and other minor improvements
• improve Era recommendations
• regenerate Phase 2 dd4hep xml files to match script output (and add a few missing ones)
• simplify unit test setup and improve tests to check for missing files

PR validation:

Ran unit tests and checked script output.

Because there are several open PRs adding new Phase2 scenarios, I'm happy to rebase this PR once those are merged, to keep everything consistent.

attn: @ianna @cvuosalo @fabiocos

[cmsbuild]

The code-checks are being triggered in jenkins.

[kpedro88]

please test

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30477/16641

• This PR adds an extra 32KB to repository

• There are other open Pull requests which might conflict with changes you have proposed:

  • File Configuration/Geometry/README.md modified in PR(s): Adding geometry scenarios D59 and D60 implementing ETL version 4 and 5 #30340, Phase2-geox02 Make workflow for a version with HGCal V13 #30442
  • File Configuration/Geometry/python/dict2026Geometry.py modified in PR(s): Adding geometry scenarios D59 and D60 implementing ETL version 4 and 5 #30340, Phase2-geox02 Make workflow for a version with HGCal V13 #30442, update the tracking material for Phase2 geometry D49 #30126

[cmsbuild]

The tests are being triggered in jenkins.

• CMSSW_11_2_X_2020-06-30-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/7545/console Started: 2020/07/01 02:14

[cmsbuild]

A new Pull Request was created by @kpedro88 (Kevin Pedro) for master.

It involves the following packages:

Configuration/Geometry
Geometry/CMSCommonData

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @fabiocos, @slomeo, @vargasa this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

[cmsbuild]

+1
Tested at: d243c9c
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-33ae56/7545/summary.html
CMSSW: CMSSW_11_2_X_2020-06-30-1100
SCRAM_ARCH: slc7_amd64_gcc820

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

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

[ianna]

Thanks, @kpedro88 !

[cvuosalo]

+1

[fabiocos]

@kpedro88 nice piece of work. As far as MTD is concerned please go ahead, @icosivi has for the time being withdrawn its addition of scenarios, it will come back later on.

[cmsbuild]

The code-checks are being triggered in jenkins.

[kpedro88]

now rebased to master

[kpedro88]

please test

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30477/16747

• This PR adds an extra 32KB to repository

• There are other open Pull requests which might conflict with changes you have proposed:

  • File Configuration/Geometry/python/dict2021Geometry.py modified in PR(s): Run3-gem42 Remove reference to GE21 from Run3 scenario #30526
  • File Configuration/Geometry/python/dict2026Geometry.py modified in PR(s): update the tracking material for Phase2 geometry D49 #30126

[cmsbuild]

The tests are being triggered in jenkins.

• CMSSW_11_2_X_2020-07-02-2300/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/7662/console Started: 2020/07/03 17:16

[cmsbuild]

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

[cmsbuild]

+1
Tested at: a3ea089
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-33ae56/7662/summary.html
CMSSW: CMSSW_11_2_X_2020-07-02-2300
SCRAM_ARCH: slc7_amd64_gcc820

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

• Phase2 L1 ParticleFlow  #30510 @silviodonato: Phase2 L1 ParticleFlow
• Phase2-geox02 Make workflow for a version with HGCal V13 #30442 @bsunanda: Phase2-geox02 Make workflow for a version with HGCal V13

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-33ae56/7662/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-33ae56/7662/git-merge-result

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 37
• DQMHistoTests: Total histograms compared: 2784120
• DQMHistoTests: Total failures: 7730
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2776340
• DQMHistoTests: Total skipped: 50
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 36 files compared)
• Checked 154 log files, 17 edm output root files, 37 DQM output files

[cvuosalo]

+1

[kpedro88]

+upgrade

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

[silviodonato]

+1