Skip to content

Commit ea45129

Browse files
author
Sunanda
committed
Update all Run3 scenarios to accommodate the changes for RPC correction for phi staggering and z-position
1 parent 4eeb0e8 commit ea45129

File tree

50 files changed

+331
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+331
-147
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ Muon system:
3939
* M6: Same as M2 with modified RPC
4040
* M7: Same as M3 with modified RPC
4141
* M8: Same as M4 with modified RPC
42+
* M9: Same as M1 with modified RPC, corrected for phi staggering and z-position
43+
* M10: Same as M2 with modified RPC, corrected for phi staggering and z-position
44+
* M11: Same as M3 with modified RPC, corrected for phi staggering and z-position
45+
* M12: Same as M4 with modified RPC, corrected for phi staggering and z-position
4246

4347
PPS:
4448
* P7: 2021 baseline (after removing overlaps and using common materials whenever possible)
@@ -55,30 +59,30 @@ The script also handles the common and forward elements of the geometry:
5559
* F3: same as F2 with added simulti geometry for RPD
5660

5761
Several detector combinations have been generated:
58-
* 2021 = T3+C3+M1+P7+O6+F1
59-
* 2021ZeroMaterial = T4+C1+M1+P7+O4+F1
60-
* 2021FlatMinus05Percent = T5+C1+M1+P7+O5+F1
61-
* 2021FlatMinus10Percent = T6+C1+M1+P7+O5+F1
62-
* 2021FlatPlus05Percent = T7+C1+M1+P7+O5+F1
63-
* 2021FlatPlus10Percent = T8+C1+M1+P7+O5+F1
64-
* 2023 = T3+C2+M2+P7+O6+F3
65-
* 2023ZeroMaterial = T4+C1+M2+P7+O4+F2
66-
* 2023FlatMinus05Percent = T5+C1+M2+P7+O5+F2
67-
* 2023FlatMinus10Percent = T6+C1+M2+P7+O5+F2
68-
* 2023FlatPlus05Percent = T7+C1+M2+P7+O5+F2
69-
* 2023FlatPlus10Percent = T8+C1+M2+P7+O5+F2
70-
* 2024 = T3+C2+M3+P7+O6+F3
71-
* 2024ZeroMaterial = T4+C2+M3+P7+O4+F2
72-
* 2024FlatMinus05Percent = T5+C2+M3+P7+O5+F2
73-
* 2024FlatMinus10Percent = T6+C2+M3+P7+O5+F2
74-
* 2024FlatPlus05Percent = T7+C2+M3+P7+O5+F2
75-
* 2024FlatPlus10Percent = T8+C2+M3+P7+O5+F2
76-
* 2025 = T3+C2+M4+P7+O7+F3
77-
* 2025ZeroMaterial = T4+C2+M4+P7+O8+F3
78-
* 2025FlatMinus05Percent = T5+C2+M4+P7+O9+F3
79-
* 2025FlatMinus10Percent = T6+C2+M4+P7+O9+F3
80-
* 2025FlatPlus05Percent = T7+C2+M4+P7+O9+F3
81-
* 2025FlatPlus10Percent = T8+C2+M4+P7+O9+F3
62+
* 2021 = T3+C3+M9+P7+O6+F1
63+
* 2021ZeroMaterial = T4+C1+M9+P7+O4+F1
64+
* 2021FlatMinus05Percent = T5+C1+M9+P7+O5+F1
65+
* 2021FlatMinus10Percent = T6+C1+M9+P7+O5+F1
66+
* 2021FlatPlus05Percent = T7+C1+M9+P7+O5+F1
67+
* 2021FlatPlus10Percent = T8+C1+M9+P7+O5+F1
68+
* 2023 = T3+C2+M10+P7+O6+F3
69+
* 2023ZeroMaterial = T4+C1+M10+P7+O4+F2
70+
* 2023FlatMinus05Percent = T5+C1+M10+P7+O5+F2
71+
* 2023FlatMinus10Percent = T6+C1+M10+P7+O5+F2
72+
* 2023FlatPlus05Percent = T7+C1+M10+P7+O5+F2
73+
* 2023FlatPlus10Percent = T8+C1+M10+P7+O5+F2
74+
* 2024 = T3+C2+M11+P7+O6+F3
75+
* 2024ZeroMaterial = T4+C2+M11+P7+O4+F2
76+
* 2024FlatMinus05Percent = T5+C2+M11+P7+O5+F2
77+
* 2024FlatMinus10Percent = T6+C2+M11+P7+O5+F2
78+
* 2024FlatPlus05Percent = T7+C2+M11+P7+O5+F2
79+
* 2024FlatPlus10Percent = T8+C2+M11+P7+O5+F2
80+
* 2025 = T3+C2+M12+P7+O7+F3
81+
* 2025ZeroMaterial = T4+C2+M12+P7+O8+F3
82+
* 2025FlatMinus05Percent = T5+C2+M12+P7+O9+F3
83+
* 2025FlatMinus10Percent = T6+C2+M12+P7+O9+F3
84+
* 2025FlatPlus05Percent = T7+C2+M12+P7+O9+F3
85+
* 2025FlatPlus10Percent = T8+C2+M12+P7+O9+F3
8286

8387
# Phase 2 Geometries
8488

‎Configuration/Geometry/python/dict2021Geometry.py‎

Lines changed: 207 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@
16161616
muonDict = {
16171617
"abbrev" : "M",
16181618
"name" : "muon",
1619-
"default" : 6,
1619+
"default" : 12,
16201620
"M1" : {
16211621
1 : [
16221622
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
@@ -1977,6 +1977,186 @@
19771977
],
19781978
"era" : "run3_GEM",
19791979
},
1980+
"M9" : {
1981+
1 : [
1982+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
1983+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
1984+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
1985+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
1986+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
1987+
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
1988+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
1989+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
1990+
'Geometry/MuonCommonData/data/rpcf/2021/v6/rpcf.xml',
1991+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
1992+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
1993+
'Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml',
1994+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
1995+
'Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml',
1996+
],
1997+
2 : [
1998+
'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
1999+
],
2000+
3 : [
2001+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2002+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2003+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2004+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2005+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2006+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2007+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2008+
],
2009+
4 : [
2010+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2011+
],
2012+
"sim" : [
2013+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2014+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2015+
],
2016+
"reco" : [
2017+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2018+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2019+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2020+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2021+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2022+
],
2023+
"era" : "run3_GEM",
2024+
},
2025+
"M10" : {
2026+
1 : [
2027+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2028+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2029+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2030+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2031+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2032+
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
2033+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2034+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2035+
'Geometry/MuonCommonData/data/rpcf/2023/v4/rpcf.xml',
2036+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2037+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
2038+
'Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml',
2039+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2040+
'Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml',
2041+
],
2042+
2 : [
2043+
'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
2044+
],
2045+
3 : [
2046+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2047+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2048+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2049+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2050+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2051+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2052+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2053+
],
2054+
4 : [
2055+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2056+
],
2057+
"sim" : [
2058+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2059+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2060+
],
2061+
"reco" : [
2062+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2063+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2064+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2065+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2066+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2067+
],
2068+
"era" : "run3_GEM",
2069+
},
2070+
"M11" : {
2071+
1 : [
2072+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2073+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2074+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2075+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2076+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2077+
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
2078+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2079+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2080+
'Geometry/MuonCommonData/data/rpcf/2024/v5/rpcf.xml',
2081+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2082+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
2083+
'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
2084+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2085+
'Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml',
2086+
],
2087+
2 : [
2088+
'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
2089+
],
2090+
3 : [
2091+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2092+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2093+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2094+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2095+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2096+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2097+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2098+
],
2099+
4 : [
2100+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2101+
],
2102+
"sim" : [
2103+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2104+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2105+
],
2106+
"reco" : [
2107+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2108+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2109+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2110+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2111+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2112+
],
2113+
"era" : "run3_GEM",
2114+
},
2115+
"M12" : {
2116+
1 : [
2117+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2118+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2119+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2120+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2121+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2122+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
2123+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2124+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2125+
'Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml',
2126+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2127+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
2128+
'Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml',
2129+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2130+
'Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml',
2131+
],
2132+
2 : [
2133+
'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
2134+
],
2135+
3 : [
2136+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2137+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2138+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2139+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2140+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2141+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2142+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2143+
],
2144+
4 : [
2145+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2146+
],
2147+
"sim" : [
2148+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2149+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2150+
],
2151+
"reco" : [
2152+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2153+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2154+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2155+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2156+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2157+
],
2158+
"era" : "run3_GEM",
2159+
},
19802160
}
19812161

19822162
forwardDict = {
@@ -2191,31 +2371,31 @@
21912371
allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
21922372

21932373
detectorVersionDict = {
2194-
("O6","T3","C3","M5","F1","P7") : "2021",
2195-
("O4","T4","C1","M5","F1","P7") : "2021ZeroMaterial",
2196-
("O5","T5","C1","M5","F1","P7") : "2021FlatMinus05Percent",
2197-
("O5","T6","C1","M5","F1","P7") : "2021FlatMinus10Percent",
2198-
("O5","T7","C1","M5","F1","P7") : "2021FlatPlus05Percent",
2199-
("O5","T8","C1","M5","F1","P7") : "2021FlatPlus10Percent",
2200-
("O6","T3","C2","M6","F3","P7") : "2023",
2201-
("O4","T4","C1","M6","F2","P7") : "2023ZeroMaterial",
2202-
("O5","T5","C1","M6","F2","P7") : "2023FlatMinus05Percent",
2203-
("O5","T6","C1","M6","F2","P7") : "2023FlatMinus10Percent",
2204-
("O5","T7","C1","M6","F2","P7") : "2023FlatPlus05Percent",
2205-
("O5","T8","C1","M6","F2","P7") : "2023FlatPlus10Percent",
2206-
("O6","T3","C2","M7","F3","P7") : "2024",
2207-
("O4","T4","C2","M7","F2","P7") : "2024ZeroMaterial",
2208-
("O5","T5","C2","M7","F2","P7") : "2024FlatMinus05Percent",
2209-
("O5","T6","C2","M7","F2","P7") : "2024FlatMinus10Percent",
2210-
("O5","T7","C2","M7","F2","P7") : "2024FlatPlus05Percent",
2211-
("O5","T8","C2","M7","F2","P7") : "2024FlatPlus10Percent",
2212-
("O7","T3","C2","M8","F3","P7") : "2025",
2213-
("O8","T4","C2","M8","F3","P7") : "2025ZeroMaterial",
2214-
("O9","T5","C2","M8","F3","P7") : "2025FlatMinus05Percent",
2215-
("O9","T6","C2","M8","F3","P7") : "2025FlatMinus10Percent",
2216-
("O9","T7","C2","M8","F3","P7") : "2025FlatPlus05Percent",
2217-
("O9","T8","C2","M8","F3","P7") : "2025FlatPlus10Percent",
2374+
("O6","T3","C3","M9","F1","P7") : "2021",
2375+
("O4","T4","C1","M9","F1","P7") : "2021ZeroMaterial",
2376+
("O5","T5","C1","M9","F1","P7") : "2021FlatMinus05Percent",
2377+
("O5","T6","C1","M9","F1","P7") : "2021FlatMinus10Percent",
2378+
("O5","T7","C1","M9","F1","P7") : "2021FlatPlus05Percent",
2379+
("O5","T8","C1","M9","F1","P7") : "2021FlatPlus10Percent",
2380+
("O6","T3","C2","M10","F3","P7") : "2023",
2381+
("O4","T4","C1","M10","F2","P7") : "2023ZeroMaterial",
2382+
("O5","T5","C1","M10","F2","P7") : "2023FlatMinus05Percent",
2383+
("O5","T6","C1","M10","F2","P7") : "2023FlatMinus10Percent",
2384+
("O5","T7","C1","M10","F2","P7") : "2023FlatPlus05Percent",
2385+
("O5","T8","C1","M10","F2","P7") : "2023FlatPlus10Percent",
2386+
("O6","T3","C2","M11","F3","P7") : "2024",
2387+
("O4","T4","C2","M11","F2","P7") : "2024ZeroMaterial",
2388+
("O5","T5","C2","M11","F2","P7") : "2024FlatMinus05Percent",
2389+
("O5","T6","C2","M11","F2","P7") : "2024FlatMinus10Percent",
2390+
("O5","T7","C2","M11","F2","P7") : "2024FlatPlus05Percent",
2391+
("O5","T8","C2","M11","F2","P7") : "2024FlatPlus10Percent",
2392+
("O7","T3","C2","M12","F3","P7") : "2025",
2393+
("O8","T4","C2","M12","F3","P7") : "2025ZeroMaterial",
2394+
("O9","T5","C2","M12","F3","P7") : "2025FlatMinus05Percent",
2395+
("O9","T6","C2","M12","F3","P7") : "2025FlatMinus10Percent",
2396+
("O9","T7","C2","M12","F3","P7") : "2025FlatPlus05Percent",
2397+
("O9","T8","C2","M12","F3","P7") : "2025FlatPlus10Percent",
22182398
}
22192399

2220-
deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M1" "M2", "M3", "M4",
2221-
"P1", "P2", "P3", "P4", "P5", "P6" ])
2400+
deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M1" "M2", "M3", "M4", "M5"
2401+
"M6", "M7", "M8", "P1", "P2", "P3", "P4", "P5", "P6" ])

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@
243243
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
244244
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246-
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/rpcf.xml'/>
246+
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v6/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249249
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251-
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
251+
<Include ref='Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>
253253
<Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
254254
<Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@
243243
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
244244
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246-
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/rpcf.xml'/>
246+
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v6/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249249
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251-
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
251+
<Include ref='Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>
253253
<Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
254254
<Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@
243243
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
244244
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246-
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/rpcf.xml'/>
246+
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v6/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249249
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251-
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
251+
<Include ref='Geometry/MuonCommonData/data/mfshield/2023/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>
253253
<Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
254254
<Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>

0 commit comments

Comments
 (0)