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

CSC migration to DD4HEP #29111

Merged
merged 4 commits into from
Mar 13, 2020
Merged

CSC migration to DD4HEP #29111

merged 4 commits into from
Mar 13, 2020

Conversation

slomeo
Copy link
Contributor

@slomeo slomeo commented Mar 5, 2020

PR description:

CSC migration to DD4HEP:

This PR covers Sim / Numbering / Validation
No editing for Reco files
It doesn't cover Sensitive Detectors.
There are not overlaps for CSC (All Muon Overlaps were fixed in old PRs related to Scenario 2021 and 2026)

Files changed:

Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.h
Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc
Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h
Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc
Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.h

New files adedd:

Geometry/CSCGeometryBuilder/plugins/CSCGeometryValidate.cc
Geometry/MuonNumbering/src/DD4hep_CSCNumberingScheme.cc
Geometry/MuonNumbering/interface/DD4hep_CSCNumberingScheme.h

Validation made by scripts present in Geometry/CSCGeometryBuilder/test/python (i.e see pdf files attached)

CSC5.pdf
CSC6.pdf
CSC7.pdf
CSC8.pdf
CSC9.pdf
CSC10.pdf
CSC11.pdf
CSC12.pdf
CSC13.pdf
CSC1.pdf
CSC2.pdf
CSC3.pdf
CSC4.pdf

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29111/14013

  • This PR adds an extra 8468KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2020

A new Pull Request was created by @slomeo (Sergio Lo Meo) for master.

It involves the following packages:

Geometry/CSCGeometryBuilder
Geometry/MuonNumbering
cmsRecoGeom-2021.root

The following packages do not have a category, yet:

cmsRecoGeom-2021.root
Please create a PR for https://github.com/cms-sw/cms-bot/blob/master/categories_map.py to assign category

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild can you please review it and eventually sign? Thanks.
@ptcox this is something you requested to watch as well.
@davidlange6, @silviodonato, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@mrodozov
Copy link
Contributor

mrodozov commented Mar 5, 2020

@slomeo is this root file a leftover ?

The following packages do not have a category, yet:
cmsRecoGeom-2021.root

@slomeo
Copy link
Contributor Author

slomeo commented Mar 5, 2020

Probably do I need a "git squash"?

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2020

The code-checks are being triggered in jenkins.

@civanch
Copy link
Contributor

civanch commented Mar 5, 2020

@slomeo , better to close this and make a new one without root file. Another variant :

git rm yourfile.root
git commit -m "remove root file"
git push ....

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29111/14015

  • This PR adds an extra 8460KB to repository

  • Found files with invalid states:

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2020

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2020

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-29111/14111

  • This PR adds an extra 16KB to repository

  • Found files with invalid states:

    • Geometry/CSCGeometryBuilder/test/python/validateCSCGeometry2_cfg.py:
    • Geometry/CSCGeometryBuilder/test/python/validateCSCGeometry_cfg.py:

@cmsbuild
Copy link
Contributor

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

@davidlange6
Copy link
Contributor

davidlange6 commented Mar 11, 2020 via email

@cvuosalo
Copy link
Contributor

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 11, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5137/console Started: 2020/03/11 17:11

@cmsbuild
Copy link
Contributor

+1
Tested at: b91806a
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-aba8fd/5137/summary.html
CMSSW: CMSSW_11_1_X_2020-03-10-2300
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-aba8fd/5137/summary.html

Comparison Summary:

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

@cvuosalo
Copy link
Contributor

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

@fabiocos
Copy link
Contributor

@davidlange6 in my view as soon as the migration is completed, also in terms of validation, the old DDD code should be progressively de-commissioned, so at the end of the process there will be no more special setting to be tracked, But I am afraid this is neither for tomorrow nor for April. So in the meanwhile the modifier may help in managing transparently one setup vs the other.

@slomeo
Copy link
Contributor Author

slomeo commented Mar 13, 2020

the issue of the parameter useDD4hep_ will be fixed in a dedicated PR, please merge #29111 in order to give the opportunity to Adinda De Wit & Marco Musich keep on their job about Traker/Muon Alignment

@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.