Add the 2025 scenario after correcting for the DT Shield (backport of c…

…ms-sw#46705 and cms-sw#46784)

Configuration/Geometry/README.md

@@ -34,6 +34,7 @@ Muon system:
 * M1: 2021 baseline with additional chambers in GE21 and iRPC31/41
 * M2: 2023 GE21 shifted in position
 * 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)
@@ -42,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
 

Configuration/Geometry/python/GeometryDD4hepExtended2025Reco_cff.py

@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hepExtended2025_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+
+# calo
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "EcalEndcap",
+                                "EcalPreshower",
+                                "TOWER",
+    )
+)
+from Geometry.EcalAlgo.EcalGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+
+# pps
+
+

Configuration/Geometry/python/GeometryDD4hepExtended2025_cff.py

@@ -0,0 +1,15 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hep_cff import *
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml")
+
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+

Configuration/Geometry/python/GeometryExtended2025Reco_cff.py

@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtended2025_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+
+# calo
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "EcalEndcap",
+                                "EcalPreshower",
+                                "TOWER",
+    )
+)
+from Geometry.EcalAlgo.EcalGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+
+# pps
+
+

Configuration/Geometry/python/GeometryExtended2025_cff.py

@@ -0,0 +1,13 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2025XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+

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 = {
@@ -1637,7 +1665,7 @@
             'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/2024/v1/gem21.xml',
+            'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
             'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
             'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
         ],
@@ -1676,13 +1704,13 @@
             '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/2024/v1/rpcf.xml',
+            'Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
+            'Geometry/MuonCommonData/data/gem21/2025/v1/gem21.xml',
             'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
             'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
         ],
@@ -1940,13 +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","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", "P1", "P2", "P3", 
+deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3",
                           "P4", "P5", "P6" ])

Configuration/StandardSequences/python/GeometryConf.py

@@ -72,6 +72,8 @@
     'DD4hepExtended2024FlatPlus05Percent' : 'DD4hepExtended2024FlatPlus05Percent,DD4hepExtended2024FlatPls05PercentReco',
     'Extended2024FlatPlus10Percent' : 'Extended2024FlatPlus10Percent,Extended2024FlatPlus10PercentReco',
     'DD4hepExtended2024FlatPlus10Percent' : 'DD4hepExtended2024FlatPlus10Percent,DD4hepExtended2024FlatPlus10PercentReco',
+    'Extended2025'   : 'Extended2025,Extended2025Reco',
+    'DD4hepExtended2025'   : 'DD4hepExtended2025,DD4hepExtended2025Reco',
     'All'         : 'Configuration.Geometry.GeometrySimAll_cff,Reco',
     'ECALHCAL'    : 'Configuration.Geometry.GeometrySimECALHCAL_cff,Configuration.Geometry.GeometryRecoECALHCAL_cff',
     'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff',