From 803ffeb3dc8c35a06ce1ef9f983d39d998224e50 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 3 Jul 2020 23:23:06 +0200 Subject: [PATCH] modify the version 2021/v2 to fix the issue --- .../Geometry/python/dict2021Geometry.py | 2 +- .../data/dd4hep/cmsExtendedGeometry2021.xml | 2 +- .../python/cmsExtendedGeometry2021XML_cfi.py | 2 +- .../muonNumbering/2021/v2/muonNumbering.xml | 6 - .../muonNumbering/2021/v3/muonNumbering.xml | 433 ------------------ 5 files changed, 3 insertions(+), 442 deletions(-) delete mode 100644 Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index 583db7611979f..9a2846643844b 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -324,7 +324,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', ], 2 : [ - 'Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml', ], 3 : [ 'Geometry/MuonSimData/data/v2/muonSens.xml', diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml index 848313b8eb3e2..5185bcecf5a1b 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml @@ -247,7 +247,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py index ec1da5ad8381d..4ba4cfb87c587 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py @@ -250,7 +250,7 @@ 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', )+ cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2021/v2/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/v2/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml index 44a2b0dfe2c86..5474f110344f2 100644 --- a/Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml +++ b/Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml @@ -416,15 +416,9 @@ - - - - - - diff --git a/Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml deleted file mode 100644 index 5474f110344f2..0000000000000 --- a/Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -