Backport cms-sw#44493 (Make a new PR to have the geometry scenario Ex…

…tendedGeometry2026D110 which represents T35+C18+M11+I17+O9+F8)

Configuration/Geometry/README.md

@@ -34,14 +34,11 @@ 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
-<<<<<<< HEAD
 * M4: 2025 with additional chambers in GE21 and iRPC
 * M5: Same as M1 with modified RPC
 * M6: Same as M2 with modified RPC
 * M7: Same as M3 with modified RPC
 * M8: Same as M4 with modified RPC
-=======
->>>>>>> e1eee45a5e4 (Backport the PR's 44006 and 44052 for the 2024 scenario definition with additional chambers for GE21 and iRPC)
 
 PPS:
 * P7: 2021 baseline (after removing overlaps and using common materials whenever possible)
@@ -64,17 +61,12 @@ Several detector combinations have been generated:
 * 2021FlatMinus10Percent = T6+C1+M1+P7+O5+F1
 * 2021FlatPlus05Percent = T7+C1+M1+P7+O5+F1
 * 2021FlatPlus10Percent = T8+C1+M1+P7+O5+F1
-<<<<<<< HEAD
 * 2023 = T3+C2+M2+P7+O6+F3
-=======
-* 2023 = T3+C1+M2+P7+O6+F3
->>>>>>> e1eee45a5e4 (Backport the PR's 44006 and 44052 for the 2024 scenario definition with additional chambers for GE21 and iRPC)
 * 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
-<<<<<<< HEAD
 * 2024 = T3+C2+M3+P7+O6+F3
 * 2024ZeroMaterial = T4+C2+M3+P7+O4+F2
 * 2024FlatMinus05Percent = T5+C2+M3+P7+O5+F2
@@ -87,14 +79,6 @@ Several detector combinations have been generated:
 * 2025FlatMinus10Percent = T6+C2+M4+P7+O9+F3
 * 2025FlatPlus05Percent = T7+C2+M4+P7+O9+F3
 * 2025FlatPlus10Percent = T8+C2+M4+P7+O9+F3
-=======
-* 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
->>>>>>> e1eee45a5e4 (Backport the PR's 44006 and 44052 for the 2024 scenario definition with additional chambers for GE21 and iRPC)
 
 # Phase 2 Geometries
 

Configuration/Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py

@@ -0,0 +1,59 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hepExtended2026D110_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = True
+
+# calo
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_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.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.ZdcGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = False
+

Configuration/Geometry/python/GeometryDD4hepExtended2026D110_cff.py

@@ -0,0 +1,17 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D110.xml")
+
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2026D110Reco_cff.py

@@ -0,0 +1,59 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtended2026D110_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = True
+
+# calo
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_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.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.ZdcGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = False
+

Configuration/Geometry/python/GeometryExtended2026D110_cff.py

@@ -0,0 +1,15 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2026D110XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

Configuration/PyReleaseValidation/python/relval_2026.py

@@ -0,0 +1,54 @@
+# import the definition of the steps and input files:
+from  Configuration.PyReleaseValidation.relval_steps import *
+
+# here only define the workflows as a combination of the steps defined above:
+workflows = Matrix()
+
+# each workflow defines a name and a list of steps to be done.
+# if no explicit name/label given for the workflow (first arg),
+# the name of step1 will be used
+
+from Configuration.PyReleaseValidation.relval_upgrade import workflows as _upgrade_workflows
+
+#just define all of them
+
+#2026 WFs to run in IB (TTbar)
+numWFIB = []
+numWFIB.extend([20034.0]) #2026D86
+numWFIB.extend([20834.0]) #2026D88
+numWFIB.extend([22034.0]) #2026D91
+numWFIB.extend([22434.0]) #2026D92
+numWFIB.extend([22834.0]) #2026D93
+numWFIB.extend([23234.0]) #2026D94
+numWFIB.extend([23634.0]) #2026D95
+numWFIB.extend([24034.0]) #2026D96
+numWFIB.extend([24434.0]) #2026D97
+numWFIB.extend([24834.0,24834.911,24834.103]) #2026D98 DDD XML, DD4hep XML, aging
+numWFIB.extend([25061.97]) #2026D98 premixing stage1 (NuGun+PU)
+numWFIB.extend([24834.5,24834.9]) #2026D98 pixelTrackingOnly, vector hits
+numWFIB.extend([24834.501,24834.502]) #2026D98 Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU
+numWFIB.extend([25034.99,25034.999]) #2026D98 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test)
+numWFIB.extend([24834.21,25034.21,25034.9921]) #2026D98 prodlike, prodlike PU, prodlike premix stage1+stage2
+numWFIB.extend([25034.114]) #2026D98 PU, with 10% OT ineffiency 
+numWFIB.extend([25234.0,25234.911]) #2026D99 DDD XML, DD4hep XML
+numWFIB.extend([25634.0]) #2026D100
+numWFIB.extend([26034.0]) #2026D101
+numWFIB.extend([26434.0]) #2026D102
+numWFIB.extend([26834.0]) #2026D103
+numWFIB.extend([27234.0]) #2026D104
+numWFIB.extend([27634.0]) #2026D105
+numWFIB.extend([28034.0]) #2026D106
+numWFIB.extend([28434.0]) #2026D107
+numWFIB.extend([28834.0]) #2026D108
+numWFIB.extend([29234.0]) #2026D109
+numWFIB.extend([29634.0]) #2026D110
+
+#Additional sample for short matrix and IB
+#CloseByPGun for HGCAL
+numWFIB.extend([24896.0]) #CE_E_Front_120um D98
+numWFIB.extend([24900.0]) #CE_H_Coarse_Scint D98
+# NuGun 
+numWFIB.extend([24861.0]) #Nu Gun 2026D98
+
+for numWF in numWFIB:
+    workflows[numWF] = _upgrade_workflows[numWF]