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

[DDD] Fix building of DDD GEM reco geometry DB payload #36869

Merged
merged 1 commit into from Feb 3, 2022

Conversation

cvuosalo
Copy link
Contributor

@cvuosalo cvuosalo commented Feb 2, 2022

PR #36835 fixed the building of the GEM reco geometry for DD4hep, but it caused a problem for building the DDD GEM reco geometry DB payload. Technically, an unreliable DDFilteredView copy constructor had been used, which caused the original DDFilteredView to be changed when the copy was altered. The solution is to create a separate, identical DDFilteredView that can be iterated through without altering the original.

Note that this PR only affects the manual process of creating the DDD GEM reco geometry DB payload, which is done by an expert. This code is never used in any workflow.

PR validation:

A correct DDD GEM reco geometry DB payload was created successfully with this PR, whereas previously the creation program crashed.

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

For completeness and consistency, this PR could be backported to 12_2, but it is not strictly necessary. There shouldn't be a need to create geometry DB payloads in 12_2, since the latest 12_3 tags are the ones that should be used with 12_2_1.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36869/28128

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2022

A new Pull Request was created by @cvuosalo (Carl Vuosalo) for master.

It involves the following packages:

  • Geometry/GEMGeometryBuilder (geometry, upgrade)

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @AdrianoDee, @srimanob can you please review it and eventually sign? Thanks.
@giovanni-mocellin, @watson-ij, @jshlee, @bsunanda, @fabiocos, @slomeo 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

@cvuosalo
Copy link
Contributor Author

cvuosalo commented Feb 2, 2022

type bug-fix

@cvuosalo
Copy link
Contributor Author

cvuosalo commented Feb 2, 2022

@cmsbuild please test

watson-ij added a commit to watson-ij/cmssw that referenced this pull request Feb 3, 2022
watson-ij added a commit to watson-ij/cmssw that referenced this pull request Feb 3, 2022
format

fix warning

Process demonstrator geometry also for database geometry

Remove workaround for demonstrator geometry in conddb builder

Update Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc

Stop iterating once we know we are not in the demonstrator geometry

Co-authored-by: Carl Vuosalo <cvuosalo@users.noreply.github.com>

Add Carl's suggestions

Revert DD building changes, should be covered by cms-sw#36869
@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2022

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a8804a/22175/summary.html
COMMIT: 9a59f4b
CMSSW: CMSSW_12_3_X_2022-02-02-1100/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36869/22175/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-a8804a/39434.0_TTbar_14TeV+2026D88+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-a8804a/39496.0_CloseByPGun_CE_E_Front_120um+2026D88+CE_E_Front_120um_GenSimHLBeamSpotHGCALCloseBy+DigiTrigger+RecoGlobal+HARVESTGlobal
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-a8804a/39500.0_CloseByPGun_CE_H_Coarse_Scint+2026D88+CE_H_Coarse_Scint_GenSimHLBeamSpotHGCALCloseBy+DigiTrigger+RecoGlobal+HARVESTGlobal

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 5 differences found in the comparisons
  • DQMHistoTests: Total files compared: 46
  • DQMHistoTests: Total histograms compared: 3765022
  • DQMHistoTests: Total failures: 14
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3764986
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 45 files compared)
  • Checked 193 log files, 42 edm output root files, 46 DQM output files
  • TriggerResults: no differences found

@cvuosalo
Copy link
Contributor Author

cvuosalo commented Feb 3, 2022

+1

@perrotta
Copy link
Contributor

perrotta commented Feb 3, 2022

@cvuosalo do you understand the supposed (?) differences in the MTD vertices simPVZ in the DQM comparisons?

@cvuosalo
Copy link
Contributor Author

cvuosalo commented Feb 3, 2022

@perrotta This files in this PR are not used by any workflow, so this PR cannot have any effect on the DQM comparisons. Any differences are unrelated to this PR.
Just for my information, could you please give a link to the DQM differences you mention?

@perrotta
Copy link
Contributor

perrotta commented Feb 3, 2022

@perrotta This files in this PR are not used by any workflow, so this PR cannot have any effect on the DQM comparisons. Any differences are unrelated to this PR. Just for my information, could you please give a link to the DQM differences you mention?

The ones visible in the automatic test outputs:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/baseLineComparisons/CMSSW_12_3_X_2022-02-02-1100+a8804a/48189/validateJR.html

I also tend to believe it is a false positive, histograms look empty anyhow

@srimanob
Copy link
Contributor

srimanob commented Feb 3, 2022

@perrotta @cvuosalo
Why is MTD a player here? We don't touch Phase-2 geometry with updated GEM, right?

doSuper = fv.firstChild();
if (doSuper) {
GEMDetId detIdCh =
GEMDetId(gemNumbering.baseNumberToUnitNumber(muonDDDNumbering.geoHistoryToBaseNumber(fv.geoHistory())));
Copy link
Contributor

@srimanob srimanob Feb 3, 2022

Choose a reason for hiding this comment

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

It's a minor comment on the code style. On new GE2/1, we define rawidCh first, then use it once. In this part, we don't define new parameter, we directly get detIdCh.

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 think I prefer the two-step process of getting the rawidCh first and then constructing the GEMDetId, but either style is OK.
This piece of code is for building the GEM reco geometry DB payload with DDD. I hope that we never have to do this again. Eventually, all DDD-related code is slated for deletion.

@srimanob
Copy link
Contributor

srimanob commented Feb 3, 2022

+Upgrade

This PR is to fix the building of DDD GEM RECO geometry to DB. It will not affect physics, so no change is expected. PR test runs fine. My comment is considered to be minor in the code style.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 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)

@cvuosalo
Copy link
Contributor Author

cvuosalo commented Feb 3, 2022

@srimanob This PR changes the tool I run manually to create the GEM reco geometry DB payload. The code in this PR is never used anywhere else. It has nothing to do with Phase 2 or MTD. The PR tests are actually irrelevant to this PR because it doesn't affect any workflows. Any differences in the PR tests come from some fluctuation in the test themselves or some issue in the MTD code unrelated to this PR.

@perrotta
Copy link
Contributor

perrotta commented Feb 3, 2022

+1

@cmsbuild cmsbuild merged commit e5a269d into cms-sw:master Feb 3, 2022
cmsbuild added a commit that referenced this pull request Feb 7, 2022
[DDD] Fix building of DDD GEM reco geometry DB payload, backport of #36869
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

4 participants