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

Jump to bottom

ECAL esConsumes migration of remaining file in RecoMET #35179

Merged
merged 2 commits into from Sep 14, 2021
Merged

ECAL esConsumes migration of remaining file in RecoMET #35179

merged 2 commits into from Sep 14, 2021

Conversation

thomreis
Copy link
Contributor

@thomreis thomreis commented Sep 7, 2021

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 cmsbuild added this to the CMSSW_12_1_X milestone Sep 7, 2021
@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 7, 2021

+code-checks

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

  • This PR adds an extra 16KB to repository

@thomreis thomreis changed the title esConsumes migration EcalDeadCellDeltaRFilter. ECAL esConsumes migration of remaining file in RecoMET Sep 7, 2021
@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 7, 2021

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
Copy link
Contributor

slava77 commented Sep 7, 2021

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 7, 2021

+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
jpata reviewed Sep 10, 2021
View reviewed changes
Copy link
Contributor

@jpata jpata left a comment

Choose a reason for hiding this comment

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

Thanks for this. Some minor comments inline.

RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc Outdated
delete profFile;
}
}
EcalDeadCellDeltaRFilter::~EcalDeadCellDeltaRFilter() {}
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 should be omitted by using the default destructor

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

RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc
#include "TH1.h"

class EcalDeadCellDeltaRFilter : public edm::EDFilter {
class EcalDeadCellDeltaRFilter : public edm::stream::EDFilter<> {
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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
Copy link
Contributor

+code-checks

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

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

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

@jpata
Copy link
Contributor

jpata commented Sep 13, 2021

@cmsbuild please test

@cmsbuild
Copy link
Contributor

+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
Copy link
Contributor

jpata commented Sep 14, 2021

+reconstruction

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

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

perrotta
perrotta reviewed Sep 14, 2021
View reviewed changes
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_);
Copy link
Contributor

Choose a reason for hiding this comment

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

Why &iSetup?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

@perrotta
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 919a747 into cms-sw:master Sep 14, 2021
@thomreis thomreis deleted the ecal-esconsumes-migration-recomet branch September 14, 2021 15:29
This was referenced Sep 15, 2021
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpata jpata jpata left review comments

@perrotta perrotta perrotta left review comments

Assignees
No one assigned
Labels
code-checks-approved fully-signed orp-approved reconstruction-approved tests-approved
Projects
None yet
Milestone
CMSSW_12_1_X
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@thomreis @cmsbuild @slava77 @jpata @perrotta