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

Jump to bottom

2023 Scenario Geometry #7779

Merged
merged 2 commits into from
Feb 20, 2015
Merged

2023 Scenario Geometry #7779

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
f605a45
2023 scenario
ianna Feb 12, 2015
829e334
Add GEM
ianna Feb 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Configuration/Geometry/python/GeometryExtended2023Reco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Reconstruction geometry services
# Tracking Geometry
#bah - well, this is not a cfi!
from Geometry.CommonDetUnit.globalTracking2023Geometry_cfi import *
from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
Expand All @@ -15,13 +15,13 @@
#Muon
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
from Geometry.GEMGeometry.gemGeometry_cfi import *
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *

# Alignment
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
trackerSLHCGeometry.applyAlignment = cms.bool(False)
trackerGeometry.applyAlignment = cms.bool(False)

# Calorimeters
from Geometry.CaloEventSetup.CaloTopology_cfi import *
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/GeometryExtended2023_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2023XML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumbering2023Geometry_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
2 changes: 2 additions & 0 deletions Configuration/StandardSequences/python/GeometryConf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
'DBExtended2015dev' : 'DB:Extended2015dev',
'DBExtended2017' : 'DB:Extended2017',
'DBExtended2019' : 'DB:Extended2019',
'DBExtended2023' : 'DB:Extended2023',
'DBExtendedPhaseIPixel' : 'DB:ExtendedPhaseIPixel',
'DBIdeal2015' : 'DB:Ideal2015',
'DBIdeal2015dev' : 'DB:Ideal2015dev',
Expand All @@ -21,6 +22,7 @@
'Extended2015dev': 'Extended2015dev,Extended2015devReco',
'Extended2017' : 'Extended2017,Extended2017Reco',
'Extended2019' : 'Extended2019,Extended2019Reco',
'Extended2023' : 'Extended2023,Extended2023Reco',
'ExtendedGFlash' : 'ExtendedGFlash,ExtendedGFlashReco',
'ExtendedLiMax' : 'ExtendedLiMax,ExtendedLiMaxReco',
'ExtendedLiMin' : 'ExtendedLiMin,ExtendedLiMinReco',
Expand Down
889 changes: 889 additions & 0 deletions Geometry/CMSCommonData/data/PhaseII/beampipe.xml
View file
Open in desktop

Large diffs are not rendered by default.

4,576 changes: 4,576 additions & 0 deletions Geometry/CMSCommonData/data/PhaseII/materials.xml
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## 2015 + new phase 1 pixel detector

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/PhaseII/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
Expand All @@ -14,7 +14,7 @@
'Geometry/CMSCommonData/data/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PhaseI/beampipe.xml',
'Geometry/CMSCommonData/data/PhaseII/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
Expand Down Expand Up @@ -219,18 +219,21 @@
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/PhaseI/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseI/hcalRecNumbering.xml',
'Geometry/MuonCommonData/data/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/v1/mb1.xml',
'Geometry/MuonCommonData/data/v1/mb2.xml',
'Geometry/MuonCommonData/data/v1/mb3.xml',
'Geometry/MuonCommonData/data/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v6/mf.xml',
'Geometry/MuonCommonData/data/v2/rpcf.xml',
'Geometry/MuonCommonData/data/v6/gemf.xml',
'Geometry/MuonCommonData/data/PhaseII/NoME0/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v4/gem11.xml',
'Geometry/MuonCommonData/data/v6/gem21.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/v2/mfshield.xml',
'Geometry/MuonCommonData/data/PhaseII/NoME0/mfshield.xml',
'Geometry/ForwardCommonData/data/forward.xml',
'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
Expand All @@ -248,8 +251,7 @@
'Geometry/ForwardCommonData/data/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
'Geometry/MuonCommonData/data/v6/muonGemNumbering.xml',
'Geometry/MuonCommonData/data/PhaseII/NoME0/muonNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
Expand All @@ -259,11 +261,11 @@
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
'Geometry/HcalSimData/data/CaloUtil.xml',
'Geometry/MuonSimData/data/v3/muonSens.xml',
'Geometry/MuonSimData/data/PhaseII/NoME0/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml',
'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/castorsens.xml',
Expand All @@ -273,7 +275,7 @@
'Geometry/EcalSimData/data/ESProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/muonProdCuts.xml',
'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
Expand Down
191 changes: 191 additions & 0 deletions Geometry/MuonCommonData/data/PhaseII/NoME0/mf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
<?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">

<SolidSection label="mf.xml">
<Polycone name="ME" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MuonBeamZ0]" rMin="[cms:MuonBeamR0]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MuonBeamZ0]" rMin="[cms:MERmin0]" rMax="[cms:MBarRmin]"/>
<ZSection z="[cms:MEndcapZ0]" rMin="[cms:MERmin1]" rMax="[cms:MBarRmin]"/>
<ZSection z="[cms:MBarZ]" rMin="[cms:MERmin1]" rMax="[cms:MBarRmin]"/>
<ZSection z="[cms:MBarZ]" rMin="[cms:MERmin1]" rMax="[cms:CMSR1]"/>
<ZSection z="[cms:MEndcapZ1]" rMin="[cms:MERmin2]" rMax="[cms:CMSR1]"/>
<ZSection z="[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR1]" rMax="[cms:CMSR1]"/>
<ZSection z="[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR2]" rMax="[cms:CMSR1]"/>
<ZSection z="[cms:TotemMuonZ2]" rMin="[cms:TotemMuonR2]" rMax="[cms:CMSR1]"/>
<ZSection z="[cms:TotemMuonZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
<ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
</Polycone>
<Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="5.641*m " rMin="1.15*m" rMax="2.8*m "/>
<ZSection z="5.674*m " rMin="1.15*m" rMax="2.8*m "/>
<ZSection z="5.674*m " rMin="85*cm " rMax="2.8*m "/>
<ZSection z="6.345*m " rMin="85*cm " rMax="2.8*m "/>
</Polycone>
<Tubs name="ME12Ring" rMin="2.734*m " rMax="4.685*m " dz="311.8875*mm" startPhi="0*deg" deltaPhi="360*deg"/>
<Polyhedra name="ME13Ring" numSide="36" startPhi="355*deg" deltaPhi="360*deg">
<ZSection z="6.625*m " rMin="4.955*m " rMax="7*m "/>
<ZSection z="7.265*m " rMin="4.955*m " rMax="7*m "/>
</Polyhedra>
<Polycone name="ME2Ring" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="7865*mm" rMin="1142*mm" rMax="7020*mm"/>
<ZSection z="8509*mm" rMin="1142*mm" rMax="7020*mm"/>
<ZSection z="8509*mm" rMin="1361*mm" rMax="7020*mm"/>
<ZSection z="8510*mm" rMin="1361*mm" rMax="7020*mm"/>
</Polycone>
<Tubs name="ME3Ring" rMin="1360*mm" rMax="7.02*m " dz="32.75*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ME4Ring" rMin="1530*mm" rMax="7.02*m " dz="33.675*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="RR2X" rMin="3.3015*m " rMax="6.99*m " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
</SolidSection>

<LogicalPartSection label="mf.xml">
<LogicalPart name="MEP" category="unspecified">
<rSolid name="ME"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="MEN" category="unspecified">
<rSolid name="ME"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME1RingP" category="unspecified">
<rSolid name="ME1Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME1RingN" category="unspecified">
<rSolid name="ME1Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME12RingP" category="unspecified">
<rSolid name="ME12Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME12RingN" category="unspecified">
<rSolid name="ME12Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME13RingP" category="unspecified">
<rSolid name="ME13Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME13RingN" category="unspecified">
<rSolid name="ME13Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME2RingP" category="unspecified">
<rSolid name="ME2Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME2RingN" category="unspecified">
<rSolid name="ME2Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME3RingP" category="unspecified">
<rSolid name="ME3Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME3RingN" category="unspecified">
<rSolid name="ME3Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME4RingP" category="unspecified">
<rSolid name="ME4Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME4RingN" category="unspecified">
<rSolid name="ME4Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="RR2X" category="unspecified">
<rSolid name="RR2X"/>
<rMaterial name="materials:ME_free_space"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="mf.xml">
<PosPart copyNumber="1">
<rParent name="muonBase:MUON"/>
<rChild name="mf:MEP"/>
<rRotation name="rotations:000D"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="muonBase:MUON"/>
<rChild name="mf:MEN"/>
<rRotation name="rotations:180D"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME1RingP"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME1RingN"/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME12RingP"/>
<Translation x="0*fm " y="0*fm " z="6953.1125*mm"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME12RingN"/>
<Translation x="0*fm " y="0*fm " z="6953.1125*mm"/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME13RingP"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME13RingN"/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME2RingP"/>
<!-- <Translation x="0*fm " y="0*fm " z="8.1925*m " /> -->
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME2RingN"/>
<!-- <Translation x="0*fm " y="0*fm " z="8.1925*m " /> -->
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME3RingP"/>
<Translation x="0*fm " y="0*fm " z="9.4475*m "/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME3RingN"/>
<Translation x="0*fm " y="0*fm " z="9.4475*m "/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME4RingP"/>
<Translation x="0*fm " y="0*fm " z="10.3432*m "/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME4RingN"/>
<Translation x="0*fm " y="0*fm " z="10.3432*m "/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:ME2RingP"/>
<rChild name="mf:RR2X"/>
<rRotation name="rotations:R005"/>
<Translation x="0*fm " y="0*fm " z="-28.25*cm+8.1925*m "/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:ME2RingN"/>
<rChild name="mf:RR2X"/>
<rRotation name="rotations:R005"/>
<Translation x="0*fm " y="0*fm " z="-28.25*cm+8.1925*m "/>
</PosPart>
</PosPartSection>

</DDDefinition>