Add D97 Phase-2 geometry #39841

srimanob · 2022-10-25T13:08:50Z

PR description:

As requested in #39571 (comment), the geometry with T25 is brought back based on D88.

PR validation:

Tested with 24434.0 (2026D97+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal)

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

No need of backport

FYI @mmusich @emiglior

cmsbuild · 2022-10-25T13:28:54Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-39841/32723

This PR adds an extra 52KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py modified in PR(s): Add tracking only PU workflows #39722, Add run3 tracking low pu era #33532

cmsbuild · 2022-10-25T13:29:44Z

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

It involves the following packages:

Configuration/Geometry (geometry, upgrade)
Configuration/PyReleaseValidation (pdmv, upgrade)
Configuration/StandardSequences (operations)
Geometry/CMSCommonData (geometry, upgrade)

@perrotta, @rappoccio, @Dr15Jones, @bsunanda, @makortel, @bbilin, @ianna, @mdhildreth, @cmsbuild, @AdrianoDee, @srimanob, @kskovpen, @civanch, @sunilUIET, @fabiocos, @davidlange6 can you please review it and eventually sign? Thanks.
@beaucero, @fabiocos, @VourMa, @vargasa, @makortel, @felicepantaleo, @slomeo, @GiacomoSguazzoni, @JanFSchulte, @rovere, @VinInn, @Martin-Grunewald, @bsunanda, @kpedro88, @lecriste, @trtomei, @mmusich, @sameasy, @mtosi, @dgulhan, @missirol this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

srimanob · 2022-10-25T13:31:55Z

test parameters:

workflow = 24434.0

srimanob · 2022-10-25T13:33:07Z

@cmsbuild please test

cmsbuild · 2022-10-25T17:55:10Z

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f45f02/28489/summary.html
COMMIT: cccd356
CMSSW: CMSSW_12_6_X_2022-10-25-1100/el8_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/39841/28489/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

The relvals timed out after 4 hours.

29.029.0_ZEE+ZEEINPUT+DIGI+RECOAlCaCalo+HARVEST/step2_ZEE+ZEEINPUT+DIGI+RECOAlCaCalo+HARVEST.log
31.031.0_ZTT+ZTTINPUT+DIGI+RECO+HARVEST/step2_ZTT+ZTTINPUT+DIGI+RECO+HARVEST.log
30.030.0_ZMM+ZMMINPUT+DIGI+RECO+HARVEST/step2_ZMM+ZMMINPUT+DIGI+RECO+HARVEST.log

Expand to see more relval errors ...

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-f45f02/24434.0_TTbar_14TeV+2026D97+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal

Summary:

No significant changes to the logs found
Reco comparison results: 8 differences found in the comparisons
Reco comparison had 6 failed jobs
DQMHistoTests: Total files compared: 48
DQMHistoTests: Total histograms compared: 3378384
DQMHistoTests: Total failures: 6
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3378356
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
Checked 201 log files, 48 edm output root files, 48 DQM output files
TriggerResults: no differences found

srimanob · 2022-10-26T00:40:09Z

+Upgrade

The new D97 workflow runs fine. The error on PR test does not relate to this PR.

srimanob · 2022-10-26T00:40:33Z

@cmsbuild please test

Another try, to see if we can move away the relvals-input error.

cmsbuild · 2022-10-26T04:39:42Z

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f45f02/28506/summary.html
COMMIT: cccd356
CMSSW: CMSSW_12_6_X_2022-10-25-1100/el8_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/39841/28506/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 test-das-selected-lumis had ERRORS

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-f45f02/24434.0_TTbar_14TeV+2026D97+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal

Summary:

No significant changes to the logs found
Reco comparison results: 3 differences found in the comparisons
Reco comparison had 6 failed jobs
DQMHistoTests: Total files compared: 48
DQMHistoTests: Total histograms compared: 3378384
DQMHistoTests: Total failures: 6
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3378356
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
Checked 201 log files, 48 edm output root files, 48 DQM output files
TriggerResults: no differences found

cmsbuild · 2022-10-31T07:08:14Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f45f02/28655/summary.html
COMMIT: b21636c
CMSSW: CMSSW_12_6_X_2022-10-30-2300/el8_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/39841/28655/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-f45f02/24434.0_TTbar_14TeV+2026D97+TTbar_14TeV_TuneCP5_GenSimHLBeamSpot14+DigiTrigger+RecoGlobal+HARVESTGlobal+ALCAPhase2

Summary:

No significant changes to the logs found
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 48
DQMHistoTests: Total histograms compared: 3416356
DQMHistoTests: Total failures: 6
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3416328
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
Checked 206 log files, 48 edm output root files, 48 DQM output files
TriggerResults: no differences found

srimanob · 2022-10-31T08:07:48Z

+Upgrade

srimanob · 2022-11-01T03:39:16Z

@cms-sw/geometry-l2 @cms-sw/pdmv-l2
Could you please consider, and sign/resign? Thanks.

bsunanda · 2022-11-01T05:58:13Z

+geometry

kskovpen · 2022-11-01T06:22:29Z

+pdmv

perrotta · 2022-11-01T07:52:13Z

Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py

+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = cms.bool(False)


Suggested change

mtdGeometry.applyAlignment = cms.bool(False)

mtdGeometry.applyAlignment = False

perrotta · 2022-11-01T07:52:35Z

Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py

+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = cms.bool(False)


Suggested change

trackerGeometry.applyAlignment = cms.bool(False)

trackerGeometry.applyAlignment = False

perrotta · 2022-11-01T07:52:56Z

Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py

+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = cms.bool(False)


Suggested change

mtdGeometry.applyAlignment = cms.bool(False)

mtdGeometry.applyAlignment = False

srimanob · 2022-11-04T06:51:24Z

Hi @perrotta

Those lines are generated automatically from
https://github.com/cms-sw/cmssw/blob/master/Configuration/Geometry/python/dict2026Geometry.py
i.e.
https://github.com/cms-sw/cmssw/blob/master/Configuration/Geometry/python/dict2026Geometry.py#L282

I should fix dict2026Geometry.py and regenerate all Phase-2 XML files. May I propose to merge this PR, and we do follow up PR, so it is clear on what PR for? Thanks.

perrotta · 2022-11-04T07:03:00Z

+1

cmsbuild · 2022-11-04T07:03:20Z

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.

makortel · 2022-11-04T20:21:04Z

For some reason the test2026Geometry unit test fails in the IB

===== Test "test2026Geometry" ====
cmsExtendedGeometry2026D97XML_cfi.py differs
cmsExtendedGeometry2026D97.xml differs

---> test test2026Geometry had ERRORS

https://cmssdt.cern.ch/SDT/cgi-bin/logreader/el8_amd64_gcc10/CMSSW_12_6_X_2022-11-04-1100/unitTestLogs/Configuration/Geometry#/

srimanob · 2022-11-05T00:10:35Z

Thanks @makortel
That is because we merge #39974 almost the same time, so update on D97 was not available. I will submit a fix, together with code cleaning as suggested in #39841 (comment)

srimanob · 2022-11-05T01:10:08Z

Fix in #39992

cmsbuild added this to the CMSSW_12_6_X milestone Oct 25, 2022

cmsbuild added code-checks-pending geometry-pending operations-pending orp-pending pdmv-pending pending-signatures tests-pending upgrade-pending labels Oct 25, 2022

cmsbuild added code-checks-approved and removed code-checks-pending labels Oct 25, 2022

cmsbuild added tests-started and removed tests-pending labels Oct 25, 2022

cmsbuild added tests-rejected and removed tests-started labels Oct 25, 2022

cmsbuild added upgrade-approved and removed upgrade-pending labels Oct 26, 2022

cmsbuild added tests-started and removed tests-rejected labels Oct 26, 2022

cmsbuild added tests-rejected and removed tests-started labels Oct 26, 2022

cmsbuild mentioned this pull request Oct 26, 2022

Add AlCaReco producers in phase-2 workflows #39858

Merged

cmsbuild added tests-approved and removed tests-started labels Oct 31, 2022

cmsbuild added upgrade-approved and removed upgrade-pending labels Oct 31, 2022

cmsbuild added geometry-approved and removed geometry-pending labels Nov 1, 2022

cmsbuild added pdmv-approved and removed pdmv-pending labels Nov 1, 2022

perrotta reviewed Nov 1, 2022

View reviewed changes

cmsbuild mentioned this pull request Nov 3, 2022

Phase2-hcx341 Add a new Prodcut file Phase2 HCAL and modify the scenarios accordingly #39974

Merged

cmsbuild added fully-signed operations-approved orp-approved and removed operations-pending pending-signatures orp-pending labels Nov 4, 2022

cmsbuild merged commit d466759 into cms-sw:master Nov 4, 2022

cmsbuild mentioned this pull request Nov 4, 2022

Photon MVA-based ID for Run3 from EGamma POG #39927

Merged

srimanob mentioned this pull request Nov 5, 2022

Fix D97 unit test and clean up Phase2 XMLs #39992

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add D97 Phase-2 geometry #39841

Add D97 Phase-2 geometry #39841

srimanob commented Oct 25, 2022 •

edited

Loading

cmsbuild commented Oct 25, 2022

cmsbuild commented Oct 25, 2022

srimanob commented Oct 25, 2022

srimanob commented Oct 25, 2022

cmsbuild commented Oct 25, 2022

srimanob commented Oct 26, 2022

srimanob commented Oct 26, 2022

cmsbuild commented Oct 26, 2022

cmsbuild commented Oct 31, 2022

srimanob commented Oct 31, 2022

srimanob commented Nov 1, 2022

bsunanda commented Nov 1, 2022

kskovpen commented Nov 1, 2022

perrotta Nov 1, 2022

perrotta Nov 1, 2022

perrotta Nov 1, 2022

srimanob commented Nov 4, 2022 •

edited

Loading

perrotta commented Nov 4, 2022

cmsbuild commented Nov 4, 2022

makortel commented Nov 4, 2022

srimanob commented Nov 5, 2022 •

edited

Loading

srimanob commented Nov 5, 2022

	mtdGeometry.applyAlignment = cms.bool(False)
	mtdGeometry.applyAlignment = False

	trackerGeometry.applyAlignment = cms.bool(False)
	trackerGeometry.applyAlignment = False

Add D97 Phase-2 geometry #39841

Add D97 Phase-2 geometry #39841

Conversation

srimanob commented Oct 25, 2022 • edited Loading

PR description:

PR validation:

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

cmsbuild commented Oct 25, 2022

cmsbuild commented Oct 25, 2022

srimanob commented Oct 25, 2022

srimanob commented Oct 25, 2022

cmsbuild commented Oct 25, 2022

RelVals-INPUT

Comparison Summary

srimanob commented Oct 26, 2022

srimanob commented Oct 26, 2022

cmsbuild commented Oct 26, 2022

Unit Tests

Comparison Summary

cmsbuild commented Oct 31, 2022

Comparison Summary

srimanob commented Oct 31, 2022

srimanob commented Nov 1, 2022

bsunanda commented Nov 1, 2022

kskovpen commented Nov 1, 2022

perrotta Nov 1, 2022

Choose a reason for hiding this comment

perrotta Nov 1, 2022

Choose a reason for hiding this comment

perrotta Nov 1, 2022

Choose a reason for hiding this comment

srimanob commented Nov 4, 2022 • edited Loading

perrotta commented Nov 4, 2022

cmsbuild commented Nov 4, 2022

makortel commented Nov 4, 2022

srimanob commented Nov 5, 2022 • edited Loading

srimanob commented Nov 5, 2022

srimanob commented Oct 25, 2022 •

edited

Loading

srimanob commented Nov 4, 2022 •

edited

Loading

srimanob commented Nov 5, 2022 •

edited

Loading