Merge pull request #46705 from bsunanda/Run3-hcx379

Run3-hcx379 First version of 2025 scenario - still needed the correct PPS geometry with the needed rotation

Configuration/Geometry/README.md

@@ -33,7 +33,8 @@ Calorimeters:
 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: 2024 with additional chambers in GE21 and iRPC31
+* M5: 2025 with additional chambers in GE21 and iRPC
 
 PPS:
 * P7: 2021 baseline (after removing overlaps and using common materials whenever possible)

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

@@ -1624,7 +1624,7 @@
         ],
         "era" : "run3_GEM",
     },
-    "M3" : {
+    "M4" : {
         1 : [
             'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
             'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
@@ -1637,7 +1637,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',
         ],
@@ -1669,7 +1669,7 @@
         ],
         "era" : "run3_GEM",
     },
-    "M4" : {
+    "M5" : {
         1 : [
             'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
             'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
@@ -1679,10 +1679,10 @@
             'Geometry/MuonCommonData/data/mb4Shield/2021/v1/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',
         ],
@@ -1946,7 +1946,8 @@
     ("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",
  }
 
-deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", 
-                          "P4", "P5", "P6" ])
+deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M3", "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',