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

esConsumes in CondTools/CTPPS #34377

Merged
merged 4 commits into from Jul 27, 2021
Merged

Conversation

jan-kaspar
Copy link
Contributor

PR description:

As a follow up of #31061, this PR makes the modules in CondTools/CTPPS use the esConsumes mechanism.

This is a technical PR, no difference in test results is expected.

PR validation:

Comparison before (blue) vs. after the PR (red dashed)

show no differences - as expected.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2021

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34377/23764

  • This PR adds an extra 24KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34377/23765

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 7, 2021

A new Pull Request was created by @jan-kaspar for master.

It involves the following packages:

CondTools/CTPPS

@ggovi, @cmsbuild can you please review it and eventually sign? Thanks.
@fabferro, @mmusich this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-decd46/16732/summary.html
COMMIT: 9d07a3a
CMSSW: CMSSW_12_0_X_2021-07-12-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34377/16732/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: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2787742
  • DQMHistoTests: Total failures: 883
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2786859
  • DQMHistoTests: Total skipped: 0
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@ggovi
Copy link
Contributor

ggovi commented Jul 15, 2021

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

@jan-kaspar
Copy link
Contributor Author

In 10fbac2, I've just committed the patch by @wpcarvalho , thanks! This should fix all the test configs except from write-ctpps-beam-parameters_cfg.py which refers to an SQLite file not present in the CMSSW source code. I suggest that this problem is addressed in another (and topical) PR by the original authors @malbouis and @clemencia who know the best how to solve this tiny issue.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34377/24137

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

Pull request #34377 was updated. @ggovi, @cmsbuild can you please check and sign again.

@qliphy
Copy link
Contributor

qliphy commented Jul 24, 2021

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-decd46/17164/summary.html
COMMIT: 10fbac2
CMSSW: CMSSW_12_0_X_2021-07-23-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34377/17164/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: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 2998564
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2998541
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 38 files compared)
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@ggovi
Copy link
Contributor

ggovi commented Jul 27, 2021

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

@perrotta
Copy link
Contributor

@qliphy @jan-kaspar can you confirm that the errors that were mentioned earlier in this thread disappeared after the last commit?
If so, this PR can be merged: isn't it?

@qliphy
Copy link
Contributor

qliphy commented Jul 27, 2021

@perrotta I tested write-ctpps-rprealalignment_table_test.py and serveral scripts, and they work well now.

@perrotta
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 45994cb into cms-sw:master Jul 27, 2021
: m_outfilename(p.getUntrackedParameter<std::string>("outputrootfile", "output.root")) {
// std::cout<<"CTPPSPixGainCalibsESAnalyzer"<<std::endl;
: m_outfilename(p.getUntrackedParameter<std::string>("outputrootfile", "output.root")),
tokenCalibration_(esConsumes<CTPPSPixelGainCalibrations, CTPPSPixelGainCalibrationsRcd>()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

For future reference, this could have been tokenCalibration_(esConsumes()). The code is 'smart enough' to determine what the type is based on the type of the token.

Comment on lines +78 to 81
edm::ESHandle<CTPPSPixelGainCalibrations> calhandle = context.getHandle(tokenCalibration_);
edm::LogPrint("CTPPSPixGainCalibsReader") << "got eshandle";
context.get<CTPPSPixelGainCalibrationsRcd>().get(calhandle);
edm::LogPrint("CTPPSPixGainCalibsReader") << "got context";
const CTPPSPixelGainCalibrations* pPixelGainCalibrations = calhandle.product();
Copy link
Contributor

Choose a reason for hiding this comment

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

For future reference, this could simply have been

const CTPPSPixelGainCalibrations* pPixelGainCalibrations = &context.getData(tokenCalibration_)

@jan-kaspar
Copy link
Contributor Author

Thanks @Dr15Jones !

@jan-kaspar jan-kaspar deleted the esConsumes_CondTools_CTPPS branch August 31, 2021 08:24
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

7 participants