Skip to content

Commit

Permalink
Merge pull request #19480 from ianna/detailed-cavern-in-2019
Browse files Browse the repository at this point in the history
Add Detailed Cavern to 2019 Scenario
  • Loading branch information
cmsbuild committed Jul 2, 2017
2 parents afa4f05 + 6f2ed4b commit 27eb789
Show file tree
Hide file tree
Showing 2 changed files with 175 additions and 8 deletions.
164 changes: 164 additions & 0 deletions Geometry/CMSCommonData/data/cms/2019/v2/cms.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
<?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.932*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"/>
<Constant name="TrackBeamR11" value="3.10*cm"/>
<Constant name="TrackBeamR12" value="3.15*cm"/>
<Constant name="TrackBeamR2" value="7.40*cm"/>
<Constant name="TrackBeamR3" value="7.7633*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="TrackFwdZ3" value="1.948*m"/>
<Constant name="TrackFwdZOffset" value="106.91950*cm"/>
<Constant name="PIXSandwichLayer1Thick" value="0.2*mm"/>
<Constant name="PIXSandwichLayer2Thick" value="11.0*mm"/>
<Constant name="PIXSandwichLayer3Thick" value="0.5*mm"/>
<Constant name="PIXSandwichLayer4Thick" value="0.3*mm"/>
<Constant name="PIXSandwichLayerThick" value="[PIXSandwichLayer1Thick]+[PIXSandwichLayer2Thick]+[PIXSandwichLayer3Thick]+[PIXSandwichLayer4Thick]"/>
<Constant name="PIXNoseRin" value="215*mm"/>
<Constant name="PIXNoseRout" value="[PIXNoseRin]+[PIXSandwichLayerThick]"/>
<Constant name="PIXNoseLength" value="619.5*mm"/>
<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>
19 changes: 11 additions & 8 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,26 @@
## 2015 + new phase 1 pixel detector

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
geomXMLFiles = cms.vstring(
'Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
'Geometry/CMSCommonData/data/cms/2019/v2/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/caloBase/2017/v1/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/muonBase.xml',
'Geometry/CMSCommonData/data/muonBase/2017/v1/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
Expand Down Expand Up @@ -226,19 +229,19 @@
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml',
'Geometry/MuonCommonData/data/mbCommon/2017/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml',
'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml',
'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
'Geometry/ForwardCommonData/data/zdcmaterials.xml',
Expand Down

0 comments on commit 27eb789

Please sign in to comment.