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

Generate 2021 Scenario Automatically #30214

Merged
merged 7 commits into from Jun 16, 2020

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Jun 12, 2020

PR description:

Similar to 2026 scenarios, 2021 scenario is autogenerated by a script.

python ./Configuration/Geometry/scripts/generate2021Geometry.py

@fabiocos , could you, please, check if eras and modifies are correctly defined

  • produce a dd4hep 2021 scenario from the same script

  • add PPS in the CTPPS section

  • add automated validation to check if the 2021 scenario was modified by hand

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:

@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-30214/16079

  • This PR adds an extra 28KB to repository

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

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @ianna (Ianna Osborne) 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

@kpedro88
Copy link
Contributor

@ianna this is great. Since there are only some minor changes in generate2021Geometry.py compared to generate2026Geometry.py, maybe it's worth trying to unify these scripts? I can look at this if you want.

Also, it might be nice to update Configuration/Geometry/README.md with info about the 2021 geometry.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@ianna
Copy link
Contributor Author

ianna commented Jun 12, 2020

@ianna this is great. Since there are only some minor changes in generate2021Geometry.py compared to generate2026Geometry.py, maybe it's worth trying to unify these scripts? I can look at this if you want.

Also, it might be nice to update Configuration/Geometry/README.md with info about the 2021 geometry.

I'd appreciate if you take it from my hands. Thanks!
There is a catch though - 2021 dd4hep scenario is slightly different :-)

@ianna
Copy link
Contributor Author

ianna commented Jun 12, 2020

@kpedro88 - also, if you'd like to keep "D" in the file name, there will be wide-spread changes in configurations across the whole CMSSW :-(

@kpedro88
Copy link
Contributor

We can make the "D" depend on the 2021 vs. 2026 settings.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30214/16083

  • This PR adds an extra 28KB to repository

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

@kpedro88
Copy link
Contributor

Indeed, part of my motivation is to be able to reuse the 2021 dd4hep setup for 2026

@cmsbuild
Copy link
Contributor

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

@cvuosalo
Copy link
Contributor

@ianna @mundim How does this PR affect the work Luiz is doing to include the PPS simulation geometry?

@cvuosalo
Copy link
Contributor

@cmsbuild please test

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30214/16144

@cmsbuild
Copy link
Contributor

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

@fabiocos
Copy link
Contributor

@ianna if the purpose is to generate a DD4hep full configuration, the dd4hep process modifier should also be activated

@ianna
Copy link
Contributor Author

ianna commented Jun 15, 2020

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 15, 2020

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+1
Tested at: 8de1ef2
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4bee25/7082/summary.html
CMSSW: CMSSW_11_2_X_2020-06-15-1100
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2778811
  • DQMHistoTests: Total failures: 4
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2778757
  • 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

@cvuosalo
Copy link
Contributor

+1

@kpedro88
Copy link
Contributor

+upgrade
I'll submit a followup PR to unify the scripts, haven't had time yet

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

@silviodonato
Copy link
Contributor

+1

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

8 participants