ECAL esConsumes migration of Calibration packages #35107

thomreis · 2021-09-01T14:25:21Z

PR description:

This PR migrates ECAL related code in the Calibration packages to esConsumes (#31061). In addition getByLabel() calls were replaced by getByToken() and legacy module types were migrated to multithreaded module types.

PR validation:

Code compiles.

Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc

cmsbuild · 2021-09-01T14:33:08Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35107/24998

This PR adds an extra 212KB to repository

cmsbuild · 2021-09-01T14:33:32Z

A new Pull Request was created by @thomreis (Thomas Reis) for master.

It involves the following packages:

Calibration/EcalAlCaRecoProducers (alca)
Calibration/EcalCalibAlgos (alca)

@yuanchao, @malbouis, @cmsbuild, @tvami, @francescobrivio can you please review it and eventually sign? Thanks.
@rchatter, @tocheng, @argiro, @thomreis, @simonepigazzini, @mmusich 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

Calibration/EcalCalibAlgos/src/ECALpedestalPCLHarvester.cc

tvami · 2021-09-01T14:50:18Z

Calibration/EcalCalibAlgos/interface/EcalEleCalibLooper.h

  //! eta size of the additive border to the sub-matrix
  //    int m_etaBorder ; //FIXME


is this commented out code expected to be used?

tvami · 2021-09-01T14:50:29Z

Calibration/EcalCalibAlgos/interface/EcalEleCalibLooper.h

  //! phi size of the additive border to the sub-matrix
  //    int m_phiBorderEB //FIXME;


is this commented out code expected to be used?

I do not know. I just did the esConsumes migration and I do not use this code otherwise.

tvami · 2021-09-01T14:51:45Z

Calibration/EcalCalibAlgos/interface/InvRingCalib.h

  //! eta size of the regions
-  int m_etaWidth;
+  const int m_etaWidth;
  //    std::map<int,float> m_eta;


is this commented out code expected to be used?

tvami · 2021-09-02T12:13:22Z

@cmsbuild , please test

cmsbuild · 2021-09-02T12:16:38Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35107/25028

This PR adds an extra 224KB to repository

cmsbuild · 2021-09-02T12:17:08Z

Pull request #35107 was updated. @yuanchao, @malbouis, @tvami, @francescobrivio can you please check and sign again.

cmsbuild · 2021-09-02T15:25:58Z

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a2f821/18254/summary.html
COMMIT: 7a77d78
CMSSW: CMSSW_12_1_X_2021-09-02-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/35107/18254/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

136.72413136.72413_RunJetHT2016B_reminiaodUL+RunJetHT2016B_reminiaodUL+REMININANO_data2016UL_HIPM_met+HARVESTDR2_REMININANO_data2016UL_HIPM_met/step2_RunJetHT2016B_reminiaodUL+RunJetHT2016B_reminiaodUL+REMININANO_data2016UL_HIPM_met+HARVESTDR2_REMININANO_data2016UL_HIPM_met.log

Comparison Summary

Summary:

No significant changes to the logs found
Reco comparison results: 2 differences found in the comparisons
DQMHistoTests: Total files compared: 39
DQMHistoTests: Total histograms compared: 3000404
DQMHistoTests: Total failures: 6
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3000376
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

thomreis · 2021-09-02T16:56:48Z

Does not look like an error that is related to this PR.

tvami · 2021-09-02T17:02:33Z

Does not look like an error that is related to this PR.

Yes indeed, I'll re-trigger tests later

tvami · 2021-09-02T22:16:17Z

@cmsbuild , please test

cmsbuild · 2021-09-03T01:38:42Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a2f821/18271/summary.html
COMMIT: 7a77d78
CMSSW: CMSSW_12_1_X_2021-09-02-1600/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/35107/18271/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: 3000404
DQMHistoTests: Total failures: 0
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3000382
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

tvami · 2021-09-03T11:50:01Z

+alca

cmsbuild · 2021-09-03T11:50:27Z

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)

qliphy · 2021-09-03T12:35:14Z

+1

thomreis added 13 commits September 1, 2021 16:19

esConsumes migration SelectedElectronFEDListProducer

70a8a1e

esConsumes migration ECALpedestalPCLHarvester.

3d1dde0

esConsumes migration ECALpedestalPCLworker.

688dfcd

esConsumes migration of EcalEleCalibLooper.

0e84d06

Modernisation of ElectronCalibrationUniv.

8afc1fb

Modernise InvRingCalib.

43172b0

Modernise EcalEleCalibLooper.

97d66d5

Modernise PhiSymmetryCalibration.

9b54a4e

esConsumes migration PhiSymmetryCalibration_step2.

5ef63d6

esConsumes migration PhiSymmetryCalibration_step2_SM.

ec26c2b

esConsumes migration of Pi0FixedMassWindowCalibration.

5ade040

esConsumes migration of ZeeCalibration.

315d590

Apply code-checks and code-format.

378159c

cmsbuild added this to the CMSSW_12_1_X milestone Sep 1, 2021

cmsbuild added alca-pending code-checks-pending orp-pending pending-signatures tests-pending labels Sep 1, 2021

sroychow reviewed Sep 1, 2021

View reviewed changes

Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc Outdated Show resolved Hide resolved

cmsbuild added code-checks-approved and removed code-checks-pending labels Sep 1, 2021

sroychow reviewed Sep 1, 2021

View reviewed changes

Calibration/EcalCalibAlgos/src/ECALpedestalPCLHarvester.cc Outdated Show resolved Hide resolved

tvami reviewed Sep 1, 2021

View reviewed changes

thomreis added 2 commits September 2, 2021 13:27

Remove unused conditions import from ES.

837b840

Replace getHandle calls with getData.

1e2fe38

cmsbuild added tests-started and removed tests-pending labels Sep 2, 2021

cmsbuild added code-checks-approved and removed code-checks-pending labels Sep 2, 2021

cmsbuild added tests-rejected and removed tests-started labels Sep 2, 2021

cmsbuild added tests-started and removed tests-rejected labels Sep 2, 2021

cmsbuild added tests-approved and removed tests-started labels Sep 3, 2021

cmsbuild added alca-approved fully-signed and removed alca-pending pending-signatures labels Sep 3, 2021

cmsbuild added orp-approved and removed orp-pending labels Sep 3, 2021

cmsbuild merged commit 27edb97 into cms-sw:master Sep 3, 2021

cmsbuild mentioned this pull request Sep 3, 2021

Updates python packages to their latest version cms-sw/cmsdist#7263

Merged

thomreis deleted the ecal-esconsumes-migration-calibration-pkg branch September 7, 2021 13:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ECAL esConsumes migration of Calibration packages #35107

ECAL esConsumes migration of Calibration packages #35107

thomreis commented Sep 1, 2021

cmsbuild commented Sep 1, 2021

cmsbuild commented Sep 1, 2021

tvami Sep 1, 2021

tvami Sep 1, 2021

thomreis Sep 2, 2021

tvami Sep 1, 2021

tvami commented Sep 2, 2021

cmsbuild commented Sep 2, 2021

cmsbuild commented Sep 2, 2021

cmsbuild commented Sep 2, 2021

thomreis commented Sep 2, 2021

tvami commented Sep 2, 2021

tvami commented Sep 2, 2021

cmsbuild commented Sep 3, 2021

tvami commented Sep 3, 2021

cmsbuild commented Sep 3, 2021

qliphy commented Sep 3, 2021

		//! eta size of the additive border to the sub-matrix
		// int m_etaBorder ; //FIXME

		//! phi size of the additive border to the sub-matrix
		// int m_phiBorderEB //FIXME;

ECAL esConsumes migration of Calibration packages #35107

ECAL esConsumes migration of Calibration packages #35107

Conversation

thomreis commented Sep 1, 2021

PR description:

PR validation:

cmsbuild commented Sep 1, 2021

cmsbuild commented Sep 1, 2021

tvami Sep 1, 2021

Choose a reason for hiding this comment

tvami Sep 1, 2021

Choose a reason for hiding this comment

thomreis Sep 2, 2021

Choose a reason for hiding this comment

tvami Sep 1, 2021

Choose a reason for hiding this comment

tvami commented Sep 2, 2021

cmsbuild commented Sep 2, 2021

cmsbuild commented Sep 2, 2021

cmsbuild commented Sep 2, 2021

RelVals-INPUT

Comparison Summary

thomreis commented Sep 2, 2021

tvami commented Sep 2, 2021

tvami commented Sep 2, 2021

cmsbuild commented Sep 3, 2021

Comparison Summary

tvami commented Sep 3, 2021

cmsbuild commented Sep 3, 2021

qliphy commented Sep 3, 2021