Cleaning up obsolete Phase-2 geometries #33293

srimanob · 2021-03-30T06:08:56Z

PR description:

This PR is to clean up obsolete Phase-2 geometries as mentioned in #33064 (comment)

PR validation:

Check workflows using runTheMatrix.py --what upgrade -n

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

Not a backport, and a backport is not needed.

cmsbuild · 2021-03-30T06:15:34Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33293/21815

This PR adds an extra 40KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File Configuration/Geometry/python/dict2026Geometry.py modified in PR(s): update the tracking material for Phase2 geometry D49 #30126
- File Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py modified in PR(s): Squash all Patatrack developments on top of CMSSW_11_3_0_pre5 #27983, Patatrack integration - Pixel workflows (12/N) #31854
- File Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py modified in PR(s): update the tracking material for Phase2 geometry D49 #30126

cmsbuild · 2021-03-30T06:15:58Z

A new Pull Request was created by @srimanob (Phat Srimanobhas) for master.

It involves the following packages:

Configuration/Geometry
Configuration/PyReleaseValidation
Configuration/StandardSequences
Geometry/CMSCommonData

@civanch, @Dr15Jones, @jordan-martins, @chayanit, @cvuosalo, @wajidalikhan, @ianna, @mdhildreth, @cmsbuild, @makortel, @franzoni, @silviodonato, @kpedro88, @srimanob, @qliphy, @fabiocos, @davidlange6 can you please review it and eventually sign? Thanks.
@fabiocos, @vargasa, @makortel, @felicepantaleo, @GiacomoSguazzoni, @rovere, @VinInn, @Martin-Grunewald, @lecriste, @mtosi, @dgulhan, @slomeo 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

srimanob · 2021-03-30T06:16:54Z

Please test

rovere · 2021-03-30T07:25:10Z

FYI
@bsunanda

Configuration/Geometry/README.md

cmsbuild · 2021-03-30T14:03:48Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-cc0472/13841/summary.html
COMMIT: aeee802
CMSSW: CMSSW_11_3_X_2021-03-29-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33293/13841/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: 8 differences found in the comparisons
DQMHistoTests: Total files compared: 37
DQMHistoTests: Total histograms compared: 2640035
DQMHistoTests: Total failures: 13
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2640000
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 36 files compared)
Checked 155 log files, 37 edm output root files, 37 DQM output files
TriggerResults: no differences found

cvuosalo · 2021-03-30T16:42:19Z

+1

Configuration/Geometry/README.md

cmsbuild · 2021-03-31T06:52:10Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33293/21834

This PR adds an extra 40KB to repository
Found files with invalid states:
- Configuration/Geometry/python/GeometryExtended2026D68Reco_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryDD4hepExtended2026D70Reco_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryExtended2026D79_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryDD4hepExtended2026D68_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryDD4hepExtended2026D70_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Geometry/CMSCommonData/python/cmsExtendedGeometry2026D70XML_cfi.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D68.xml:
  - Deleted: aeee802
  - Added: 9a01c97
- Geometry/CMSCommonData/python/cmsExtendedGeometry2026D79XML_cfi.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryExtended2026D70Reco_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryExtended2026D68_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryDD4hepExtended2026D79Reco_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Geometry/CMSCommonData/python/cmsExtendedGeometry2026D68XML_cfi.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryDD4hepExtended2026D68Reco_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D79.xml:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryDD4hepExtended2026D79_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryExtended2026D70_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
- Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D70.xml:
  - Deleted: aeee802
  - Added: 9a01c97
- Configuration/Geometry/python/GeometryExtended2026D79Reco_cff.py:
  - Deleted: aeee802
  - Added: 9a01c97
There are other open Pull requests which might conflict with changes you have proposed:
- File Configuration/Geometry/python/dict2026Geometry.py modified in PR(s): update the tracking material for Phase2 geometry D49 #30126
- File Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py modified in PR(s): Squash all Patatrack developments on top of CMSSW_11_3_0_pre5 #27983, Patatrack integration - Pixel workflows (12/N) #31854
- File Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py modified in PR(s): update the tracking material for Phase2 geometry D49 #30126

cmsbuild · 2021-03-31T06:52:30Z

Pull request #33293 was updated. @civanch, @Dr15Jones, @jordan-martins, @chayanit, @cvuosalo, @wajidalikhan, @ianna, @mdhildreth, @cmsbuild, @makortel, @franzoni, @silviodonato, @kpedro88, @srimanob, @qliphy, @fabiocos, @davidlange6 can you please check and sign again.

srimanob · 2021-03-31T06:58:03Z

Please test

cmsbuild · 2021-03-31T09:35:35Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-cc0472/13867/summary.html
COMMIT: 9a01c97
CMSSW: CMSSW_11_3_X_2021-03-30-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33293/13867/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: 8 differences found in the comparisons
DQMHistoTests: Total files compared: 37
DQMHistoTests: Total histograms compared: 2640841
DQMHistoTests: Total failures: 12
DQMHistoTests: Total nulls: 1
DQMHistoTests: Total successes: 2640806
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 · 2021-03-31T17:28:39Z

+1

srimanob · 2021-04-01T04:29:17Z

+Upgrade

This PR is to delete obsolete geometries only. Rechecking workflow numbers, they are as expected:

runTheMatrix.py --what upgrade -n | grep 31434.0
31434.0 2026D68+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal 
runTheMatrix.py --what upgrade -n | grep 32234.0
32234.0 2026D70+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal 
runTheMatrix.py --what upgrade -n | grep 35834.0
35834.0 2026D79+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal

chayanit · 2021-04-01T06:22:59Z

+1

silviodonato · 2021-04-01T08:36:40Z

+1

cmsbuild · 2021-04-01T08:37:04Z

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 be automatically merged.

Norraphat added 2 commits March 30, 2021 07:14

Clean up obsolete geometry

5d8b4d9

remove unused files

aeee802

cmsbuild added this to the CMSSW_11_3_X milestone Mar 30, 2021

cmsbuild added code-checks-pending geometry-pending operations-pending orp-pending pdmv-pending pending-signatures tests-pending upgrade-pending labels Mar 30, 2021

cmsbuild added code-checks-approved and removed code-checks-pending labels Mar 30, 2021

cmsbuild added tests-started and removed tests-pending labels Mar 30, 2021

mariadalfonso reviewed Mar 30, 2021

View reviewed changes

Configuration/Geometry/README.md Show resolved Hide resolved

cmsbuild added tests-approved and removed tests-started labels Mar 30, 2021

cmsbuild added geometry-approved and removed geometry-pending labels Mar 30, 2021

mmusich reviewed Mar 30, 2021

View reviewed changes

Configuration/Geometry/README.md Show resolved Hide resolved

Add back D68, D70, D79

9a01c97

cmsbuild removed code-checks-approved geometry-approved labels Mar 31, 2021

cmsbuild added the tests-pending label Mar 31, 2021

cmsbuild added code-checks-approved and removed code-checks-pending labels Mar 31, 2021

cmsbuild added tests-started and removed tests-pending labels Mar 31, 2021

cmsbuild added tests-approved and removed tests-started labels Mar 31, 2021

cmsbuild added geometry-approved and removed geometry-pending labels Mar 31, 2021

cmsbuild added upgrade-approved and removed upgrade-pending labels Apr 1, 2021

cmsbuild added pdmv-approved and removed pdmv-pending labels Apr 1, 2021

cmsbuild added fully-signed and removed operations-pending orp-pending pending-signatures labels Apr 1, 2021

cmsbuild added operations-approved orp-approved labels Apr 1, 2021

cmsbuild merged commit a6cbfa3 into cms-sw:master Apr 1, 2021

silviodonato mentioned this pull request Apr 2, 2021

test materialBudgetHGCalPlots had ERRORS #33325

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleaning up obsolete Phase-2 geometries #33293

Cleaning up obsolete Phase-2 geometries #33293

srimanob commented Mar 30, 2021 •

edited

cmsbuild commented Mar 30, 2021

cmsbuild commented Mar 30, 2021

srimanob commented Mar 30, 2021

rovere commented Mar 30, 2021

cmsbuild commented Mar 30, 2021

cvuosalo commented Mar 30, 2021

cmsbuild commented Mar 31, 2021

cmsbuild commented Mar 31, 2021

srimanob commented Mar 31, 2021

cmsbuild commented Mar 31, 2021

cvuosalo commented Mar 31, 2021

srimanob commented Apr 1, 2021 •

edited

chayanit commented Apr 1, 2021

silviodonato commented Apr 1, 2021

cmsbuild commented Apr 1, 2021

Cleaning up obsolete Phase-2 geometries #33293

Cleaning up obsolete Phase-2 geometries #33293

Conversation

srimanob commented Mar 30, 2021 • edited

PR description:

PR validation:

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

cmsbuild commented Mar 30, 2021

cmsbuild commented Mar 30, 2021

srimanob commented Mar 30, 2021

rovere commented Mar 30, 2021

cmsbuild commented Mar 30, 2021

Comparison Summary

cvuosalo commented Mar 30, 2021

cmsbuild commented Mar 31, 2021

cmsbuild commented Mar 31, 2021

srimanob commented Mar 31, 2021

cmsbuild commented Mar 31, 2021

Comparison Summary

cvuosalo commented Mar 31, 2021

srimanob commented Apr 1, 2021 • edited

chayanit commented Apr 1, 2021

silviodonato commented Apr 1, 2021

cmsbuild commented Apr 1, 2021

srimanob commented Mar 30, 2021 •

edited

srimanob commented Apr 1, 2021 •

edited