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

Changes in HGCal geometry vs flatfile comparison #36174

Merged
merged 7 commits into from
Dec 1, 2021

Conversation

yulunmiao
Copy link
Contributor

PR description:

Changes are made in Validation/HGCalValidation/plugins/HGCalWaferValidation.cc
to allow reading wafer information from new flat file format and compare to geometry.
and in Validation/HGCalValidation/test/python/testHGCalWaferValidation_cfg.py to allow take geometry D86 as argument and can specify certain flat file via the path to it.

More details can be found here https://indico.cern.ch/event/1095051/contributions/4610617/attachments/2344534/3997691/GeometryD86vsflatfile_yulunmiao.pdf

PR validation:

Checks using geometry D83 with old flat file format and geometry D86 with new flat file format is done, no bug is found in code

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @yulunmiao for CMSSW_12_1_X.

It involves the following packages:

  • Validation/HGCalValidation (dqm)

@emanueleusai, @ahmad3213, @cmsbuild, @jfernan2, @pmandrik, @pbo0, @rvenditti can you please review it and eventually sign? Thanks.
@vandreev11, @sethzenz, @bsunanda, @rovere, @lgray, @cseez, @apsallid, @pfs, @lecriste, @hatakeyamak, @ebrondol 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

@qliphy
Copy link
Contributor

qliphy commented Nov 19, 2021

@yulunmiao Please write a meaningful PR title. Moreover, make a forward PR in master (12_2_X)

@yulunmiao yulunmiao changed the base branch from CMSSW_12_1_X to master November 19, 2021 13:55
@cmsbuild cmsbuild modified the milestones: CMSSW_12_1_X, CMSSW_12_2_X Nov 19, 2021
@yulunmiao yulunmiao changed the title Yulun miao cmssw 12 1 0 pre4 Changes in HGCal geometry vs flatfile comparison Nov 19, 2021
@yulunmiao
Copy link
Contributor Author

Hi @qliphy , thank you for your comments, I have made the changes.

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36174/26754

  • This PR adds an extra 24KB to repository

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

@perrotta
Copy link
Contributor

Hi @qliphy , thank you for your comments, I have made the changes.

@yulunmiao Since this PR moved to master, before we can test it you have now to apply the code-format fixes, as explained in #36174 (comment)

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36174/26761

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

Pull request #36174 was updated. @emanueleusai, @ahmad3213, @cmsbuild, @jfernan2, @pmandrik, @pbo0, @rvenditti can you please check and sign again.

waferInfo.shapeCode = 0;
if (shapeStr == "a")
waferInfo.shapeCode = 4;
if (shapeStr == "am")
Copy link
Contributor

Choose a reason for hiding this comment

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

what prevents all these ifs to be else if?

Copy link
Contributor

Choose a reason for hiding this comment

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

THese should be replaced by else if too

waferShapeCode = 4;
if (waferShapeStr == "3")
waferShapeCode = 5;
if (waferShapeStr == "4")
Copy link
Contributor

@jfernan2 jfernan2 Nov 19, 2021

Choose a reason for hiding this comment

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

Same comment here: why not else if?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not migrated yet

if (waferShapeStr == "1")
waferShapeCode = 4;
if (waferShapeStr == "2")
waferShapeCode = 4;
Copy link
Contributor

Choose a reason for hiding this comment

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

Same assignment than 2 lines above?

Copy link
Contributor

Choose a reason for hiding this comment

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

Again

if (waferShapeStr == "3")
waferShapeCode = 5;
if (waferShapeStr == "4")
waferShapeCode = 5;
Copy link
Contributor

Choose a reason for hiding this comment

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

Same assignment than two lines above, these ifs could be merged, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Same

@pfs
Copy link
Contributor

pfs commented Nov 30, 2021

@yulunmiao @bsunanda @imranyusuff I have a request.

In the mapping of strings to wafer types, can you use the names in the enum .
I.e. instead of lines like

if (shapeStr == "a")
        waferInfo.shapeCode = 4;

do something like

if (shapeStr == "a")
        waferInfo.shapeCode = WaferPartialType::WaferHalf;

etc. which is easier for lay people to understand and not get confused by the fact that a different numbering scheme is used outside CMSSW (cf slide 3).

@yulunmiao
Copy link
Contributor Author

@pfs Thanks for you comment. I've made the changes

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36174/27041

  • This PR adds an extra 28KB to repository

  • Found files with invalid states:

    • Validation/HGCalValidation/HGCalWaferValidation.cc:

@cmsbuild
Copy link
Contributor

Pull request #36174 was updated. @emanueleusai, @ahmad3213, @cmsbuild, @jfernan2, @pmandrik, @pbo0, @rvenditti can you please check and sign again.

@bsunanda
Copy link
Contributor

bsunanda commented Dec 1, 2021

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 1, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-75d92e/20901/summary.html
COMMIT: 7c97a1c
CMSSW: CMSSW_12_2_X_2021-11-30-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36174/20901/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: 41
  • DQMHistoTests: Total histograms compared: 3041955
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3041927
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 40 files compared)
  • Checked 175 log files, 37 edm output root files, 41 DQM output files
  • TriggerResults: no differences found

@jfernan2
Copy link
Contributor

jfernan2 commented Dec 1, 2021

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 1, 2021

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 Dec 1, 2021

+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