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

Technical fixes for geometry DB payload creation #36897

Merged
merged 2 commits into from
Feb 6, 2022

Conversation

cvuosalo
Copy link
Contributor

@cvuosalo cvuosalo commented Feb 4, 2022

This PR is a collection of fixes and enhancements to support geometry DB payload creation. The changes are as follows.

CondTools/Geometry/test/writehelpers/geometryExtended2021_writer.py -- remove improper DD4hep dependence from this DDD script.

DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc -- fix to prevent run-time error related to Event Setup.

Geometry/CSCGeometry/test/stubs/CSCGeometryAnalyzer.cc -- ES Get Token migration to allow CSC geometry test to run in 12_3.

Geometry/GEMGeometry/test/testGEMGeometry_cfg.py
Geometry/GEMGeometry/test/testGEMGeometryFromDB_cfg.py
Geometry/GEMGeometry/test/testGEMGeometryFromLocalDB_cfg.py -- scripts to help compare GEM reco geometry in XML, DB, and a local DB.

None of the files in this PR are used by any workflow. They are only used for expert tools.

PR validation:

DDD DB payloads were created succesfully to verify the changes in this PR. Also, the test scripts were run, and they produce reasonable output.

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

A backport to 12_2 would promote consistency but it is not strictly necessary. I can manually copy these changes to a 12_2 working directory if it turns out I need them.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 4, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36897/28172

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 4, 2022

A new Pull Request was created by @cvuosalo (Carl Vuosalo) for master.

It involves the following packages:

  • CondTools/Geometry (db)
  • DetectorDescription/OfflineDBLoader (geometry)
  • Geometry/CSCGeometry (geometry)
  • Geometry/GEMGeometry (geometry, upgrade)

@malbouis, @civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @AdrianoDee, @srimanob, @ggovi, @tvami, @francescobrivio can you please review it and eventually sign? Thanks.
@giovanni-mocellin, @watson-ij, @jshlee, @bsunanda, @ptcox, @mmusich, @fabiocos, @slomeo this is something you requested to watch as well.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@@ -27,10 +27,13 @@ class CSCGeometryAnalyzer : public edm::one::EDAnalyzer<> {
const int dashedLineWidth_;
const std::string dashedLine_;
const std::string myName_;
edm::ESGetToken<CSCGeometry, MuonGeometryRecord> ddToken_;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
edm::ESGetToken<CSCGeometry, MuonGeometryRecord> ddToken_;
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> ddToken_;

@@ -42,8 +45,7 @@ void CSCGeometryAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetu
std::cout << "start " << dashedLine_ << std::endl;
std::cout << "pi = " << dPi << ", radToDeg = " << radToDeg << std::endl;

edm::ESHandle<CSCGeometry> pDD;
iSetup.get<MuonGeometryRecord>().get(pDD);
edm::ESTransientHandle<CSCGeometry> pDD = iSetup.getTransientHandle(ddToken_);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this can be const too

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tvami Thanks for the suggestions. I made those changes.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 4, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36897/28173

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 4, 2022

Pull request #36897 was updated. @malbouis, @civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @AdrianoDee, @srimanob, @ggovi, @tvami, @francescobrivio can you please check and sign again.

@cvuosalo
Copy link
Contributor Author

cvuosalo commented Feb 4, 2022

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 5, 2022

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-dd7f16/22240/summary.html
COMMIT: 2265366
CMSSW: CMSSW_12_3_X_2022-02-04-2300/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36897/22240/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 46
  • DQMHistoTests: Total histograms compared: 3766018
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3765988
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 45 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 193 log files, 42 edm output root files, 46 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor

civanch commented Feb 5, 2022

+1

@tvami
Copy link
Contributor

tvami commented Feb 5, 2022

+db

@srimanob
Copy link
Contributor

srimanob commented Feb 6, 2022

+Upgrade

Technical PR for payload creation.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2022

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

@perrotta
Copy link
Contributor

perrotta commented Feb 6, 2022

+1

  • Updates made on some private script
  • (@tvami those non reproducibilities in the MVT/Vertex DQM plots appears in all PR test comparisons since some while: it is certainly worth identifying their origin, which is not in this PR, anyhow)

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.

6 participants