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

Fixed materials discrepancies between DDD and DD4hep: remove duplicate definitions of Phase 1 materials (FPix_CFSkin and cie) #33257

Merged
merged 2 commits into from
Mar 26, 2021

Conversation

ghugo83
Copy link
Contributor

@ghugo83 ghugo83 commented Mar 24, 2021

A discrepancy in the DDD <-> DD4hep materials comparison was stemming from duplicate definitions of FPix_CFSkin (and FPix_CFSkin_OuterOuterRing, etc...).

With DDD the first definition was considered, in DD4hep the second.
Chose the composition containing H and O in addition to C (a carbon fiber with C only does not seem realistic to manufacture anyway).

  • DDD:
Material: FPix_CFSkin_OuterOuterRing  made of C only 
 Range cuts        :  gamma  1 mm     e-  1 mm     e+  1 mm  proton 1 mm 
 Energy thresholds :  gamma  3.34104 keV    e-  570.85 keV    e+  555.71 keV proton 100 keV
  • DD4hep:
Material: pixfwdMaterials:FPix_CFSkin_OuterOuterRing made of C, H, O
Range cuts        :  gamma  1 mm     e-  1 mm     e+  1 mm  proton 1 mm 
Energy thresholds :  gamma  3.50195 keV    e-  602.38 keV    e+  578.575 keV proton 100 keV

Not sure how to proceed in terms of 2021 scenarios though, as this is a small fix. Created the v3 version.

…). Same name but different composition in second definition. This resulted in discrepancies in the DDD <-> DD4hep materials comparison: in DDD the first definition was taken, in DD4hep the second. Chose the composition contaning H and O in addition to C (a carbon fiber with C only does not seem realistic).
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33257/21735

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @ghugo83 for master.

It involves the following packages:

Geometry/TrackerCommonData

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild can you please review it and eventually sign? Thanks.
@vargasa, @makortel, @JanFSchulte, @VinInn, @ebrondol, @mtosi, @fabiocos, @venturia 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

@civanch
Copy link
Contributor

civanch commented Mar 24, 2021

please test

@civanch
Copy link
Contributor

civanch commented Mar 24, 2021

@ghugo83 , I think, that we understand this probably correct would be using compound material both in DDD and DD4Hep. Because Run-3 geometry is not yet frozen we can do this. Also you are right making new version of the material file.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d0fc19/13733/summary.html
COMMIT: 75e1341
CMSSW: CMSSW_11_3_X_2021-03-23-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/33257/13733/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: 3 differences found in the comparisons
  • DQMHistoTests: Total files compared: 37
  • DQMHistoTests: Total histograms compared: 2639935
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2639906
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.004 KiB( 36 files compared)
  • DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
  • Checked 155 log files, 37 edm output root files, 37 DQM output files
  • TriggerResults: no differences found

@ghugo83
Copy link
Contributor Author

ghugo83 commented Mar 24, 2021

Because Run-3 geometry is not yet frozen we can do this.

How do we proceed to include this file, is it fine to modify T3?

@ghugo83
Copy link
Contributor Author

ghugo83 commented Mar 24, 2021

Alright, just added it to T3.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33257/21740

  • This PR adds an extra 32KB to repository

@cmsbuild
Copy link
Contributor

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

@cvuosalo
Copy link
Contributor

@cmsbuild please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d0fc19/13749/summary.html
COMMIT: e55cc02
CMSSW: CMSSW_11_3_X_2021-03-23-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/33257/13749/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: 3 differences found in the comparisons
  • DQMHistoTests: Total files compared: 37
  • DQMHistoTests: Total histograms compared: 2639935
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2639906
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.004 KiB( 36 files compared)
  • DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
  • Checked 155 log files, 37 edm output root files, 37 DQM output files
  • TriggerResults: no differences found

@cvuosalo
Copy link
Contributor

+1

@civanch
Copy link
Contributor

civanch commented Mar 25, 2021

@srimanob, please, have a look

@srimanob
Copy link
Contributor

+Upgrade

@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)

@qliphy
Copy link
Contributor

qliphy commented Mar 26, 2021

+1

@cmsbuild cmsbuild merged commit c497e4a into cms-sw:master Mar 26, 2021
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.

6 participants