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

Migrate some modules in SimPPS to esConsumes #34989

Merged
merged 2 commits into from
Aug 31, 2021

Conversation

makortel
Copy link
Contributor

PR description:

Part of #31061.

PR validation:

Code compiles.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34989/24834

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • SimPPS/PPSSimTrackProducer (simulation)
  • SimPPS/RPDigiProducer (simulation)
  • SimTransport/PPSProtonTransport (simulation)

@cmsbuild, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@makortel
Copy link
Contributor Author

@cmsbuild, please test

@@ -53,7 +52,7 @@ namespace CLHEP {
class RPDigiProducer : public edm::EDProducer {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This module needs to be migrated to some thread-efficient base class.

Is this module run in runTheMatrix? It is included in a list of modules being run that I extracted in last spring, but I don't see it being flagged as one preventing efficient use of concurrent lumis (that legacy EDModules imply) in #25090.

@makortel
Copy link
Contributor Author

And now I noticed the migration of RPDigiProducer is incomplete (the report in IBs missed this call). It uses RPDetDigitizer in

if (theAlgoMap.find(it->first) == theAlgoMap.end()) {
theAlgoMap[it->first] = std::make_unique<RPDetDigitizer>(conf_, *rndEngine_, it->first, iSetup);
}

that uses RPDisplacementGenerator in
theRPDisplacementGenerator = std::make_unique<RPDisplacementGenerator>(params, det_id_, iSetup);

that gets data from EventSetup, .e.g
ESHandle<CTPPSRPAlignmentCorrectionsData> alignments;
if (auto rec = iSetup.tryToGet<VeryForwardMisalignedGeometryRecord>()) {
iSetup.get<VeryForwardMisalignedGeometryRecord>().get(alignments);
}

)

This needs to be changed to something that allows declaring the consumed EventSetup products to be declared in the RPDetDigitizer constructor. It is far from clear to me what would be the best way to do that (e.g. is the map from RPDetId to RPDetDigitizer really necessary).

@makortel
Copy link
Contributor Author

FYI @cms-sw/ctpps-dpg-l2 (since these packages do not appear to have any watchers), see my comments above.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b1da21/17983/summary.html
COMMIT: 9b19580
CMSSW: CMSSW_12_1_X_2021-08-23-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34989/17983/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 1 inherits from legacy modules warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b1da21/17983/llvm-analysis/legacy-mod-sa.txt for details.

Comparison Summary

Summary:

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

@fabferro
Copy link
Contributor

@mundim : can you check? Help in the RP digitizers is needed too. Thanks!

@clemencia
Copy link
Contributor

Hello, @mundim asked me to take care of this so he can focus on the fullsim

@makortel
Copy link
Contributor Author

@cms-sw/simulation-l2 Could you review and sign this PR even if it not complete for esConsumes in RPDigiProducer? The necessary work could come in later PR(s) (that I suppose would be easier to deal with given that @clemencia would work on that)

@civanch
Copy link
Contributor

civanch commented Aug 30, 2021

@makortel , @fabferro , @clemencia , I would propose that tomorrow morning I will sign this PR and make issue for PPS development. If you disagree, please, let me know.

@civanch
Copy link
Contributor

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

@perrotta
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 28c1c05 into cms-sw:master Aug 31, 2021
@makortel makortel deleted the esconsumesSimPPS branch August 31, 2021 21:35
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.

6 participants