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

Replace reference to ParameterSet with explicit parameter values in HBHEDarkening #42528

Merged
merged 2 commits into from
Aug 15, 2023

Conversation

makortel
Copy link
Contributor

@makortel makortel commented Aug 9, 2023

PR description:

This PR replaces a reference to edm::ParameterSet with explicitly parsed data structures for the configuration parameters. This change is needed for #42503.

Resolves cms-sw/framework-team#621

PR validation:

Code compiles.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 9, 2023

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-42528/36541

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 9, 2023

A new Pull Request was created by @makortel (Matti Kortelainen) for master.

It involves the following packages:

  • CalibCalorimetry/HcalPlugins (alca)
  • CondFormats/HcalObjects (db, alca)

@perrotta, @consuegs, @cmsbuild, @saumyaphor4252, @francescobrivio, @tvami can you please review it and eventually sign? Thanks.
@bsunanda, @mmusich, @abdoulline, @tocheng, @seemasharmafnal this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

@makortel
Copy link
Contributor Author

makortel commented Aug 9, 2023

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-5e0c20/34199/summary.html
COMMIT: a0ad094
CMSSW: CMSSW_13_3_X_2023-08-09-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/42528/34199/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

The relvals timed out after 4 hours.

Comparison Summary

Summary:

  • You potentially added 3 lines to the logs
  • Reco comparison results: 5 differences found in the comparisons
  • DQMHistoTests: Total files compared: 48
  • DQMHistoTests: Total histograms compared: 3150947
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3150922
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
  • Checked 207 log files, 159 edm output root files, 48 DQM output files
  • TriggerResults: no differences found

@tvami
Copy link
Contributor

tvami commented Aug 11, 2023

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-5e0c20/34236/summary.html
COMMIT: a0ad094
CMSSW: CMSSW_13_3_X_2023-08-11-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/42528/34236/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially removed 28 lines from the logs
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 48
  • DQMHistoTests: Total histograms compared: 3150947
  • DQMHistoTests: Total failures: 0
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3150925
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
  • Checked 207 log files, 159 edm output root files, 48 DQM output files
  • TriggerResults: no differences found

Comment on lines +68 to +69
for (const auto& p_dosemap : dosemaps_) {
dosemaps.emplace(p_dosemap.file_energy, HBHEDarkening::readDoseMap(p_dosemap.fp.fullPath()));
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe this is stupid question (in that case sorry!), but why do you need to define a dosemaps_ private member, fill it in the constructor, and here define another object "reading the dose" from the filepath stored in dosemaps_?

Couldn't you just use HBHEDarkening::readDoseMap(filePath) directly in the constuctor (modifying the dosemaps_ definition to std::map<int, std::vector<std::vector<float>>>, of course) and just use it here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Couldn't you just use HBHEDarkening::readDoseMap(filePath) directly in the constuctor (modifying the dosemaps_ definition to std::map<int, std::vector<std::vector<float>>>, of course) and just use it here?

I could, but not knowing how much memory that would take, I didn't want to. In this way the file is also read only if some other module in the job actually consumes HBHEDarkening.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok makes sense, thanks Matti!

@francescobrivio
Copy link
Contributor

+1

  • technical PR
  • tests are clean

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

@perrotta
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 67be6c5 into cms-sw:master Aug 15, 2023
@makortel makortel deleted the HBHEDarkeningEPPSet branch August 15, 2023 12:59
@cmsbuild cmsbuild mentioned this pull request Aug 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants