Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run3-hcx352B Add files to evaluate the impact of the changes made to the geometry scenarios due to SD issue in HCAL #42557

Merged
merged 2 commits into from
Aug 14, 2023
Merged

Run3-hcx352B Add files to evaluate the impact of the changes made to the geometry scenarios due to SD issue in HCAL #42557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c348b2
Add files to evaluate the impact of the changes made to the geometry …
Aug 13, 2023
402bb97
Code check
Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 124 additions & 0 deletions Geometry/HcalCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0"?>
<DDDefinition>
<open_geometry/>
<close_geometry/>

<IncludeSection>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms/2026/v5/cms.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
<Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
<Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
<Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelStructureTopology.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelsens.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII/v2/trackingMaterialGroups_ForPhaseII.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
<Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
<Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
<Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml'/>
<Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
<Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
<Include ref='Geometry/MTDCommonData/data/btl/v2/btl.xml'/>
<Include ref='Geometry/MTDCommonData/data/etl/v7/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v4/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v4/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
<Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
<Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
<Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
<Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
<Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
</IncludeSection>
</DDDefinition>
67 changes: 67 additions & 0 deletions Geometry/HcalCommonData/python/GeometryDD4hepExtended2026D99Reco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Geometry.GeometryDD4hep_cff import *
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/HcalCommonData/data/dd4hep/cmsExtendedGeometry2026D99.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 *

# 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

65 changes: 65 additions & 0 deletions Geometry/HcalCommonData/python/GeometryExtended2026D99Reco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import FWCore.ParameterSet.Config as cms

from Geometry.HcalCommonData.cmsExtendedGeometry2026D99XML_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 *

# 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

Loading