diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index f257136ae7235..c933ce0e49d23 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -1352,7 +1352,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/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index 0f951d5586efd..ce08a97da0e94 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -26,7 +26,7 @@ numWFIB.extend([34634.0]) #2026D76 numWFIB.extend([34834.99,34834.999]) #2026D76 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test) numWFIB.extend([34634.21,34834.21,34834.9921]) #2026D76 prodlike, prodlike PU, prodlike premix stage1+stage2 -numWFIB.extend([35034.0]) #2026D77 +numWFIB.extend([35034.0,35034.911]) #2026D77,DD4hep numWFIB.extend([35234.99,35234.999]) #2026D77 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test) numWFIB.extend([35034.21,35234.21,35234.9921]) #2026D77 prodlike, prodlike PU, prodlike premix stage1+stage2 numWFIB.extend([35434.0]) #2026D78 diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D76.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D76.xml index f5450c234d26a..546ec19edc022 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D76.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D76.xml @@ -105,7 +105,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D77.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D77.xml index 6d25c1a955d77..6aab7344bc74e 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D77.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D77.xml @@ -105,7 +105,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D78.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D78.xml index 3e6f8853786f8..1073d7e3c6d0f 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D78.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D78.xml @@ -105,7 +105,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D79.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D79.xml index 7a7a23b70d9ae..ce111233f0f92 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D79.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D79.xml @@ -104,7 +104,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D80.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D80.xml index 2b8519093601e..8020167d1953c 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D80.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D80.xml @@ -104,7 +104,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D81.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D81.xml index c9bd2373f1e04..0b24a225e515f 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D81.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D81.xml @@ -104,7 +104,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml index 8e28e339bfd7f..d4267086b0dc5 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml @@ -111,7 +111,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml index 4e4939b5af993..67c786dbda439 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml @@ -105,7 +105,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D85.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D85.xml index 4356432df0106..6605fbf0ee434 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D85.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D85.xml @@ -105,7 +105,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml index 861e7276ec8b1..40c0d0d9a6b17 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D87.xml @@ -104,7 +104,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D89.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D89.xml index d86fe05aeb1e2..096a7474ec92b 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D89.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D89.xml @@ -102,7 +102,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D90.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D90.xml index 27270ce6bc8c8..7867c9ed42a78 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D90.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D90.xml @@ -102,7 +102,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D76XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D76XML_cfi.py index fd72b2fc26d54..8039c79a87fc3 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D76XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D76XML_cfi.py @@ -108,7 +108,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D77XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D77XML_cfi.py index 468298ce45fb3..3fb034b12b365 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D77XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D77XML_cfi.py @@ -108,7 +108,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D78XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D78XML_cfi.py index 197ba816ea497..bf26c9fa0a5d9 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D78XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D78XML_cfi.py @@ -108,7 +108,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D79XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D79XML_cfi.py index 2f58e1f1fefbe..50c7ac0a3aa63 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D79XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D79XML_cfi.py @@ -107,7 +107,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D80XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D80XML_cfi.py index b2167c51479c6..d6eb2210229e1 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D80XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D80XML_cfi.py @@ -107,7 +107,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D81XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D81XML_cfi.py index 4df1a001b4663..c6381be7b05d1 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D81XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D81XML_cfi.py @@ -107,7 +107,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D82XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py index 46aa2875d6e06..2d1ef1c08dbb8 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py @@ -114,7 +114,7 @@ 'Geometry/HGCalSimData/data/hgcsensv9.xml', 'Geometry/ForwardSimData/data/hfnosesens.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/cmsExtendedGeometry2026D83XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D83XML_cfi.py index b14366f81c55a..5e20e69ec6f86 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D83XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D83XML_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', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D85XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D85XML_cfi.py index 506aaec86bb6e..eebae6cbdb246 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D85XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D85XML_cfi.py @@ -108,7 +108,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D87XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D87XML_cfi.py index 8603d3dae5d0f..7dd9f4eb9c919 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D87XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D87XML_cfi.py @@ -107,7 +107,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D89XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D89XML_cfi.py index bad3a4fb4f83c..c4a70161d8226 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D89XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D89XML_cfi.py @@ -105,7 +105,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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/cmsExtendedGeometry2026D90XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D90XML_cfi.py index 2544760473a62..98ad516c194f1 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D90XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D90XML_cfi.py @@ -105,7 +105,7 @@ 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.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',