ECAL esConsumes migration of remaining file in RecoMET #35179

thomreis · 2021-09-07T14:01:11Z

PR description:

The PR migrates the last ECAL related code in the RecoMET packages to esConsumes (#31061) and converts the EDFilter to a thread aware one.

PR validation:

Code compiles.

cmsbuild · 2021-09-07T14:07:05Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35179/25112

This PR adds an extra 16KB to repository

cmsbuild · 2021-09-07T14:07:32Z

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

It involves the following packages:

RecoMET/METFilters (reconstruction)

@jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@mmarionncern, @gouskos, @ahinzmann, @jdamgov, @jdolen, @nhanvtran, @gkasieczka, @clelange, @schoef, @mariadalfonso, @seemasharmafnal 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

slava77 · 2021-09-07T15:09:12Z

@cmsbuild please test

cmsbuild · 2021-09-07T18:11:23Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c35874/18362/summary.html
COMMIT: 7d49b77
CMSSW: CMSSW_12_1_X_2021-09-07-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/35179/18362/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: 3001001
DQMHistoTests: Total failures: 0
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3000979
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

jpata

Thanks for this. Some minor comments inline.

jpata · 2021-09-10T12:11:52Z

RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc

-    delete profFile;
-  }
-}
+EcalDeadCellDeltaRFilter::~EcalDeadCellDeltaRFilter() {}


I think this should be omitted by using the default destructor

Suggested change

EcalDeadCellDeltaRFilter::~EcalDeadCellDeltaRFilter() {}

EcalDeadCellDeltaRFilter::~EcalDeadCellDeltaRFilter() = default;

jpata · 2021-09-10T12:12:29Z

RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc

-#include "TH1.h"
-
-class EcalDeadCellDeltaRFilter : public edm::EDFilter {
+class EcalDeadCellDeltaRFilter : public edm::stream::EDFilter<> {


can you confirm that it was tested to be thread-safe now after these changes? I see some TH1F was removed, which indicates that beforehand it may not have been safe.

The TH1F was removed because it was actually never filled. With it gone, I think making the filter a stream module is possible but it was not tested. The module does not seem to be used in any configuration at the moment.

cmsbuild · 2021-09-13T13:09:09Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35179/25225

This PR adds an extra 16KB to repository

cmsbuild · 2021-09-13T13:09:31Z

Pull request #35179 was updated. @jpata, @cmsbuild, @slava77 can you please check and sign again.

jpata · 2021-09-13T14:40:16Z

@cmsbuild please test

cmsbuild · 2021-09-13T17:48:14Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c35874/18554/summary.html
COMMIT: 77f7541
CMSSW: CMSSW_12_1_X_2021-09-13-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/35179/18554/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: 3001001
DQMHistoTests: Total failures: 0
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3000979
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

jpata · 2021-09-14T12:14:17Z

+reconstruction

for 77f7541
technical, no reco changes
note that EcalDeadCellDeltaRFilter is not used in any workflow and therefore untested

cmsbuild · 2021-09-14T12:14:40Z

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 · 2021-09-14T14:56:41Z

RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc

 }

 void EcalDeadCellDeltaRFilter::envSet(const edm::EventSetup &iSetup) {
  if (debug_)
    std::cout << "***envSet***" << std::endl;

-  iSetup.get<IdealGeometryRecord>().get(ttMap_);
+  ttMap_ = &iSetup.getData(ecalTrigTowerConstituentsMapToken_);


Why &iSetup?

ttMap_ used to be an ESHandle but I made it a const EcalTrigTowerConstituentsMap *ttMap_.

perrotta · 2021-09-14T15:20:10Z

+1

esConsumes migration EcalDeadCellDeltaRFilter.

7d49b77

cmsbuild added this to the CMSSW_12_1_X milestone Sep 7, 2021

cmsbuild added code-checks-pending orp-pending pending-signatures reconstruction-pending tests-pending labels Sep 7, 2021

thomreis changed the title ~~esConsumes migration EcalDeadCellDeltaRFilter.~~ ECAL esConsumes migration of remaining file in RecoMET Sep 7, 2021

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

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

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

jpata reviewed Sep 10, 2021

View reviewed changes

Use default destructor.

77f7541

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

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

cmsbuild removed the tests-pending label Sep 13, 2021

cmsbuild added the tests-started label Sep 13, 2021

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

cmsbuild added fully-signed reconstruction-approved and removed reconstruction-pending pending-signatures labels Sep 14, 2021

perrotta reviewed Sep 14, 2021

View reviewed changes

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

cmsbuild merged commit 919a747 into cms-sw:master Sep 14, 2021

thomreis deleted the ecal-esconsumes-migration-recomet branch September 14, 2021 15:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ECAL esConsumes migration of remaining file in RecoMET #35179

ECAL esConsumes migration of remaining file in RecoMET #35179

thomreis commented Sep 7, 2021

cmsbuild commented Sep 7, 2021

cmsbuild commented Sep 7, 2021

slava77 commented Sep 7, 2021

cmsbuild commented Sep 7, 2021

jpata left a comment

jpata Sep 10, 2021

jpata Sep 10, 2021

thomreis Sep 13, 2021

cmsbuild commented Sep 13, 2021

cmsbuild commented Sep 13, 2021

jpata commented Sep 13, 2021

cmsbuild commented Sep 13, 2021

jpata commented Sep 14, 2021

cmsbuild commented Sep 14, 2021

perrotta Sep 14, 2021

thomreis Sep 14, 2021

perrotta commented Sep 14, 2021

	EcalDeadCellDeltaRFilter::~EcalDeadCellDeltaRFilter() {}
	EcalDeadCellDeltaRFilter::~EcalDeadCellDeltaRFilter() = default;

ECAL esConsumes migration of remaining file in RecoMET #35179

ECAL esConsumes migration of remaining file in RecoMET #35179

Conversation

thomreis commented Sep 7, 2021

PR description:

PR validation:

cmsbuild commented Sep 7, 2021

cmsbuild commented Sep 7, 2021

slava77 commented Sep 7, 2021

cmsbuild commented Sep 7, 2021

Comparison Summary

jpata left a comment

Choose a reason for hiding this comment

jpata Sep 10, 2021

Choose a reason for hiding this comment

jpata Sep 10, 2021

Choose a reason for hiding this comment

thomreis Sep 13, 2021

Choose a reason for hiding this comment

cmsbuild commented Sep 13, 2021

cmsbuild commented Sep 13, 2021

jpata commented Sep 13, 2021

cmsbuild commented Sep 13, 2021

Comparison Summary

jpata commented Sep 14, 2021

cmsbuild commented Sep 14, 2021

perrotta Sep 14, 2021

Choose a reason for hiding this comment

thomreis Sep 14, 2021

Choose a reason for hiding this comment

perrotta commented Sep 14, 2021