Merge pull request #37078 from srimanob/123_FixPhase2DTSpecsFilter

Fix dtSpecsFilter XML used by Phase-2 wf for DD4hep
cms-sw · Mar 2, 2022 · 0a9d119 · 0a9d119
2 parents 6310cdb + 31718e3
commit 0a9d119
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1399,7 +1399,7 @@
         ],
         3 : [
             'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
-            'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+            'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
             'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
             'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
@@ -106,7 +106,7 @@
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
+    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
     <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
@@ -106,7 +106,7 @@
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
+    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
     <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
@@ -105,7 +105,7 @@
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
     <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
+    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
     <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
@@ -109,7 +109,7 @@
         'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
         'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py
@@ -109,7 +109,7 @@
         'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
         'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py
@@ -108,7 +108,7 @@
         'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
         'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',