From fcab990f28eb0313cdf131683800695d01aeee49 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 7 Jul 2020 18:28:28 +0200 Subject: [PATCH] Fix some 2026 geometries by removing interfering duplicate file --- Configuration/Geometry/python/dict2026Geometry.py | 2 -- .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml | 1 - .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml | 1 - .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml | 1 - .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml | 1 - .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml | 1 - .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml | 1 - .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml | 1 - .../CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py | 1 - .../CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py | 1 - .../CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py | 1 - .../CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py | 1 - .../CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py | 1 - .../CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py | 1 - .../CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py | 1 - 15 files changed, 16 deletions(-) diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index f1307be7da79d..ef769b8d4d343 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -1160,7 +1160,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', @@ -1207,7 +1206,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v3/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v3/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml index 53d9c1fd76da0..cf4476edfd278 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml @@ -72,7 +72,6 @@ - diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml index 8a724dae0e8ce..b64f39fb3aba3 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml @@ -72,7 +72,6 @@ - diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml index 1d220cd6572e0..2c4fd7870444b 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml @@ -72,7 +72,6 @@ - diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml index bf11ed9ed8639..3bc17fc87e0f6 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml @@ -72,7 +72,6 @@ - diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml index b688796327772..c0df9a9395c0d 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml @@ -72,7 +72,6 @@ - diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml index 87ccf291c63a7..c78f4d8c6d76e 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml @@ -72,7 +72,6 @@ - diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml index 40a37cfbf7c33..9adf9a52c8865 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml @@ -72,7 +72,6 @@ - diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py index 6c06a33c59fa8..160972563d711 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py @@ -73,7 +73,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py index ad2330a134bc8..2021fe17eb8ab 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py @@ -73,7 +73,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py index d6960998cbdf5..6245138f23c91 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py @@ -73,7 +73,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py index 88b23477045c7..3098b4d25ebae 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py @@ -73,7 +73,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py index d2dddf9637195..a4b0ea468ba0a 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py @@ -73,7 +73,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py index 4ee1a3832088e..349ba4f9e2930 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py @@ -73,7 +73,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v3/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v3/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py index 3d9ad0a41d112..97346279507b9 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py @@ -73,7 +73,6 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml', 'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',