Merge pull request #33343 from bsunanda/Phase2-gex64

Phase2-gex64 Make a scenario with V14 version of HGCal and HFNose

Configuration/Geometry/README.md

@@ -59,6 +59,7 @@ Calorimeters:
 * C12: HGCal (as in C11) + HFNose with corrected wafer size + Phase2 HCAL and EB
 * C13: HGCal (reading the constants of the flat file and made provision to be used downstream) + Phase2 HCAL and EB
 * C14: HGCal (reading the constants of the flat file and use it to create geometry) + Phase2 HCAL and EB
+* C15: HGCal (as in C14) + HFNose with corrected wafer size  + Phase2 HCAL and EB
 
 Muon system:
 * M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields
@@ -83,6 +84,7 @@ The script also handles the common and forward elements of the geometry:
 * F4: same as F2 but with modifications needed to forward shield
 * F5: same as F4 but changes due to HFNose
 * F6: same as F4 with modifications needed for BRM and forward shield
+* F7: same as F6 with modifications needed for HFNose
 
 Several detector combinations have been generated:
 * D49 = T15+C9+M4+I10+O4+F2 (HLT TDR baseline)
@@ -95,3 +97,4 @@ Several detector combinations have been generated:
 * D79 = T23+C14+M9+I13+O7+F6
 * D80 = T25+C14+M9+I13+O7+F6
 * D81 = T26+C14+M9+I13+O7+F6
+* D82 = T21+C15+M9+I13+O7+F7

Configuration/Geometry/python/GeometryDD4hepExtended2026D82Reco_cff.py

@@ -0,0 +1,62 @@
+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.GeometryDD4hepExtended2026D82_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 = cms.bool(False)
+
+# calo
+from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.HFNoseTopology_cfi import *
+from Geometry.ForwardGeometry.HFNoseGeometryESProducer_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",
+                                "HGCalHFNoseSensitive",
+    )
+)
+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_cfi import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_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 = cms.bool(False)
+

Configuration/Geometry/python/GeometryDD4hepExtended2026D82_cff.py

@@ -0,0 +1,18 @@
+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/cmsExtendedGeometry2026D82.xml")
+
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi 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.ForwardCommonData.hfnoseParametersInitialization_cfi import *
+from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi  import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

Configuration/Geometry/python/GeometryExtended2026D82Reco_cff.py

@@ -0,0 +1,62 @@
+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.GeometryExtended2026D82_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 = cms.bool(False)
+
+# calo
+from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.HFNoseTopology_cfi import *
+from Geometry.ForwardGeometry.HFNoseGeometryESProducer_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",
+                                "HGCalHFNoseSensitive",
+    )
+)
+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_cfi import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_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 = cms.bool(False)
+

Configuration/Geometry/python/GeometryExtended2026D82_cff.py

@@ -0,0 +1,16 @@
+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.cmsExtendedGeometry2026D82XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi 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.ForwardCommonData.hfnoseParametersInitialization_cfi import *
+from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi  import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

Configuration/Geometry/python/dict2026Geometry.py

@@ -85,60 +85,6 @@
         ],
         "era" : "phase2_common, phase2_trigger",
     },
-    "O5" : {
-        1 : [
-            'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
-            'Geometry/CMSCommonData/data/rotations.xml',
-            'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-            'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
-            'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
-            'Geometry/CMSCommonData/data/cmsMother.xml',
-            'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-            'Geometry/CMSCommonData/data/cmsTracker.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
-            'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
-            'Geometry/CMSCommonData/data/cmsMuon.xml',
-            'Geometry/CMSCommonData/data/mgnt.xml',
-            'Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml',
-            'Geometry/CMSCommonData/data/cmsBeam/2026/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" : "phase2_common, phase2_trigger",
-    },
-    "O6" : {
-        1 : [
-            'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
-            'Geometry/CMSCommonData/data/rotations.xml',
-            'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-            'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
-            'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml',
-            'Geometry/CMSCommonData/data/cmsMother.xml',
-            'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-            'Geometry/CMSCommonData/data/cmsTracker.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v4/caloBase.xml',
-            'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml',
-            'Geometry/CMSCommonData/data/cmsMuon.xml',
-            'Geometry/CMSCommonData/data/mgnt.xml',
-            'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml',
-            'Geometry/CMSCommonData/data/cmsBeam/2026/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" : "phase2_common, phase2_trigger",
-    },
     "O7" : {
         1 : [
             'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
@@ -801,6 +747,92 @@
         ],
         "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose",
     },
+    "C15" : {
+        1 : [
+            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/ebalgo.xml',
+            'Geometry/EcalCommonData/data/ebcon.xml',
+            'Geometry/EcalCommonData/data/ebrot.xml',
+            'Geometry/HcalCommonData/data/hcalrotations.xml',
+            'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+            'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+            'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+            'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+            'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+            'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+            'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+            'Geometry/HGCalCommonData/data/hgcal/v14/hgcal.xml',
+            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
+            'Geometry/HGCalCommonData/data/hgcalEE/v14/hgcalEE.xml',
+            'Geometry/HGCalCommonData/data/hgcalHEsil/v14/hgcalHEsil.xml',
+            'Geometry/HGCalCommonData/data/hgcalHEmix/v14/hgcalHEmix.xml',
+            'Geometry/HGCalCommonData/data/hgcalCons/v14/hgcalCons.xml',
+            'Geometry/HGCalCommonData/data/hgcalConsData/v13/hgcalConsData.xml',
+            'Geometry/ForwardCommonData/data/hfnose/v3/hfnose.xml',
+            'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
+            'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+            'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
+            'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
+        ],
+        3 : [
+            'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+            'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hfpmt.xml',
+            'Geometry/HcalSimData/data/hffibrebundle.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml',
+            'Geometry/HGCalSimData/data/hgcsensv9.xml',
+            'Geometry/ForwardSimData/data/hfnosesens.xml',
+        ],
+        4 : [
+            'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml',
+            'Geometry/EcalSimData/data/EcalProdCuts.xml',
+            'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
+            'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
+        ],
+        "sim" : [
+            '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.ForwardCommonData.hfnoseParametersInitialization_cfi import *',
+            'from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi  import *',
+        ],
+        "reco" : [
+            'from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *',
+            'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
+            'from Geometry.CaloEventSetup.HFNoseTopology_cfi import *',
+            'from Geometry.ForwardGeometry.HFNoseGeometryESProducer_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",',
+            '                                "HGCalHFNoseSensitive",',
+            '    )',
+            ')',
+            '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 *',
+        ],
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose",
+    },
 
 }
 
@@ -1103,6 +1135,31 @@
             'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
         ]
     },
+    "F7" : {
+        1 : [
+            'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
+            'Geometry/ForwardCommonData/data/brmrotations.xml',
+            'Geometry/ForwardCommonData/data/brm/2026/v3/brm.xml',
+            'Geometry/ForwardCommonData/data/zdcmaterials.xml',
+            'Geometry/ForwardCommonData/data/lumimaterials.xml',
+            'Geometry/ForwardCommonData/data/zdcrotations.xml',
+            'Geometry/ForwardCommonData/data/lumirotations.xml',
+            'Geometry/ForwardCommonData/data/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi.xml',
+            'Geometry/ForwardCommonData/data/cmszdc.xml',
+        ],
+        3 : [
+            'Geometry/ForwardCommonData/data/brmsens.xml',
+            'Geometry/ForwardSimData/data/zdcsens.xml',
+        ],
+        4 : [
+            'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+            'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        ],
+        "reco" :[
+            'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
+        ]
+    },
 }
 
 timingDict = {
@@ -1208,6 +1265,7 @@
     ("O7","T23","C14","M9","F6","I13") : "D79",
     ("O7","T25","C14","M9","F6","I13") : "D80",
     ("O7","T26","C14","M9","F6","I13") : "D81",
+    ("O7","T21","C15","M9","F7","I13") : "D82",
  }
 
 deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75"])

Configuration/PyReleaseValidation/python/relval_2026.py

@@ -30,6 +30,7 @@
 numWFIB.extend([35834.0]) #2026D79
 numWFIB.extend([36234.0]) #2026D80
 numWFIB.extend([36634.0]) #2026D81
+numWFIB.extend([37034.0]) #2026D82
 
 for numWF in numWFIB:
     workflows[numWF] = _upgrade_workflows[numWF]