Skip to content

Commit 2f90e0b

Browse files
author
Sunanda
committed
Make appropriate correction to include the missing GE11 chamer in te 2025 simulation geometry description
1 parent e981b15 commit 2f90e0b

File tree

5 files changed

+1769
-4
lines changed

5 files changed

+1769
-4
lines changed

Configuration/Geometry/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Muon system:
4747
* M14: Same as M10 with modified DTShield
4848
* M15: Same as M11 with modified DTShield
4949
* M16: Same as M12 with unmounted GE11 for 2025
50+
* M17: Same as M16 where the list of unmounted GE11 is correctd
5051

5152
PPS:
5253
* P7: 2021 baseline (after removing overlaps and using common materials whenever possible)
@@ -82,7 +83,7 @@ Several detector combinations have been generated:
8283
* 2024FlatMinus10Percent = T6+C2+M11+P7+O5+F2
8384
* 2024FlatPlus05Percent = T7+C2+M11+P7+O5+F2
8485
* 2024FlatPlus10Percent = T8+C2+M11+P7+O5+F2
85-
* 2025 = T3+C2+M16+P8+O7+F3
86+
* 2025 = T3+C2+M17+P8+O7+F3
8687
* 2025ZeroMaterial = T4+C2+M12+P8+O8+F3
8788
* 2025FlatMinus05Percent = T5+C2+M12+P8+O9+F3
8889
* 2025FlatMinus10Percent = T6+C2+M12+P8+O9+F3

Configuration/Geometry/python/dict2021Geometry.py

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2337,6 +2337,51 @@
23372337
],
23382338
"era" : "run3_GEM",
23392339
},
2340+
"M17" : {
2341+
1 : [
2342+
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
2343+
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
2344+
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
2345+
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
2346+
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
2347+
'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml',
2348+
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
2349+
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
2350+
'Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml',
2351+
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
2352+
'Geometry/MuonCommonData/data/gem11/2025/v3/gem11.xml',
2353+
'Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml',
2354+
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
2355+
'Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml',
2356+
],
2357+
2 : [
2358+
'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
2359+
],
2360+
3 : [
2361+
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
2362+
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
2363+
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
2364+
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
2365+
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
2366+
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
2367+
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
2368+
],
2369+
4 : [
2370+
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
2371+
],
2372+
"sim" : [
2373+
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
2374+
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
2375+
],
2376+
"reco" : [
2377+
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
2378+
'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
2379+
'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *',
2380+
'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
2381+
'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
2382+
],
2383+
"era" : "run3_GEM",
2384+
},
23402385
}
23412386

23422387
forwardDict = {
@@ -2667,7 +2712,7 @@
26672712
("O5","T6","C2","M11","F2","P7") : "2024FlatMinus10Percent",
26682713
("O5","T7","C2","M11","F2","P7") : "2024FlatPlus05Percent",
26692714
("O5","T8","C2","M11","F2","P7") : "2024FlatPlus10Percent",
2670-
("O7","T3","C2","M16","F3","P8") : "2025",
2715+
("O7","T3","C2","M17","F3","P8") : "2025",
26712716
("O8","T4","C2","M12","F3","P8") : "2025ZeroMaterial",
26722717
("O9","T5","C2","M12","F3","P8") : "2025FlatMinus05Percent",
26732718
("O9","T6","C2","M12","F3","P8") : "2025FlatMinus10Percent",

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
246246
<Include ref='Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml'/>
247247
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
248-
<Include ref='Geometry/MuonCommonData/data/gem11/2025/v2/gem11.xml'/>
248+
<Include ref='Geometry/MuonCommonData/data/gem11/2025/v3/gem11.xml'/>
249249
<Include ref='Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml'/>
250250
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
251251
<Include ref='Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml'/>

Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py

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

0 commit comments

Comments
 (0)