Skip to content

Commit e1571f7

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47643 from bsunanda/Run3-gex187U
Run3-gex187U Update all Run3 scenarios with he right DTShiel, GEM and RPC chambers
2 parents c4650c3 + 700a30a commit e1571f7

File tree

7 files changed

+150
-15
lines changed

7 files changed

+150
-15
lines changed

‎Configuration/Geometry/python/dict2021Geometry.py‎

Lines changed: 138 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,6 +2157,141 @@
21572157
],
21582158
"era" : "run3_GEM",
21592159
},
2160+
"M13" : {
2161+
1 : [
2162+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2163+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2164+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2165+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2166+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2167+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
2168+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2169+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2170+
'Geometry/MuonCommonData/data/rpcf/2021/v6/rpcf.xml',
2171+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2172+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
2173+
'Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml',
2174+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2175+
'Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml',
2176+
],
2177+
2 : [
2178+
'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
2179+
],
2180+
3 : [
2181+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2182+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2183+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2184+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2185+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2186+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2187+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2188+
],
2189+
4 : [
2190+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2191+
],
2192+
"sim" : [
2193+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2194+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2195+
],
2196+
"reco" : [
2197+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2198+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2199+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2200+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2201+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2202+
],
2203+
"era" : "run3_GEM",
2204+
},
2205+
"M14" : {
2206+
1 : [
2207+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2208+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2209+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2210+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2211+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2212+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
2213+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2214+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2215+
'Geometry/MuonCommonData/data/rpcf/2023/v4/rpcf.xml',
2216+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2217+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
2218+
'Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml',
2219+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2220+
'Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml',
2221+
],
2222+
2 : [
2223+
'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
2224+
],
2225+
3 : [
2226+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2227+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2228+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2229+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2230+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2231+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2232+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2233+
],
2234+
4 : [
2235+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2236+
],
2237+
"sim" : [
2238+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2239+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2240+
],
2241+
"reco" : [
2242+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2243+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2244+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2245+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2246+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2247+
],
2248+
"era" : "run3_GEM",
2249+
},
2250+
"M15" : {
2251+
1 : [
2252+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2253+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2254+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2255+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2256+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2257+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
2258+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2259+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2260+
'Geometry/MuonCommonData/data/rpcf/2024/v5/rpcf.xml',
2261+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2262+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
2263+
'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
2264+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2265+
'Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml',
2266+
],
2267+
2 : [
2268+
'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
2269+
],
2270+
3 : [
2271+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2272+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2273+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2274+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2275+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2276+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2277+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2278+
],
2279+
4 : [
2280+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2281+
],
2282+
"sim" : [
2283+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2284+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2285+
],
2286+
"reco" : [
2287+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2288+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2289+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2290+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2291+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2292+
],
2293+
"era" : "run3_GEM",
2294+
},
21602295
}
21612296

21622297
forwardDict = {
@@ -2371,19 +2506,19 @@
23712506
allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
23722507

23732508
detectorVersionDict = {
2374-
("O6","T3","C3","M9","F1","P7") : "2021",
2509+
("O7","T3","C3","M13","F1","P7") : "2021",
23752510
("O4","T4","C1","M9","F1","P7") : "2021ZeroMaterial",
23762511
("O5","T5","C1","M9","F1","P7") : "2021FlatMinus05Percent",
23772512
("O5","T6","C1","M9","F1","P7") : "2021FlatMinus10Percent",
23782513
("O5","T7","C1","M9","F1","P7") : "2021FlatPlus05Percent",
23792514
("O5","T8","C1","M9","F1","P7") : "2021FlatPlus10Percent",
2380-
("O6","T3","C2","M10","F3","P7") : "2023",
2515+
("O7","T3","C2","M14","F3","P7") : "2023",
23812516
("O4","T4","C1","M10","F2","P7") : "2023ZeroMaterial",
23822517
("O5","T5","C1","M10","F2","P7") : "2023FlatMinus05Percent",
23832518
("O5","T6","C1","M10","F2","P7") : "2023FlatMinus10Percent",
23842519
("O5","T7","C1","M10","F2","P7") : "2023FlatPlus05Percent",
23852520
("O5","T8","C1","M10","F2","P7") : "2023FlatPlus10Percent",
2386-
("O6","T3","C2","M11","F3","P7") : "2024",
2521+
("O7","T3","C2","M15","F3","P7") : "2024",
23872522
("O4","T4","C2","M11","F2","P7") : "2024ZeroMaterial",
23882523
("O5","T5","C2","M11","F2","P7") : "2024FlatMinus05Percent",
23892524
("O5","T6","C2","M11","F2","P7") : "2024FlatMinus10Percent",

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<close_geometry/>
55

66
<IncludeSection>
7-
<Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
7+
<Include ref='Geometry/CMSCommonData/data/materials/2021/v4/materials.xml'/>
88
<Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
99
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
1010
<Include ref='Geometry/CMSCommonData/data/extend/v3/cmsextent.xml'/>
@@ -240,7 +240,7 @@
240240
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
241241
<Include ref='Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml'/>
242242
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
243-
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
243+
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml'/>
244244
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v6/rpcf.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<close_geometry/>
55

66
<IncludeSection>
7-
<Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
7+
<Include ref='Geometry/CMSCommonData/data/materials/2021/v4/materials.xml'/>
88
<Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
99
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
1010
<Include ref='Geometry/CMSCommonData/data/extend/v3/cmsextent.xml'/>
@@ -240,7 +240,7 @@
240240
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
241241
<Include ref='Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml'/>
242242
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
243-
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
243+
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml'/>
244244
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2023/v4/rpcf.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<close_geometry/>
55

66
<IncludeSection>
7-
<Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
7+
<Include ref='Geometry/CMSCommonData/data/materials/2021/v4/materials.xml'/>
88
<Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
99
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
1010
<Include ref='Geometry/CMSCommonData/data/extend/v3/cmsextent.xml'/>
@@ -240,7 +240,7 @@
240240
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
241241
<Include ref='Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml'/>
242242
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
243-
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
243+
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml'/>
244244
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2024/v5/rpcf.xml'/>

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
77
geomXMLFiles = cms.vstring(
8-
'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
8+
'Geometry/CMSCommonData/data/materials/2021/v4/materials.xml',
99
'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
1010
'Geometry/CMSCommonData/data/rotations.xml',
1111
'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
@@ -241,7 +241,7 @@
241241
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
242242
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
243243
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
244-
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
244+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
245245
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
246246
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
247247
'Geometry/MuonCommonData/data/rpcf/2021/v6/rpcf.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
77
geomXMLFiles = cms.vstring(
8-
'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
8+
'Geometry/CMSCommonData/data/materials/2021/v4/materials.xml',
99
'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
1010
'Geometry/CMSCommonData/data/rotations.xml',
1111
'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
@@ -241,7 +241,7 @@
241241
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
242242
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
243243
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
244-
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
244+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
245245
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
246246
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
247247
'Geometry/MuonCommonData/data/rpcf/2023/v4/rpcf.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
77
geomXMLFiles = cms.vstring(
8-
'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
8+
'Geometry/CMSCommonData/data/materials/2021/v4/materials.xml',
99
'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
1010
'Geometry/CMSCommonData/data/rotations.xml',
1111
'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
@@ -241,7 +241,7 @@
241241
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
242242
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
243243
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
244-
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
244+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
245245
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
246246
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
247247
'Geometry/MuonCommonData/data/rpcf/2024/v5/rpcf.xml',

0 commit comments

Comments
 (0)