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.

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

Phase2-gex184 Change directory name 2026 to 2030 to enable future Run3 runs during 2026 #46890

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/GeometrySLHCSimDB_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# Ideal geometry, needed for simulation
from GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff import *
from Geometry.TrackerNumberingBuilder.trackerNumbering2026GeometryDB_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# Ideal geometry, needed for simulation
from SLHCUpgradeSimulations.Geometry.Phase1_R30F12_cmsSimIdealGeometryXML_cff import *
from Geometry.TrackerNumberingBuilder.trackerNumbering2026Geometry_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/dependencies.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# this file exists to enforce dependencies for the generate2026Geometry unit test
# this file exists to enforce dependencies for the generateRun4Geometry unit test
from Configuration.StandardSequences.GeometryConf import GeometryConf
174 changes: 87 additions & 87 deletions Configuration/Geometry/python/dictRun4Geometry.py

Large diffs are not rendered by default.

150 changes: 150 additions & 0 deletions Geometry/CMSCommonData/data/cms/2030/v1/cms.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<?xml version="1.0"?>
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">

<ConstantsSection label="cms.xml" eval="true">
<Constant name="Rmin" value="[cmsextent:Rmin]"/>
<Constant name="Zmin" value="[cmsextent:Zmin]"/>
<Constant name="HallZ" value="[cmsextent:HallZ]"/>
<Constant name="HallR" value="[cmsextent:HallR]"/>
<Constant name="HallRMax" value="[cmsextent:HallRMax]"/>
<Constant name="CMSR1" value="[cmsextent:CMSR1]"/>
<Constant name="CMSR2" value="[cmsextent:CMSR2]"/>
<Constant name="CMSR3" value="[cavernData:CMSR3]"/>
<Constant name="CMSR4" value="[cavernData:CMSR4]"/>
<Constant name="CMSZ1" value="[cmsextent:CMSZ1]"/>
<Constant name="CMSZ2" value="[cmsextent:CMSZ2]"/>
<Constant name="HFRiseZ1" value="[cavernData:HFRiseZ1]"/>
<Constant name="HFRiseZ2" value="[cavernData:HFRiseZ2]"/>
<Constant name="ShaftY" value="[cavernData:ShaftY]"/>
<Constant name="ShaftZ" value="[cavernData:ShaftZ]"/>
<Constant name="CMSZ2" value="[cmsextent:CMSZ2]"/>
<Constant name="TrackCalorR" value="1.233*m"/>
<Constant name="CalorMuonR" value="2.950*m"/>
<Constant name="CalorMuonR2" value="2.810*m"/>
<Constant name="TrackBeamZ1" value="1.948*m"/>
<Constant name="TrackBeamZ2" value="2.935*m"/>
<Constant name="TrackBeamSupZ1" value="1.630*m-.6*cm"/>
<Constant name="TrackBeamSupZ2" value="1.630*m+.6*cm"/>
<Constant name="TrackBeamR1" value="2.50*cm"/> <!-- 3.10*cm -->
<Constant name="TrackBeamR2" value="7.40*cm"/>
<Constant name="TrackLumiZ1" value="1.722*m"/>
<Constant name="TrackLumiZ2" value="1.800*m"/>
<Constant name="TrackLumiR1" value="7.70*cm"/>
<Constant name="TrackLumiR1Min" value="3.170*cm"/>
<Constant name="TrackLumiR2Min" value="3.3*cm"/>
<Constant name="CalorBeamZ1" value="3.180*m"/>
<Constant name="CalorBeamZ2" value="5.541*m"/>
<Constant name="CalorBeamZ3" value="5.245*m"/>
<Constant name="CalorBeamR1" value="8.00*cm"/>
<Constant name="CalorBeamR2" value="8.93*cm"/>
<Constant name="MuonBeamZ0" value="6.50*m"/>
<Constant name="MuonBeamZ1" value="7.499*m"/>
<Constant name="MuonBeamZ2" value="10.86*m"/>
<Constant name="MuonBeamR0" value="10.50*cm"/>
<Constant name="MuonBeamR1" value="11.785*cm"/>
<Constant name="MuonBeamR2" value="76.80*cm"/>
<Constant name="TotemMuonZ1" value="10.165*m"/>
<Constant name="TotemMuonZ2" value="10.50*m"/>
<Constant name="TotemMuonR1" value="1.0411*m"/>
<Constant name="TotemMuonR2" value="1.1300*m"/>
<Constant name="TotemBeamZ1" value="7.9500*m"/>
<Constant name="TotemBeamZ2" value="13.381*m"/>
<Constant name="TotemBeamZ3" value="13.439*m"/>
<Constant name="TotemBeamZ4" value="13.465*m"/>
<Constant name="TotemBeamR1" value="[MuonBeamR1]"/>
<Constant name="TotemBeamR2" value="12.15*cm"/>
<Constant name="TotemBeamR3" value="12.20*cm"/>
<Constant name="TotemBeamR4" value="3.675*cm"/>
<Constant name="TotemBeamR5" value="3.575*cm"/>
<Constant name="ForwdBeamZ1" value="10.539*m"/>
<Constant name="ForwdBeamZ2" value="13.109*m"/>
<Constant name="ForwdBeamZ3" value="13.290*m"/>
<Constant name="ForwdBeamZ4" value="16.0305*m"/>
<Constant name="ForwdBeamZ5" value="16.424*m"/>
<Constant name="ForwdBeamZ6" value="17.058*m"/>
<Constant name="ForwdBeamZ7" value="17.920*m"/>
<Constant name="ForwdBeamZ8" value="18.562*m"/>
<Constant name="ForwdBeamZ9" value="18.905*m"/>
<Constant name="ForwdBeamR0" value="15.95*cm"/>
<Constant name="ForwdBeamR1" value="12.495*cm"/>
<Constant name="ForwdBeamR2" value="12.50*cm"/>
<Constant name="ForwdBeamR3" value="25.0*cm"/>
<Constant name="ForwdBeamR4" value="2.85*cm+0.65*cm"/> <!-- Post LS2 beam-pipe -->
<Constant name="ForwdBeamR5" value="7.50*cm"/>
<Constant name="ForwdBeamR6" value="20.5*cm"/>
<Constant name="ForwdBeamR7" value="4.00*cm"/>
<Constant name="ForwdBeamR8" value="2.15*cm"/>
<Constant name="ForwdVcalZ1" value="11.1495*m"/>
<Constant name="ForwdVcalZ2" value="12.8005*m"/>
<Constant name="ForwdVcalR1" value="1.595*m"/>
<Constant name="ForwdDetsZ1" value="16.0065*m"/>
<Constant name="ForwdDetsZ2" value="16.0065*m-1.6165*m"/>
<Constant name="ForwdDetsR1" value="33.00*cm"/>
<Constant name="MBarRmin" value="3.80*m"/>
<Constant name="MBarRmax" value="[cms:CMSR4]"/>
<Constant name="MBarZ" value="6.61*m"/>
<Constant name="MBRingZ" value="1.268*m"/>
<Constant name="MBRing1Zpos" value="2.686*m"/>
<Constant name="MBRing2Zpos" value="5.342*m"/>
<Constant name="MEndcapZ0" value="6.59*m"/>
<Constant name="MEndcapZ1" value="6.835*m"/>
<Constant name="MERmin0" value="66.569*cm"/>
<Constant name="MERmin1" value="67.50*cm"/>
<Constant name="MERmin2" value="70.00*cm"/>
<Constant name="MERmin3" value="108.60*cm"/>
</ConstantsSection>

<SolidSection label="cms.xml">
<Polycone name="OCMS" startPhi="0*deg" deltaPhi="360*deg" >
<ZSection z="-[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]" />
<ZSection z="-[HallZ]" rMin="[Rmin]" rMax="[CMSR2]" />
<ZSection z="-[HallZ]" rMin="[Rmin]" rMax="[ShaftY]+1*m"/>
<ZSection z="-[ShaftZ]" rMin="[Rmin]" rMax="[ShaftY]+1*m"/>
<ZSection z="-[ShaftZ]" rMin="[Rmin]" rMax="[HallRMax]+360*cm"/>
<ZSection z="[HallZ]" rMin="[Rmin]" rMax="[HallRMax]+360*cm"/>
<ZSection z="[HallZ]" rMin="[Rmin]" rMax="[CMSR2]" />
<ZSection z="[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]" />
</Polycone>
<Polycone name="CMSEp" startPhi="0*deg" deltaPhi="360*deg" >
<ZSection z="-[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="-[CMSZ2]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="-[CMSZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
<ZSection z="-[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR4]"/>
<ZSection z="-[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR3]"/>
<ZSection z="-[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR3]"/>
<ZSection z="-[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
<ZSection z="[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
<ZSection z="[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR3]"/>
<ZSection z="[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR3]"/>
<ZSection z="[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR4]"/>
<ZSection z="[CMSZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
<ZSection z="[CMSZ2]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
</Polycone>
<Box name="YBFeetBox" dx="505*cm" dy="280*cm" dz="670*cm"/>
<UnionSolid name="CMSE">
<rSolid name="CMSEp"/>
<rSolid name="YBFeetBox"/>
<Translation x="0*fm" y="-880*cm+280*cm" z="0*fm"/>
</UnionSolid>
</SolidSection>
<LogicalPartSection label="cms.xml">
<LogicalPart name="World" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="OCMS" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="MCMS" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="CMSE" category="unspecified">
<rSolid name="CMSE"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

</DDDefinition>
40 changes: 20 additions & 20 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<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/cms/2030/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/caloBase/2030/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/muonBase/2030/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/beampipe/2030/v3/beampipe.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/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'/>
Expand All @@ -42,9 +42,9 @@
<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/eregalgo/2030/v2/eregalgo.xml'/>
<Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
<Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/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'/>
Expand Down Expand Up @@ -72,22 +72,22 @@
<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/muonYoke/2030/v3/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2030/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/rpcf/2030/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/2026/v1/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2030/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/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/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/zdc/2030/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'/>
Expand All @@ -101,21 +101,21 @@
<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/HcalSimData/data/CaloUtil/2030/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/RPCGeometryBuilder/data/2030/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/HcalSimData/data/HcalProdCuts/2030/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/MuonSimData/data/muonProdCuts/2030/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'/>
Expand Down
Loading