Skip to content

Commit afe48e8

Browse files
authored
Merge pull request cms-sw#43032 from bsunanda/Run3-gex172
Run3-gex172 Update 2021 and 2023 scenarios with the corrected geometry for the GE21 demonstration chamber
2 parents e65fc7a + d6d01c8 commit afe48e8

25 files changed

+26
-26
lines changed

Configuration/Geometry/python/dict2021Geometry.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@
14021402
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
14031403
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
14041404
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
1405-
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
1405+
'Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml',
14061406
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
14071407
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
14081408
],
@@ -1447,7 +1447,7 @@
14471447
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
14481448
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
14491449
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
1450-
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
1450+
'Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml',
14511451
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
14521452
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
14531453
],

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248248
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
249-
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
252252
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>

0 commit comments

Comments
 (0)