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

Clean HGCAL digitization. Fix Premixing for HGCAL #32397

Merged
merged 10 commits into from
Dec 16, 2020

Conversation

rovere
Copy link
Contributor

@rovere rovere commented Dec 7, 2020

PR description:

Purely technical. Remove support for older HGCAL geometries that are no longer supported. Clean and simplify the code.

Coupled with the restructuring of the code there's also a fix from @adas1994 (af8481d) to the premixing workflow.

PR validation:

Usual Phase2 workflows, including HFNose ones. No regression expected, but for the premixing workflows that should be fixed by this PR.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 7, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-32397/20266

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 7, 2020

A new Pull Request was created by @rovere (Marco Rovere) for master.

It involves the following packages:

SimCalorimetry/HGCalSimProducers

@cmsbuild, @civanch, @kpedro88, @mdhildreth can you please review it and eventually sign? Thanks.
@vandreev11, @sethzenz, @makortel, @lgray, @cseez, @apsallid, @pfs, @hatakeyamak this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@rovere
Copy link
Contributor Author

rovere commented Dec 7, 2020

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 7, 2020

+1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-cms-sw/cmssw#32397/11364/summary.html
CMSSW: CMSSW_11_3_X_2020-12-05-1100
SCRAM_ARCH: slc7_amd64_gcc900

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 7, 2020

+1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-594c52/11384/summary.html
CMSSW: CMSSW_11_3_X_2020-12-05-1100
SCRAM_ARCH: slc7_amd64_gcc900

#include "HFNoseDigitizer.h"

EDM_REGISTER_PLUGINFACTORY(HGCDigitizerPluginFactory, "HGCDigitizerPluginFactory");
DEFINE_EDM_PLUGIN(HGCDigitizerPluginFactory, HGCEEDigitizer, "HGCEEDigitizer");
Copy link
Contributor

Choose a reason for hiding this comment

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

The use of a factory to handle the per-subdetector digitizers is very nice.

Since these classes are now moved into the plugins directory, the content of the header files could put into the .cc files, as we usually recommend for plugins. Then each plugin could be registered in its own .cc file.

One could also define a simpler macro:

#define DEFINE_HGC_DIGITIZER(name) DEFINE_EDM_PLUGIN(HGCDigitizerPluginFactory, name, #name);

@kpedro88
Copy link
Contributor

kpedro88 commented Dec 7, 2020

@rovere thanks for this PR. In addition to the specific review comment, a few general questions/comments:

  1. @bsunanda will this cleanup impact test beam analysis at all? (I think TB analysis that uses digitization can still proceed with the old CMSSW releases...)
  2. There are a few other open issues relevant to digitization cleanup: Clean up HGCFEElectronics #25799, Clean up HGCal subdetector terminology and usage #26225 (digitizers are still called HGCHEfront and HGCHEback, while they're really silicon and scintillator). Will these be addressed in future PRs, or does it make sense to address them here?

@bsunanda
Copy link
Contributor

bsunanda commented Dec 7, 2020

Test beam analysis does not use the digitization code in current version of CMSSW. So this cleanup makes sense. I would like to see what they use in their analysis and make it a part of CMSSW for future usage.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 7, 2020

Comparison results are now available
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-594c52/11384/summary.html
CMSSW: CMSSW_11_3_X_2020-12-05-1100
SCRAM_ARCH: slc7_amd64_gcc900

Comparison Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 3141 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2747014
  • DQMHistoTests: Total failures: 28341
  • DQMHistoTests: Total nulls: 13
  • DQMHistoTests: Total successes: 2718638
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
  • Checked 153 log files, 37 edm output root files, 36 DQM output files

@kpedro88
Copy link
Contributor

kpedro88 commented Dec 7, 2020

There appear to be changes in the premixing workflow, e.g.:
all_OldVSNew_TTbar14TeV2026D49PUwPRMXwf23434p999c_HGCRecHitsSorted_HGCalRecHit_HGCEERecHits_RECO_obj_obj_energy

@adas1994 did this PR accidentally solve #32050?

@adas1994
Copy link
Contributor

adas1994 commented Dec 7, 2020

I had sent Marco the code that would fix the RecHits energy issue raised in #32050. It was a simple one-liner bug that someone else had introduced. The bug is present in as early version as CMSSW_11_1_0_pre8. Thanks for the update @kpedro88 .

@kpedro88
Copy link
Contributor

kpedro88 commented Dec 7, 2020

Aha, I hadn't looked at the commit messages carefully: the fix is deliberately included in af8481d. Thanks @adas1994 ! @rovere can you update the PR description to clarify this?

@rovere rovere changed the title Clean HGCAL digitization Clean HGCAL digitization. Fix Premixing for HGCAL Dec 8, 2020
@kpedro88
Copy link
Contributor

@rovere what is the status of this PR?

@rovere
Copy link
Contributor Author

rovere commented Dec 15, 2020

@cmsbuild please test

@rovere
Copy link
Contributor Author

rovere commented Dec 15, 2020

@rovere thanks for this PR. In addition to the specific review comment, a few general questions/comments:

  1. @bsunanda will this cleanup impact test beam analysis at all? (I think TB analysis that uses digitization can still proceed with the old CMSSW releases...)
  2. There are a few other open issues relevant to digitization cleanup: Clean up HGCFEElectronics #25799, Clean up HGCal subdetector terminology and usage #26225 (digitizers are still called HGCHEfront and HGCHEback, while they're really silicon and scintillator). Will these be addressed in future PRs, or does it make sense to address them here?

Changing the names of the digitizer plugins would be possible but it would create a mismatch with the naming convention used for digi and rechits. Possibly, a separate PR could address all those kind of changes in one go later on.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-32397/20417

  • This PR adds an extra 84KB to repository

  • Found files with invalid states:

    • SimCalorimetry/HGCalSimProducers/plugins/HFNoseDigitizer.h:
    • SimCalorimetry/HGCalSimProducers/plugins/HGCHEbackDigitizer.h:
    • SimCalorimetry/HGCalSimProducers/plugins/HGCHEfrontDigitizer.h:
    • SimCalorimetry/HGCalSimProducers/plugins/HGCEEDigitizer.h:
  • There are other open Pull requests which might conflict with changes you have proposed:

@cmsbuild
Copy link
Contributor

Pull request #32397 was updated. @civanch, @kpedro88, @mdhildreth can you please check and sign again.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-594c52/11694/summary.html
CMSSW: CMSSW_11_3_X_2020-12-15-1100/slc7_amd64_gcc900

Comparison Summary

Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 3154 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2747284
  • DQMHistoTests: Total failures: 30863
  • DQMHistoTests: Total nulls: 13
  • DQMHistoTests: Total successes: 2716386
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
  • Checked 153 log files, 37 edm output root files, 36 DQM output files

@kpedro88
Copy link
Contributor

+upgrade

@civanch
Copy link
Contributor

civanch commented Dec 16, 2020

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

@silviodonato
Copy link
Contributor

+1

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.

7 participants