Skip to content

Commit 06a67de

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46784 from bsunanda/Run3-hcx380
Run3-hcx380 Correct the scenario for 2025 by including the DT shield
2 parents df6935a + 9ce6ccb commit 06a67de

File tree

4 files changed

+56
-26
lines changed

4 files changed

+56
-26
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Calorimeters:
3333
Muon system:
3434
* M1: 2021 baseline with additional chambers in GE21 and iRPC31/41
3535
* M2: 2023 GE21 shifted in position
36-
* M4: 2024 with additional chambers in GE21 and iRPC31
37-
* M5: 2025 with additional chambers in GE21 and iRPC
36+
* M3: 2024 with additional chambers in GE21 and iRPC31
37+
* M4: 2025 with additional chambers in GE21 and iRPC
3838

3939
PPS:
4040
* P7: 2021 baseline (after removing overlaps and using common materials whenever possible)
@@ -43,29 +43,31 @@ The script also handles the common and forward elements of the geometry:
4343
* O4: as O6, but with zero material
4444
* O5: as O6, but with trackermaterial removed (they are in T5, T6, T7, T8)
4545
* O6: 2021 baseline
46+
* O7: 2021 with added material for muon shield
4647
* F1: 2021 baseline
4748
* F2: same as F1 with modified file zdc.xmlfrom ZDC group
4849
* F3: same as F2 with added simulti geometry for RPD
4950

5051
Several detector combinations have been generated:
51-
* 2021 = T3+C1+M1+P7+O6+F1
52+
* 2021 = T3+C3+M1+P7+O6+F1
5253
* 2021ZeroMaterial = T4+C1+M1+P7+O4+F1
5354
* 2021FlatMinus05Percent = T5+C1+M1+P7+O5+F1
5455
* 2021FlatMinus10Percent = T6+C1+M1+P7+O5+F1
5556
* 2021FlatPlus05Percent = T7+C1+M1+P7+O5+F1
5657
* 2021FlatPlus10Percent = T8+C1+M1+P7+O5+F1
57-
* 2023 = T3+C1+M2+P7+O6+F3
58+
* 2023 = T3+C2+M2+P7+O6+F3
5859
* 2023ZeroMaterial = T4+C1+M2+P7+O4+F2
5960
* 2023FlatMinus05Percent = T5+C1+M2+P7+O5+F2
6061
* 2023FlatMinus10Percent = T6+C1+M2+P7+O5+F2
6162
* 2023FlatPlus05Percent = T7+C1+M2+P7+O5+F2
6263
* 2023FlatPlus10Percent = T8+C1+M2+P7+O5+F2
63-
* 2024 = T3+C1+M3+P7+O6+F3
64-
* 2024ZeroMaterial = T4+C1+M3+P7+O4+F2
65-
* 2024FlatMinus05Percent = T5+C1+M3+P7+O5+F2
66-
* 2024FlatMinus10Percent = T6+C1+M3+P7+O5+F2
67-
* 2024FlatPlus05Percent = T7+C1+M3+P7+O5+F2
68-
* 2024FlatPlus10Percent = T8+C1+M3+P7+O5+F2
64+
* 2024 = T3+C2+M3+P7+O6+F3
65+
* 2024ZeroMaterial = T4+C2+M3+P7+O4+F2
66+
* 2024FlatMinus05Percent = T5+C2+M3+P7+O5+F2
67+
* 2024FlatMinus10Percent = T6+C2+M3+P7+O5+F2
68+
* 2024FlatPlus05Percent = T7+C2+M3+P7+O5+F2
69+
* 2024FlatPlus10Percent = T8+C2+M3+P7+O5+F2
70+
* 2025 = T3+C2+M4+P7+O7+F3
6971

7072
# Phase 2 Geometries
7173

‎Configuration/Geometry/python/dict2021Geometry.py‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,34 @@
8787
],
8888
"era" : "run3_common, stage2L1Trigger_2021",
8989
},
90+
"O7" : {
91+
1 : [
92+
'Geometry/CMSCommonData/data/materials/2021/v4/materials.xml',
93+
'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
94+
'Geometry/CMSCommonData/data/rotations.xml',
95+
'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
96+
'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
97+
'Geometry/CMSCommonData/data/cms/2021/v3/cms.xml',
98+
'Geometry/CMSCommonData/data/cmsMother.xml',
99+
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
100+
'Geometry/CMSCommonData/data/cmsTracker.xml',
101+
'Geometry/CMSCommonData/data/caloBase/2017/v1/caloBase.xml',
102+
'Geometry/CMSCommonData/data/cmsCalo.xml',
103+
'Geometry/CMSCommonData/data/muonBase/2018/v1/muonBase.xml',
104+
'Geometry/CMSCommonData/data/cmsMuon.xml',
105+
'Geometry/CMSCommonData/data/mgnt.xml',
106+
'Geometry/CMSCommonData/data/beampipe/2021/v1/beampipe.xml',
107+
'Geometry/CMSCommonData/data/cmsBeam/2021/v1/cmsBeam.xml',
108+
'Geometry/CMSCommonData/data/muonMB.xml',
109+
'Geometry/CMSCommonData/data/muonMagnet.xml',
110+
'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
111+
'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
112+
],
113+
5 : [
114+
'Geometry/CMSCommonData/data/FieldParameters.xml',
115+
],
116+
"era" : "run3_common, stage2L1Trigger_2021",
117+
},
90118
}
91119

92120
trackerDict = {
@@ -1624,7 +1652,7 @@
16241652
],
16251653
"era" : "run3_GEM",
16261654
},
1627-
"M4" : {
1655+
"M3" : {
16281656
1 : [
16291657
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
16301658
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
@@ -1669,14 +1697,14 @@
16691697
],
16701698
"era" : "run3_GEM",
16711699
},
1672-
"M5" : {
1700+
"M4" : {
16731701
1 : [
16741702
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
16751703
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
16761704
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
16771705
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
16781706
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
1679-
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
1707+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
16801708
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
16811709
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
16821710
'Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml',
@@ -1940,14 +1968,14 @@
19401968
("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent",
19411969
("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent",
19421970
("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent",
1943-
("O6","T3","C2","M4","F3","P7") : "2024",
1944-
("O4","T4","C2","M4","F2","P7") : "2024ZeroMaterial",
1945-
("O5","T5","C2","M4","F2","P7") : "2024FlatMinus05Percent",
1946-
("O5","T6","C2","M4","F2","P7") : "2024FlatMinus10Percent",
1947-
("O5","T7","C2","M4","F2","P7") : "2024FlatPlus05Percent",
1948-
("O5","T8","C2","M4","F2","P7") : "2024FlatPlus10Percent",
1949-
("O6","T3","C2","M5","F3","P7") : "2025",
1971+
("O6","T3","C2","M3","F3","P7") : "2024",
1972+
("O4","T4","C2","M3","F2","P7") : "2024ZeroMaterial",
1973+
("O5","T5","C2","M3","F2","P7") : "2024FlatMinus05Percent",
1974+
("O5","T6","C2","M3","F2","P7") : "2024FlatMinus10Percent",
1975+
("O5","T7","C2","M3","F2","P7") : "2024FlatPlus05Percent",
1976+
("O5","T8","C2","M3","F2","P7") : "2024FlatPlus10Percent",
1977+
("O7","T3","C2","M4","F3","P7") : "2025",
19501978
}
19511979

1952-
deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M3", "P1", "P2",
1953-
"P3", "P4", "P5", "P6" ])
1980+
deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3",
1981+
"P4", "P5", "P6" ])

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.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/2025/v1/rpcf.xml'/>

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_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/2025/v1/rpcf.xml',

0 commit comments

Comments
 (0)