diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index 0ce55a3ded22f..9b24c4fcca572 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -3,115 +3,7 @@ commonDict = { "abbrev" : "O", "name" : "common", - "default" : 7, - "O4" : { - 1 : [ - 'Geometry/CMSCommonData/data/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/v3/cms.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2026/v1/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", - }, - "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', - '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/v5/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", - }, + "default" : 9, "O8" : { 1 : [ 'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml', @@ -434,14 +326,14 @@ caloDict = { "abbrev" : "C", "name" : "calo", - "default" : 14, - "C9" : { + "default" : 18, + "C17" : { 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/ectkcablemat/2026/v2/ectkcablemat.xml', 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', + 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', 'Geometry/EcalCommonData/data/ebrot.xml', 'Geometry/HcalCommonData/data/hcalrotations.xml', 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', @@ -449,17 +341,18 @@ 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', + 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalConsData/v16/hgcalConsData.xml', ], 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', @@ -467,18 +360,18 @@ 'Geometry/HcalSimData/data/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2026/v2/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', ], 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', + 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', ], "sim" : [ 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', + 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' ], "reco" : [ @@ -506,118 +399,34 @@ 'from Geometry.EcalMapping.EcalMapping_cfi import *', 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11", + "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", }, - "C10" : { + "C18" : { 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/ectkcablemat/2026/v2/ectkcablemat.xml', 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', + 'Geometry/EcalCommonData/data/ebcon/2021/v1/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/v11/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.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.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_hfnose", - }, - "C11" : { - 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.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/v12/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v12/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v12/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v12/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v12/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', ], 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', @@ -625,18 +434,18 @@ 'Geometry/HcalSimData/data/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2026/v2/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', ], 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', + 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', ], "sim" : [ 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', + 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' ], "reco" : [ @@ -664,34 +473,33 @@ '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", + "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", }, - "C13" : { + "C19" : { 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/ectkcablemat/2026/v2/ectkcablemat.xml', 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', + 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', 'Geometry/EcalCommonData/data/ebrot.xml', 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.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/v13/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v12/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v12/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v12/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v13/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v13/hgcalConsData.xml', + 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', ], 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', @@ -699,18 +507,18 @@ 'Geometry/HcalSimData/data/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2026/v2/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv17n.xml', ], 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', + 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', ], "sim" : [ 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', + 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' ], "reco" : [ @@ -738,17 +546,18 @@ '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", + "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", }, - "C14" : { + "C20" : { 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/ectkcablemat/2026/v2/ectkcablemat.xml', 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', + 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', 'Geometry/EcalCommonData/data/ebrot.xml', 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', @@ -756,16 +565,20 @@ '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/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', + 'Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml', + 'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml', + 'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml', + 'Geometry/ForwardCommonData/data/hfnoseLayer/v2/hfnoseLayer.xml', + 'Geometry/ForwardCommonData/data/hfnoseCons/v1m/hfnoseCons.xml', ], 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', @@ -773,23 +586,29 @@ 'Geometry/HcalSimData/data/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', + 'Geometry/ForwardSimData/data/hfnosesens.xml', ], 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', + 'Geometry/HGCalSimData/data/hgcProdCutsv15.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.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', + 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *', + 'from Geometry.ForwardCommonData.hfnoseV15ParametersInitialization_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",', @@ -799,7 +618,8 @@ ' "TOWER",', ' "HGCalEESensitive",', ' "HGCalHESiliconSensitive",', - ' "HGCalHEScintillatorSensitive"', + ' "HGCalHEScintillatorSensitive",', + ' "HGCalHFNoseSensitive",', ' )', ')', 'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *', @@ -812,474 +632,7 @@ '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", - }, - "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/2021/v1/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/v4/hfnose.xml', - 'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml', - 'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml', - 'Geometry/ForwardCommonData/data/hfnoseLayer/v2/hfnoseLayer.xml', - 'Geometry/ForwardCommonData/data/hfnoseCons/v1m/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", - }, - "C16" : { - 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/2021/v1/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.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/v15/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v15/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v15/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v15/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v15/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v15/hgcalConsData.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/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv15.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalV9Topology_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 *', - ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose", - }, - "C17" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/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.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v16/hgcalConsData.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/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv15.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalV9Topology_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 *', - ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", - }, - "C18" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.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/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.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/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv15.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalV9Topology_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 *', - ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", - }, - "C19" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.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/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.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/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv17n.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalV9Topology_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 *', - ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", - }, - "C20" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.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/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', - 'Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml', - 'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml', - 'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml', - 'Geometry/ForwardCommonData/data/hfnoseLayer/v2/hfnoseLayer.xml', - 'Geometry/ForwardCommonData/data/hfnoseCons/v1m/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/hgcsensv15.xml', - 'Geometry/ForwardSimData/data/hfnosesens.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - 'Geometry/ForwardSimData/data/hfnoseProdCuts.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *', - 'from Geometry.ForwardCommonData.hfnoseV15ParametersInitialization_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_hgcalV16, phase2_hfnose", + "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", }, } @@ -1287,7 +640,7 @@ muonDict = { "abbrev" : "M", "name" : "muon", - "default" : 9, + "default" : 10, "M4" : { 1 : [ 'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml', @@ -1527,7 +880,7 @@ forwardDict = { "abbrev" : "F", "name" : "forward", - "default" : 8, + "default" : 6, "F2" : { 1 : [ 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', @@ -1682,7 +1035,7 @@ timingDict = { "abbrev" : "I", "name" : "timing", - "default" : 13, + "default" : 15, "I10" : { 1 : [ 'Geometry/MTDCommonData/data/btl.xml', diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml index 86038120154e4..49aa1c89a238c 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml @@ -115,7 +115,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml index ea8d6a5d8f17e..f73a790675575 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml @@ -115,7 +115,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml index 54d7c0af089fa..f79dee233547e 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml @@ -114,7 +114,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml index d150077c18df2..263823f1accb5 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml @@ -115,7 +115,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml index 11c3b4c7472de..689625f7fddd0 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml @@ -114,7 +114,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml index 0a8d1931d8891..e722b91ed65dc 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml @@ -118,7 +118,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml index 7cde032a3a8d5..ac1201fd7c6d7 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml @@ -115,7 +115,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml index 3356afb54da61..344a06a8de353 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml @@ -115,7 +115,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py index 77af35b15adfe..4154669cc1009 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py @@ -118,7 +118,7 @@ 'Geometry/ForwardCommonData/data/brmsens.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v2/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py index c8310ee7c738d..684b7f9b26c28 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D88XML_cfi.py @@ -118,7 +118,7 @@ 'Geometry/ForwardCommonData/data/brmsens.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v2/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py index 4623dfeb053e5..8fc85fe3b881e 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D91XML_cfi.py @@ -117,7 +117,7 @@ 'Geometry/ForwardCommonData/data/brmsens.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v2/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py index 2b565d62e3c1b..88e155f015ee0 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D92XML_cfi.py @@ -118,7 +118,7 @@ 'Geometry/ForwardCommonData/data/brmsens.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v2/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py index cf73b114028d7..0940c5e0991f4 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D93XML_cfi.py @@ -117,7 +117,7 @@ 'Geometry/ForwardCommonData/data/brmsens.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v2/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py index 10af3db77e923..c47d6aaeb0816 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D94XML_cfi.py @@ -121,7 +121,7 @@ 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v2/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/ForwardSimData/data/hfnoseProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py index 3ca5f487a1d2e..27f1baf041ca4 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py @@ -118,7 +118,7 @@ 'Geometry/ForwardCommonData/data/brmsens.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v4/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py index 4eaf6fae7d3bf..6baea1568f62b 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py @@ -118,7 +118,7 @@ 'Geometry/ForwardCommonData/data/brmsens.xml', 'Geometry/ForwardSimData/data/zdcsens.xml', 'Geometry/MTDSimData/data/v4/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', diff --git a/Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml b/Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml new file mode 100644 index 0000000000000..2602d97abd7d7 --- /dev/null +++ b/Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +