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

HGC Realistic DIGIS - part I #38538

Merged
merged 4 commits into from Jul 4, 2022
Merged

Conversation

pfs
Copy link
Contributor

@pfs pfs commented Jun 28, 2022

PR description:

Context: The PR is part of a series to follow which aim to restructuring the DIGI step for HGCAL. Instead of patching the current code it is forseeen that the restructured DIGI step co-exists temporarily in CMSSW while being validated by the DPG.
Such staggered discussion was discussed after the presentation in the SIM meting of 3/12/2022 (https://indico.cern.ch/event/1101457/#67-hgcal-simulation-status) and more recently in the DPG (https://indico.cern.ch/event/1166838/#3-challenges-and-progress-towa)

Content: This PR introduces a realistic HGCROC channel data format according to the specs. It will be used as a baseline for the restructuring of the DIGI step for HGCAL, but it's not yet used elsewhere in CMSSW and as such it can't be tested with any workflow. Instead a unit test is provided with this DataFormat to make sure it performs as expected. The PR includes the move of the PHGCSimAccumulator.h class to this new directory as it will be re-used in the restructured DIGI step.

PR validation:

Using the unit test/HGCROCSampleTest.cpp provided with the PR

pfs added 2 commits May 31, 2022 22:19
…ne in the future)

Introduce realistic ROC channel dataframe format and associated tester
Moved SimHit accumulator utility to new directory
@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38538/30771

  • This PR adds an extra 28KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38538/30772

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @pfs (Pedro Silva) for master.

It involves the following packages:

  • DataFormats/HGCDigi (upgrade, simulation)
  • DataFormats/HGCalDigi (****)
  • SimCalorimetry/HGCalSimProducers (upgrade, simulation)

The following packages do not have a category, yet:

DataFormats/HGCalDigi
Please create a PR for https://github.com/cms-sw/cms-bot/blob/master/categories_map.py to assign category

@cmsbuild, @AdrianoDee, @srimanob, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@vandreev11, @sethzenz, @bsunanda, @rovere, @lgray, @cseez, @apsallid, @hatakeyamak, @trtomei, @beaucero 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

pfs added a commit to pfs/cms-bot that referenced this pull request Jun 28, 2022
This stems from cms-sw/cmssw#38538 where the context is given
@pfs
Copy link
Contributor Author

pfs commented Jun 28, 2022

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-86cd07/25867/summary.html
COMMIT: 0165e85
CMSSW: CMSSW_12_5_X_2022-06-28-1100/el8_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/38538/25867/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: 10 differences found in the comparisons
  • DQMHistoTests: Total files compared: 50
  • DQMHistoTests: Total histograms compared: 3654586
  • DQMHistoTests: Total failures: 19
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3654544
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.004 KiB( 49 files compared)
  • DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
  • Checked 208 log files, 45 edm output root files, 50 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor

civanch commented Jun 28, 2022

@pfs , should tests be *.cpp files or *.cc ?

@pfs
Copy link
Contributor Author

pfs commented Jun 28, 2022

@pfs , should tests be *.cpp files or *.cc ?

I don't know this one. I don't find references to .cpp in https://cms-sw.github.io/cms_coding_rules.html maybe that's a hint i should change to .cc?
In DataFormats/Common/test i see a mixture of both.

@civanch
Copy link
Contributor

civanch commented Jun 30, 2022

It is not a strong comment but better to use *.cc

@pfs
Copy link
Contributor Author

pfs commented Jul 1, 2022

Thanks, I have changed accordingly. If there are no other concerns and this, (and also #38548, and #38547) can be moved forward it would be much appreciated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-38538/30825

  • This PR adds an extra 16KB to repository

  • Found files with invalid states:

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2022

Pull request #38538 was updated. @cmsbuild, @AdrianoDee, @srimanob, @civanch, @mdhildreth can you please check and sign again.

@civanch
Copy link
Contributor

civanch commented Jul 1, 2022

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2022

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-86cd07/25932/summary.html
COMMIT: fdd4434
CMSSW: CMSSW_12_5_X_2022-06-30-2300/el8_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/38538/25932/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: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 50
  • DQMHistoTests: Total histograms compared: 3654771
  • DQMHistoTests: Total failures: 8
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3654741
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 49 files compared)
  • Checked 208 log files, 45 edm output root files, 50 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor

civanch commented Jul 1, 2022

+1

@@ -11,7 +11,7 @@

#include "SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerBase.h"
#include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
#include "DataFormats/HGCDigi/interface/PHGCSimAccumulator.h"
#include "DataFormats/HGCalDigi/interface/PHGCSimAccumulator.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please clarify what is the different of HGCDigi and HGCalDigi subpackages?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would like to dephase HGCDigi in the future and use a name which is more inline with the one used the SimProducers/HGCal{SimAlgos,SimProducers} i.e. starting with HGCal not HGC

The PHGCSimAccumulator.h class will still be used so I moved it's location, but the new DataFormat structure (HGCROCChannelDataFrame.h) is totally different

@srimanob
Copy link
Contributor

srimanob commented Jul 3, 2022

+Upgrade

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 4, 2022

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

perrotta commented Jul 4, 2022

As suggested by the static analyzer, in SimCalorimetry/HGCalSimProducers/plugins/HGCDigitizer.cc lines from 210 to 212 are useless: would you like to profit of this PR to clean them up?

@pfs
Copy link
Contributor Author

pfs commented Jul 4, 2022 via email

@perrotta
Copy link
Contributor

perrotta commented Jul 4, 2022

+1

@cmsbuild cmsbuild merged commit 65be446 into cms-sw:master Jul 4, 2022
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.

None yet

5 participants