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

[DD4hep] Remove unused PPS materials from Run 3 2021 (replaces #36163) #36307

Merged
merged 5 commits into from Dec 1, 2021

Conversation

cvuosalo
Copy link
Contributor

@cvuosalo cvuosalo commented Nov 30, 2021

The file Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml contains PPS materials that are not used anywhere, as far as I can tell. Some of the composite materials are defined in the wrong order, which could cause problems in the future. It is planned to require that all components of a composite material be defined before the material itself is defined, but we can't make that change as long as there are existing composite materials defined in the wrong order. The PPS materials in this file are the only materials in the Run 3 geometry that are defined in the wrong order. Since they are not even used, it is fairly simple to just remove them.

Another unused material PPS_Epoxy is deleted from the RP_Materials.xml file in this PR.

After this PR, a new big XML file will be created and uploaded to the DB.

This PR is replaces #36163.

A late addition to this PR is a correction to the ordering of the materials in the pixbarmaterial.xml files for the reduced material scenarios. The materials "Polyurethane" and "SupplyTubeEpoxy" were referenced before being defined. The fix is just to move the definitions prior to the references in the file. This fix was made earlier in the main pixbarmaterial.xml file but did not get into the reduced material versions of that file until now.

PR validation:

The DD4hep XML workflow, 11634.911, was run successfully with this PR.

No backport is needed.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36307/27044

  • This PR adds an extra 44KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • Configuration/Geometry (geometry, upgrade)
  • Geometry/CMSCommonData (geometry, upgrade)
  • Geometry/VeryForwardData (geometry)
  • Geometry/VeryForwardGeometry (geometry)

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @AdrianoDee, @srimanob can you please review it and eventually sign? Thanks.
@missirol, @fabferro, @jan-kaspar, @kpedro88, @Martin-Grunewald, @bsunanda, @vargasa, @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

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36307/27045

  • This PR adds an extra 136KB to repository

@cmsbuild
Copy link
Contributor

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

@cvuosalo
Copy link
Contributor Author

@cmsbuild please test

@cvuosalo
Copy link
Contributor Author

@diemort Please check this PR to see if I made the PPS changes correctly.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 1, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-41c0d6/20894/summary.html
COMMIT: b5d4f10
CMSSW: CMSSW_12_2_X_2021-11-30-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36307/20894/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: 3042214
  • DQMHistoTests: Total failures: 5
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3042186
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 40 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 175 log files, 37 edm output root files, 41 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor

civanch commented Dec 1, 2021

+1

@srimanob
Copy link
Contributor

srimanob commented Dec 1, 2021

+Upgrade

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

@diemort
Copy link
Contributor

diemort commented Dec 1, 2021

@cvuosalo these changes are fine with me.

@perrotta
Copy link
Contributor

perrotta commented Dec 1, 2021

@cvuosalo

After this PR, a new big XML file will be created and uploaded to the DB.

Let me check if I'm understanding the plan correctly:

  • You wait for this PR to be merged before creating the "big XML file", and uploading it in the DB
  • Therefore, we should expect another PR with an updated GT within a day or two after this one gets merged: after that we will cut pre3 and close development for the 12_2_X cycle.

Is that correct?

@cvuosalo
Copy link
Contributor Author

cvuosalo commented Dec 1, 2021

@perrotta The big XML files have already been created and uploaded to the DB. See here for details:

https://hypernews.cern.ch/HyperNews/CMS/get/calibrations/4552.html

AlCaDB will probably submit the updated GT today or tomorrow.

@perrotta
Copy link
Contributor

perrotta commented Dec 1, 2021

+1

@cmsbuild cmsbuild merged commit 8fa87a9 into cms-sw:master Dec 1, 2021
@tvami
Copy link
Contributor

tvami commented Dec 1, 2021

AlCa PR submitted in #36326

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

7 participants