From d88f2f8025c6a5cf4030c3fd151be53be42ef2c0 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sun, 25 Feb 2024 05:13:14 +0100 Subject: [PATCH] Take Vladimir's comments of shifting 2021/v6 to 2024/v1 for muonNumbering --- Configuration/Geometry/python/dict2021Geometry.py | 2 +- Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml | 2 +- .../data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml | 2 +- .../data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml | 2 +- .../data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml | 2 +- .../data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml | 2 +- .../data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml | 2 +- .../python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py | 2 +- Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py | 2 +- .../python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py | 2 +- .../data/muonNumbering/{2021/v6 => 2024/v1}/muonNumbering.xml | 0 .../MuonCommonData/python/testExtendedGeometry2024XML_cfi.py | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename Geometry/MuonCommonData/data/muonNumbering/{2021/v6 => 2024/v1}/muonNumbering.xml (100%) diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index ac710bf5008fb..c5bd42ee5a668 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -1497,7 +1497,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', ], 2 : [ - 'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', ], 3 : [ 'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml', diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml index 8f0d7aec07cb6..cc7f72ccbd82c 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml @@ -249,7 +249,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml index fc3cc8add385a..b3e0cf8d73b4c 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml @@ -249,7 +249,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml index 9f7c68fc48b08..0b549faeffdb5 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml @@ -249,7 +249,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml index 133ea8165ec03..7e89e7f76962a 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml @@ -249,7 +249,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml index a6c563a6a153f..ccafa1101aca3 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml @@ -249,7 +249,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml index cea56454b5bee..57341e9c01b50 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml @@ -249,7 +249,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py index dcb184d345799..2084a4dd0c285 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py @@ -252,7 +252,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', 'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml', 'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml', 'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py index af20e9cea98cb..af4d28d14d58c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py @@ -252,7 +252,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', 'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml', 'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml', 'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py index 68a2fd62989a9..28de997c5b4d6 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py @@ -252,7 +252,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', 'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml', 'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml', 'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py index c326f1003de98..8cb363c160f16 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py @@ -252,7 +252,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', 'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml', 'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml', 'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py index 1eb6bf3b281e9..b86ee3dcacb22 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py @@ -252,7 +252,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', 'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml', 'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml', 'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py index b8ea5ea4cccf5..8e6d1fea562ef 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py @@ -252,7 +252,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', 'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml', 'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml', 'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml', diff --git a/Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml similarity index 100% rename from Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml rename to Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py index 41bcbaaee5a98..a0889d2f1f3c2 100644 --- a/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py +++ b/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py @@ -249,7 +249,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', 'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml', 'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml', 'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',