rename 2023 -> 2026, fix bug in D44 #27488

kpedro88 · 2019-07-11T03:40:11Z

PR description:

To avoid conflicts with new Run3 workflows, as the LHC timeline has shifted, the Phase 2 workflows and associated files are renamed from 2023 -> 2026.

The various unmaintained configs in test directories are not included in this renaming. Most of these refer to Phase 2 detector configurations that no longer exist, so it is not worth the effort to propagate the renaming. A few exceptions are made here for configs that may be used in unit tests.

A mistake from #27449 in the D44 workflow (wrong version of the forward region) is also fixed.

PR validation:

Matrix workflow 20034.0 runs successfully.

Unit tests also run successfully.

cmsbuild · 2019-07-11T03:40:43Z

The code-checks are being triggered in jenkins.

cmsbuild · 2019-07-11T03:47:19Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27488/10822

This PR adds an extra 152KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File Configuration/PyReleaseValidation/python/relval_steps.py modified in PR(s): Add bx skim and corresponding RelVal #26476, Adding Run 330098 (2019 MWGR3) in data relvals #27341, First attempt to remove DQM HLT warnings from logs caused by HLT Fake menus #27467, Add workflows for 2023 and 2024. Replace 13TeV 2021 by 14TeV. #27433
- File Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py modified in PR(s): Add workflows for 2023 and 2024. Replace 13TeV 2021 by 14TeV. #27433

cmsbuild · 2019-07-11T03:47:53Z

A new Pull Request was created by @kpedro88 (Kevin Pedro) for master.

It involves the following packages:

CalibCalorimetry/HcalPlugins
Configuration/Geometry
Configuration/PyReleaseValidation
Configuration/StandardSequences
Fireworks/Geometry
Geometry/CMSCommonData
Geometry/EcalCommonData
Geometry/ForwardCommonData
Geometry/HGCalCommonData
Geometry/HcalCommonData
Geometry/MTDCommonData
Geometry/MuonCommonData
Geometry/TrackerCommonData
L1Trigger/TrackTrigger

@cmsbuild, @benkrikler, @Dr15Jones, @alja, @cvuosalo, @civanch, @christopheralanwest, @ianna, @mdhildreth, @pgunnell, @rekovic, @franzoni, @tocheng, @zhenhu, @tlampen, @pohsun, @prebello, @fabiocos, @kpedro88, @davidlange6 can you please review it and eventually sign? Thanks.
@argiro, @vargasa, @makortel, @felicepantaleo, @sviret, @GiacomoSguazzoni, @tocheng, @ghugo83, @Martin-Grunewald, @alja, @rovere, @ptcox, @ebrondol, @VinInn, @mmusich, @dgulhan, @venturia this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

ianna

@kpedro88 - Please, update CondTools/Geometry package to make sure we still are capable of producing geometry payloads for both 2021 and 2023 scenarios.

ianna · 2019-07-11T05:47:09Z

Configuration/Geometry/python/dict2026Geometry.py

            'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml',
+            'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',


@kpedro88 - shouldn't it be 2026/v1? When we move forward we do not need to keep the older versions. The same applies for other files with v > 1.

For example, 2026/v1/brm.xml is not used and should be replaced by 2026/v2/brm.xml and the latter should be removed.

@ianna this is a simple renaming of 2023 -> 2026. We are not moving forward or re-versioning anything.

If during renaming we can drop a file or two it would be great.

I would really prefer not to mix renaming and cleanup in the same PR. That is why I separated this change from the previous Phase 2 cleanup PR. If this PR has identified some further cleanup issues in geometry, a new issue can be opened to track them.

ianna · 2019-07-11T05:51:14Z

Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py

@@ -9,11 +9,11 @@
        'Geometry/CMSCommonData/data/extend/cmsextent.xml',


@kpedro88 - I think, we should either remove or rename this scenario. It's confusing when 2015 scenario is using the 2026 description.

If there are outdated geometry scenarios, those should be addressed in a separate issue/PR. It is beyond the scope of this PR.

ianna · 2019-07-11T05:52:00Z

Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py

@@ -16,8 +16,8 @@
        'Geometry/CMSCommonData/data/muonBase/2017/v1/muonBase.xml',


@kpedro88 - I thought we have moved 2019 scenarios to 2021?

Maybe it was copied instead of moved? In any case, see above re: scope of this PR.

ianna · 2019-07-11T05:52:57Z

Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py

@@ -16,8 +16,8 @@
        'Geometry/CMSCommonData/data/muonBase/2018/v1/muonBase.xml',
        'Geometry/CMSCommonData/data/cmsMuon.xml',
        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',


@kpedro88 - 2021 should not use future definitions. The definition of the beam pipe should be moved to 2021. There might be more changes to the beam pipe description later this year.

Again, separate from the purpose of this PR, which only has to do with naming.

Yes, however, this file should be renamed to
CMSCommonData/data/beampipe/2021/v1/beampipe.xml

That is a separate issue than the run3/run4 naming conflict being addressed in this PR.

ianna · 2019-07-11T06:05:54Z

-1

Update of a CondTools/Geometry package is needed.

cmsbuild · 2019-07-11T14:41:16Z

The code-checks are being triggered in jenkins.

kpedro88 · 2019-07-11T14:41:48Z

@ianna I propagated this change to the CondTools/Geometry files. That package also contains some files named "run3" that reference 2023. I am not sure if these files are used anymore; please advise.

fabiocos · 2019-07-17T14:10:00Z

+operations

the update of StandardSequences is coherent with the rest of the PR and its purpose

fabiocos · 2019-07-17T16:21:27Z

@alja @rekovic the updates in your domain look relatively straightforward

cvuosalo · 2019-07-17T16:30:23Z

+1

zhenhu · 2019-07-17T16:31:11Z

+1

alja · 2019-07-17T17:12:03Z

+1

christopheralanwest · 2019-07-17T17:47:52Z

+1

ggovi · 2019-07-17T19:16:26Z

+1

kpedro88 · 2019-07-17T19:17:34Z

@benkrikler @rekovic please sign

fabiocos · 2019-07-17T20:38:48Z

+1

fabiocos · 2019-07-17T20:38:53Z

merge

cmsbuild added this to the CMSSW_11_0_X milestone Jul 11, 2019

cmsbuild added alca-pending code-checks-pending comparison-pending geometry-pending l1-pending operations-pending orp-pending pdmv-pending pending-signatures tests-pending upgrade-pending visualization-pending labels Jul 11, 2019

cmsbuild added code-checks-approved and removed code-checks-pending labels Jul 11, 2019

ianna suggested changes Jul 11, 2019

View reviewed changes

cmsbuild added geometry-rejected and removed geometry-pending labels Jul 11, 2019

cmsbuild mentioned this pull request Jul 11, 2019

First attempt to remove DQM HLT warnings from logs caused by HLT Fake menus #27467

Merged

cmsbuild added code-checks-pending db-pending geometry-pending and removed code-checks-approved geometry-rejected labels Jul 11, 2019

cmsbuild added operations-approved and removed operations-pending labels Jul 17, 2019

cmsbuild added geometry-approved and removed geometry-pending labels Jul 17, 2019

cmsbuild added pdmv-approved and removed pdmv-pending labels Jul 17, 2019

cmsbuild added visualization-approved and removed visualization-pending labels Jul 17, 2019

cmsbuild added alca-approved and removed alca-pending labels Jul 17, 2019

cmsbuild added db-approved and removed db-pending labels Jul 17, 2019

cmsbuild added orp-approved and removed orp-pending labels Jul 17, 2019

cmsbuild merged commit 10f7c5b into cms-sw:master Jul 17, 2019

This was referenced Jul 19, 2019

Updates to E(H)CalEnergy definitions for PF hadrons. #27550

Merged

Add test wf after renaming 2023DXX into 2026DXX cms-sw/cms-bot#1170

Closed

kpedro88 mentioned this pull request Jul 19, 2019

future workflows naming schema #27563

Open

kpedro88 mentioned this pull request Sep 16, 2019

improve upgrade PU assignment #28005

Merged

srimanob mentioned this pull request Oct 5, 2022

Reset Phase-2 workflow ID #39571

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rename 2023 -> 2026, fix bug in D44 #27488

rename 2023 -> 2026, fix bug in D44 #27488

kpedro88 commented Jul 11, 2019

cmsbuild commented Jul 11, 2019

cmsbuild commented Jul 11, 2019

cmsbuild commented Jul 11, 2019

ianna left a comment

ianna Jul 11, 2019

kpedro88 Jul 11, 2019

ianna Jul 11, 2019

kpedro88 Jul 11, 2019

ianna Jul 11, 2019

kpedro88 Jul 11, 2019

ianna Jul 11, 2019

kpedro88 Jul 11, 2019

ianna Jul 11, 2019

kpedro88 Jul 11, 2019

ianna Jul 11, 2019

kpedro88 Jul 11, 2019

ianna commented Jul 11, 2019

cmsbuild commented Jul 11, 2019

kpedro88 commented Jul 11, 2019

fabiocos commented Jul 17, 2019

fabiocos commented Jul 17, 2019 •

edited

Loading

cvuosalo commented Jul 17, 2019

zhenhu commented Jul 17, 2019

alja commented Jul 17, 2019

christopheralanwest commented Jul 17, 2019

ggovi commented Jul 17, 2019

kpedro88 commented Jul 17, 2019

fabiocos commented Jul 17, 2019

fabiocos commented Jul 17, 2019

		@@ -9,11 +9,11 @@
		'Geometry/CMSCommonData/data/extend/cmsextent.xml',

		@@ -16,8 +16,8 @@
		'Geometry/CMSCommonData/data/muonBase/2017/v1/muonBase.xml',

rename 2023 -> 2026, fix bug in D44 #27488

rename 2023 -> 2026, fix bug in D44 #27488

Conversation

kpedro88 commented Jul 11, 2019

PR description:

PR validation:

cmsbuild commented Jul 11, 2019

cmsbuild commented Jul 11, 2019

cmsbuild commented Jul 11, 2019

ianna left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ianna commented Jul 11, 2019

cmsbuild commented Jul 11, 2019

kpedro88 commented Jul 11, 2019

fabiocos commented Jul 17, 2019

fabiocos commented Jul 17, 2019 • edited Loading

cvuosalo commented Jul 17, 2019

zhenhu commented Jul 17, 2019

alja commented Jul 17, 2019

christopheralanwest commented Jul 17, 2019

ggovi commented Jul 17, 2019

kpedro88 commented Jul 17, 2019

fabiocos commented Jul 17, 2019

fabiocos commented Jul 17, 2019

fabiocos commented Jul 17, 2019 •

edited

Loading