Skip to content

Commit 3afe89a

Browse files
author
Sunanda
committed
Modify the 2024 scenarios for the corrected positions of the GE21 detectors
1 parent 7320a6b commit 3afe89a

13 files changed

+64
-19
lines changed

‎Configuration/Geometry/python/dict2021Geometry.py‎

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@
13941394
muonDict = {
13951395
"abbrev" : "M",
13961396
"name" : "muon",
1397-
"default" : 1,
1397+
"default" : 4,
13981398
"M1" : {
13991399
1 : [
14001400
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
@@ -1530,6 +1530,51 @@
15301530
],
15311531
"era" : "run3_GEM",
15321532
},
1533+
"M4" : {
1534+
1 : [
1535+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
1536+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
1537+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
1538+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
1539+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
1540+
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
1541+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
1542+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
1543+
'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml',
1544+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
1545+
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
1546+
'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
1547+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
1548+
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
1549+
],
1550+
2 : [
1551+
'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
1552+
],
1553+
3 : [
1554+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
1555+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
1556+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
1557+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
1558+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
1559+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
1560+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
1561+
],
1562+
4 : [
1563+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
1564+
],
1565+
"sim" : [
1566+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
1567+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
1568+
],
1569+
"reco" : [
1570+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
1571+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
1572+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
1573+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
1574+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
1575+
],
1576+
"era" : "run3_GEM",
1577+
},
15331578
}
15341579

15351580
forwardDict = {
@@ -1756,12 +1801,12 @@
17561801
("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent",
17571802
("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent",
17581803
("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent",
1759-
("O6","T3","C1","M3","F3","P7") : "2024",
1760-
("O4","T4","C1","M3","F2","P7") : "2024ZeroMaterial",
1761-
("O5","T5","C1","M3","F2","P7") : "2024FlatMinus05Percent",
1762-
("O5","T6","C1","M3","F2","P7") : "2024FlatMinus10Percent",
1763-
("O5","T7","C1","M3","F2","P7") : "2024FlatPlus05Percent",
1764-
("O5","T8","C1","M3","F2","P7") : "2024FlatPlus10Percent",
1804+
("O6","T3","C1","M4","F3","P7") : "2024",
1805+
("O4","T4","C1","M4","F2","P7") : "2024ZeroMaterial",
1806+
("O5","T5","C1","M4","F2","P7") : "2024FlatMinus05Percent",
1807+
("O5","T6","C1","M4","F2","P7") : "2024FlatMinus10Percent",
1808+
("O5","T7","C1","M4","F2","P7") : "2024FlatPlus05Percent",
1809+
("O5","T8","C1","M4","F2","P7") : "2024FlatPlus10Percent",
17651810
}
17661811

17671812
deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3",

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.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/2024/v1/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/2024/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2024/v1/muonNumbering.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.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/2024/v1/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/2024/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2024/v1/muonNumbering.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.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/2024/v1/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/2024/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2024/v1/muonNumbering.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.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/2024/v1/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/2024/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2024/v1/muonNumbering.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.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/2024/v1/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/2024/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2024/v1/muonNumbering.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.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/2024/v1/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/2024/v1/gem21.xml'/>
249+
<Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2024/v1/muonNumbering.xml'/>

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml',
248248
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
249249
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
250-
'Geometry/MuonCommonData/data/gem21/2024/v1/gem21.xml',
250+
'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
251251
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
252252
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
253253
)+

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml',
248248
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
249249
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
250-
'Geometry/MuonCommonData/data/gem21/2024/v1/gem21.xml',
250+
'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
251251
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
252252
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
253253
)+

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml',
248248
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
249249
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
250-
'Geometry/MuonCommonData/data/gem21/2024/v1/gem21.xml',
250+
'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
251251
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
252252
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
253253
)+

0 commit comments

Comments
 (0)