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

Run3-hcx303 Add a few cfi's to help processing with DDD or DD4Hep #34569

Merged
merged 2 commits into from Jul 25, 2021

Conversation

bsunanda
Copy link
Contributor

PR description:

Add a few cfi's to help processing with DDD or DD4Hep

PR validation:

Use the standard workflows

if this PR is a backport please specify the original PR and why you need to backport that PR:

Nothing special

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34569/24112

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @bsunanda (Sunanda Banerjee) for master.

It involves the following packages:

  • Configuration/Geometry (geometry, upgrade)
  • Geometry/HcalCommonData (geometry)

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @kpedro88, @cmsbuild, @srimanob, @mdhildreth can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @fabiocos, @slomeo, @vargasa this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

from Geometry.HcalCommonData.caloSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalhcalDBConstants_cff import *
Copy link
Contributor

Choose a reason for hiding this comment

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

Does hcalhcalDBConstants_cff exist? The hcalhcal part seems odd.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Corrected

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34569/24113

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

Pull request #34569 was updated. @civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @kpedro88, @cmsbuild, @srimanob, @mdhildreth can you please check and sign again.

from Geometry.HcalCommonData.hcalSimulationConstants_cfi import *
from Geometry.HcalCommonData.caloSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the order of the cfi's important?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No it is not.

Copy link
Contributor

Choose a reason for hiding this comment

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

Then, unless my eyes are failing me, there is no actual change to this file, and it should be removed from the PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

What is the conclusion on this question? Thanks.

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 have the ordering to be similar in all cff files. That is why it is changed here.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK from my side. This is up to @cvuosalo.

Thanks.

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0c2a2f/17034/summary.html
COMMIT: 4a7b2b5
CMSSW: CMSSW_12_0_X_2021-07-20-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34569/17034/install.sh to create a dev area with all the needed externals and cmssw changes.

Unit Tests

I found errors in the following unit tests:

---> test test2021Geometry had ERRORS
---> test test2026Geometry had ERRORS

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: 2996268
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2996245
  • 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

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0c2a2f/17147/summary.html
COMMIT: 4a7b2b5
CMSSW: CMSSW_12_0_X_2021-07-22-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34569/17147/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: 2998564
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2998541
  • 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

@perrotta
Copy link
Contributor

please test
(Since CMSSW_12_0_X_2021-07-22-1700 the issue with the missing file should have been solved)

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0c2a2f/17165/summary.html
COMMIT: 4a7b2b5
CMSSW: CMSSW_12_0_X_2021-07-23-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34569/17165/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: 39
  • DQMHistoTests: Total histograms compared: 2998564
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2998535
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 38 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor

civanch commented Jul 25, 2021

@cvuosalo , @srimanob, it seems that this PR is ready?

@srimanob
Copy link
Contributor

@civanch
I see an unanswered question in the PR. Maybe we wait a bit on that for clarification?

@bsunanda
Copy link
Contributor Author

I don't see why it is not approved. There are serious bug fixes in a few cff's.

@srimanob
Copy link
Contributor

Hi @bsunanda

What is the bug that you are talking about? Can we not spot it on report (maybe I miss the bug report)?
Sorry, I don't see it in the PR description. Do you mean we have it for both DDD and DD4hep?

@srimanob
Copy link
Contributor

+Upgrade

@cvuosalo
Copy link
Contributor

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

@perrotta
Copy link
Contributor

+1
(Admittently @bsunanda the title and the description of this PR are not really explaining what is done here, which basically consists in setting fromDD4Hep = True in all cases in which hcalSimulationParameters are imported. If you agree, I'd update at least the description of the PR, for better bookeping)

@cmsbuild cmsbuild merged commit 0ce31f0 into cms-sw:master Jul 25, 2021
@bsunanda
Copy link
Contributor Author

@cvuosalo @perrotta @srimanob The errors were in the 2 cff's in Configuration/Geometry/python file. They were working for DDD but not for DD4Hep

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

6 participants