diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index a0b3cab945a94..eaafd36577a64 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -33,8 +33,8 @@ Calorimeters: Muon system: * M1: 2021 baseline with additional chambers in GE21 and iRPC31/41 * M2: 2023 GE21 shifted in position -* M4: 2024 with additional chambers in GE21 and iRPC31 -* M5: 2025 with additional chambers in GE21 and iRPC +* M3: 2024 with additional chambers in GE21 and iRPC31 +* M4: 2025 with additional chambers in GE21 and iRPC PPS: * 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: * O4: as O6, but with zero material * O5: as O6, but with trackermaterial removed (they are in T5, T6, T7, T8) * O6: 2021 baseline +* O7: 2021 with added material for muon shield * F1: 2021 baseline * F2: same as F1 with modified file zdc.xmlfrom ZDC group * F3: same as F2 with added simulti geometry for RPD Several detector combinations have been generated: -* 2021 = T3+C1+M1+P7+O6+F1 +* 2021 = T3+C3+M1+P7+O6+F1 * 2021ZeroMaterial = T4+C1+M1+P7+O4+F1 * 2021FlatMinus05Percent = T5+C1+M1+P7+O5+F1 * 2021FlatMinus10Percent = T6+C1+M1+P7+O5+F1 * 2021FlatPlus05Percent = T7+C1+M1+P7+O5+F1 * 2021FlatPlus10Percent = T8+C1+M1+P7+O5+F1 -* 2023 = T3+C1+M2+P7+O6+F3 +* 2023 = T3+C2+M2+P7+O6+F3 * 2023ZeroMaterial = T4+C1+M2+P7+O4+F2 * 2023FlatMinus05Percent = T5+C1+M2+P7+O5+F2 * 2023FlatMinus10Percent = T6+C1+M2+P7+O5+F2 * 2023FlatPlus05Percent = T7+C1+M2+P7+O5+F2 * 2023FlatPlus10Percent = T8+C1+M2+P7+O5+F2 -* 2024 = T3+C1+M3+P7+O6+F3 -* 2024ZeroMaterial = T4+C1+M3+P7+O4+F2 -* 2024FlatMinus05Percent = T5+C1+M3+P7+O5+F2 -* 2024FlatMinus10Percent = T6+C1+M3+P7+O5+F2 -* 2024FlatPlus05Percent = T7+C1+M3+P7+O5+F2 -* 2024FlatPlus10Percent = T8+C1+M3+P7+O5+F2 +* 2024 = T3+C2+M3+P7+O6+F3 +* 2024ZeroMaterial = T4+C2+M3+P7+O4+F2 +* 2024FlatMinus05Percent = T5+C2+M3+P7+O5+F2 +* 2024FlatMinus10Percent = T6+C2+M3+P7+O5+F2 +* 2024FlatPlus05Percent = T7+C2+M3+P7+O5+F2 +* 2024FlatPlus10Percent = T8+C2+M3+P7+O5+F2 +* 2025 = T3+C2+M4+P7+O7+F3 # Phase 2 Geometries diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index 24eda0dcbaabd..0d8bf28a26ce4 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -87,6 +87,34 @@ ], "era" : "run3_common, stage2L1Trigger_2021", }, + "O7" : { + 1 : [ + 'Geometry/CMSCommonData/data/materials/2021/v4/materials.xml', + 'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml', + 'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml', + 'Geometry/CMSCommonData/data/cms/2021/v3/cms.xml', + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + 'Geometry/CMSCommonData/data/caloBase/2017/v1/caloBase.xml', + 'Geometry/CMSCommonData/data/cmsCalo.xml', + 'Geometry/CMSCommonData/data/muonBase/2018/v1/muonBase.xml', + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/beampipe/2021/v1/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam/2021/v1/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml', + 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', + ], + 5 : [ + 'Geometry/CMSCommonData/data/FieldParameters.xml', + ], + "era" : "run3_common, stage2L1Trigger_2021", + }, } trackerDict = { @@ -1624,7 +1652,7 @@ ], "era" : "run3_GEM", }, - "M4" : { + "M3" : { 1 : [ 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', @@ -1669,14 +1697,14 @@ ], "era" : "run3_GEM", }, - "M5" : { + "M4" : { 1 : [ 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', 'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml', 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', - 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', + 'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml', @@ -1940,14 +1968,14 @@ ("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent", ("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent", ("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent", - ("O6","T3","C2","M4","F3","P7") : "2024", - ("O4","T4","C2","M4","F2","P7") : "2024ZeroMaterial", - ("O5","T5","C2","M4","F2","P7") : "2024FlatMinus05Percent", - ("O5","T6","C2","M4","F2","P7") : "2024FlatMinus10Percent", - ("O5","T7","C2","M4","F2","P7") : "2024FlatPlus05Percent", - ("O5","T8","C2","M4","F2","P7") : "2024FlatPlus10Percent", - ("O6","T3","C2","M5","F3","P7") : "2025", + ("O6","T3","C2","M3","F3","P7") : "2024", + ("O4","T4","C2","M3","F2","P7") : "2024ZeroMaterial", + ("O5","T5","C2","M3","F2","P7") : "2024FlatMinus05Percent", + ("O5","T6","C2","M3","F2","P7") : "2024FlatMinus10Percent", + ("O5","T7","C2","M3","F2","P7") : "2024FlatPlus05Percent", + ("O5","T8","C2","M3","F2","P7") : "2024FlatPlus10Percent", + ("O7","T3","C2","M4","F3","P7") : "2025", } -deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M3", "P1", "P2", - "P3", "P4", "P5", "P6" ]) +deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", + "P4", "P5", "P6" ]) diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml index 2e4f8f69c5c96..a664d0bd524a7 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml @@ -4,7 +4,7 @@ - + @@ -240,7 +240,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py index cdb94072f1544..f2c4df03ec1db 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py @@ -5,7 +5,7 @@ XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml', + 'Geometry/CMSCommonData/data/materials/2021/v4/materials.xml', 'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml', @@ -241,7 +241,7 @@ 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', 'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml', 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', - 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', + 'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', 'Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml',