Skip to content

Commit

Permalink
Merge pull request #25427 from slomeo/Cavern2018Fix
Browse files Browse the repository at this point in the history 
Bugfix for cavern
  • Loading branch information
@cmsbuild
cmsbuild committed Dec 7, 2018
2 parents 500def7 + d0b6ace commit 14d4e71
Show file tree
Hide file tree
Showing 2 changed files with 339 additions and 1 deletion.
338 changes: 338 additions & 0 deletions Geometry/CMSCommonData/data/cavern/2018/v1/cavern.xml
View file
@@ -0,0 +1,338 @@
<?xml version="1.0"?>
<!-- 2006-09-19 Michael Case: As per Sunanda Banerjee's request, this file
should be kept around for background studies.
-->
<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="cavern.xml" eval="true">
<Constant name="SideWallRmin" value="13.3*m"/>
<Constant name="dzwall" value="([cms:HallZ]-[cms:CMSZ2])/2"/>
<Constant name="zposwall" value="([cms:HallZ]+[cms:CMSZ2])/2"/>
<Constant name="sidewallwidth" value="0.5*(8.8*m+2.16*m)"/>
</ConstantsSection>
<SolidSection label="cavern.xml">
<Tubs name="CMSShaft" rMin="0*fm" rMax="[cavernData:ShaftR]" dz="[cavernData:ShaftDZ]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="CMSShaftAir" rMin="0*fm" rMax="[cavernData:ShaftAirR]" dz="[cavernData:ShaftDZ]" startPhi="0*deg" deltaPhi="360*deg"/>
<Box name="OSFL" dx="[cavernData:FloorDX]" dy="[cavernData:FloorDY]" dz="[cms:HallZ]"/>
<Box name="OSFLsub" dx="[cavernData:FloorDX]" dy="1000*cm" dz="[cms:HallZ]+0.1*mm"/>
<EllipticalTube name="CMSWall" xSemiAxis="[cavernData:CMSWallEDX]" ySemiAxis="[cavernData:CMSWallEDY]" zHeight="[cms:HallZ]"/>
<EllipticalTube name="CMSWallAir" xSemiAxis="[cavernData:CMSWallIDX]" ySemiAxis="[cavernData:CMSWallIDY]" zHeight="[cavernData:CMSWallIDZ]"/>
<Box name="RackAV" dx="125*cm" dy="500*cm" dz="1080*cm"/>
<Box name="HFRise" dx="240*cm" dy="55*cm" dz="145*cm"/>
<Trapezoid name="YBFeetAir2" dz="[cavernData:YBFeetDZ]+5*cm" alp1="0*deg" bl1="0.1*mm" tl1="[cavernData:YBFeetAir2DX]+0.1*mm" h1="[cavernData:YBFeetAir2DY]+0.1*mm" alp2="0*deg" bl2="0.1*mm" tl2="[cavernData:YBFeetAir2DX]+0.1*mm" h2="[cavernData:YBFeetAir2DY]+0.1*mm" phi="0*deg" theta="0*deg"/>
<Trapezoid name="YBFeetAir3" dz="[cavernData:YBFeetDZ]+5*cm" alp1="0*deg" bl1="[cavernData:YBFeetAir3DX]+0.1*mm" tl1="0.1*mm" h1="[cavernData:YBFeetAir3DY]+0.1*mm" alp2="0*deg" bl2="[cavernData:YBFeetAir3DX]+0.1*mm" tl2="0.1*mm" h2="[cavernData:YBFeetAir3DY]+0.1*mm" phi="0*deg" theta="0*deg"/>
<Box name="YBFeetAir4" dx="[cavernData:YBFeetAir3DX]+0.1*mm" dy="[cavernData:YBFeetAir4DY]+0.1*mm" dz="[cavernData:YBFeetDZ]+5*cm"/>
<Box name="YBFeet" dx="[cavernData:YBFeetDX]" dy="[cavernData:YBFeetDY]" dz="[cavernData:YBFeetDZ]"/>
<Box name="YBFeetI" dx="100*cm" dy="[cavernData:YBFeetDZ]" dz="20*cm"/>
<UnionSolid name="CMSWallv0">
<rSolid name="cavern:CMSWall"/>
<rSolid name="cavern:CMSShaft"/>
<rRotation name="cavernData:Shaft"/>
<Translation x="0.*fm" y="[cavernData:ShaftPosZ]" z="[cavernData:ShaftPosY]"/>
</UnionSolid>
<SubtractionSolid name="Wallv1">
<rSolid name="cavern:CMSWallv0"/>
<rSolid name="cms:CMSE"/>
<Translation x="0.*fm" y="0*fm" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="Wall">
<rSolid name="Wallv1"/>
<rSolid name="cavern:OSFLsub"/>
<Translation x="0.*fm" y="-880*cm-1000*cm" z="0.*fm"/>
</SubtractionSolid>
<UnionSolid name="CMSWallAirv0">
<rSolid name="cavern:CMSWallAir"/>
<rSolid name="cavern:CMSShaftAir"/>
<rRotation name="cavernData:Shaft"/>
<Translation x="0.*fm" y="[cavernData:ShaftPosZ]" z="[cavernData:ShaftPosY]"/>
</UnionSolid>
<SubtractionSolid name="WallAirv1">
<rSolid name="cavern:CMSWallAirv0"/>
<rSolid name="cms:CMSE"/>
<Translation x="0.*fm" y="0*fm" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="WallAir">
<rSolid name="WallAirv1"/>
<rSolid name="cavern:OSFLsub"/>
<Translation x="0.*fm" y="-880*cm-1000*cm" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetLeftv2">
<rSolid name="YBFeet"/>
<rSolid name="YBFeetAir2"/>
<Translation x="[cavernData:YBFeetDX]" y="[cavernData:YBFeetDY]-[cavernData:YBFeetAir2DY]" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetLeftv3">
<rSolid name="YBFeetLeftv2"/>
<rSolid name="YBFeetAir3"/>
<Translation x="-[cavernData:YBFeetDX]" y="[cavernData:YBFeetDY]-2*[cavernData:YBFeetAir1DY]-[cavernData:YBFeetAir3DY]" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetLeft">
<rSolid name="YBFeetLeftv3"/>
<rSolid name="YBFeetAir4"/>
<Translation x="-[cavernData:YBFeetDX]" y="-[cavernData:YBFeetDY]+[cavernData:YBFeetAir4DY]" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetRightv2">
<rSolid name="YBFeet"/>
<rSolid name="YBFeetAir2"/>
<Translation x="-[cavernData:YBFeetDX]" y="[cavernData:YBFeetDY]-[cavernData:YBFeetAir2DY]" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetRightv3">
<rSolid name="YBFeetRightv2"/>
<rSolid name="YBFeetAir3"/>
<Translation x="[cavernData:YBFeetDX]" y="[cavernData:YBFeetDY]-2*[cavernData:YBFeetAir1DY]-[cavernData:YBFeetAir3DY]" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetRight">
<rSolid name="YBFeetRightv3"/>
<rSolid name="YBFeetAir4"/>
<Translation x="[cavernData:YBFeetDX]" y="-[cavernData:YBFeetDY]+[cavernData:YBFeetAir4DY]" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetLeftO">
<rSolid name="YBFeetLeft"/>
<rSolid name="muonBase:MUON"/>
<Translation x="-[cavernData:YBFeetPosX]" y="-[cavernData:YBFeetPosY]" z="0.*fm"/>
</SubtractionSolid>
<SubtractionSolid name="YBFeetRightO">
<rSolid name="YBFeetRight"/>
<rSolid name="muonBase:MUON"/>
<Translation x="[cavernData:YBFeetPosX]" y="-[cavernData:YBFeetPosY]" z="0.*fm"/>
</SubtractionSolid>
</SolidSection>
<LogicalPartSection label="cavern.xml">
<LogicalPart name="Wall" category="unspecified">
<rSolid name="Wall"/>
<rMaterial name="materials:Stand.Concrete"/>
</LogicalPart>
<LogicalPart name="WallAir" category="unspecified">
<rSolid name="WallAir"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="YBFeetLeftO" category="unspecified">
<rSolid name="YBFeetLeftO"/>
<rMaterial name="materials:Iron"/>
</LogicalPart>
<LogicalPart name="YBFeetRightO" category="unspecified">
<rSolid name="YBFeetRightO"/>
<rMaterial name="materials:Iron"/>
</LogicalPart>
<LogicalPart name="YBFeetI" category="unspecified">
<rSolid name="YBFeetI"/>
<rMaterial name="materials:Iron"/>
</LogicalPart>
<LogicalPart name="OSFL" category="unspecified">
<rSolid name="OSFL"/>
<rMaterial name="materials:Stand.Concrete"/>
</LogicalPart>
<LogicalPart name="RackAV" category="unspecified">
<rSolid name="RackAV"/>
<rMaterial name="materials:StainlessSteel"/>
</LogicalPart>
<LogicalPart name="HFRise" category="unspecified">
<rSolid name="HFRise"/>
<rMaterial name="materials:Iron"/>
</LogicalPart>
</LogicalPartSection>
<PosPartSection label="cavern.xml">
<PosPart copyNumber="1">
<rParent name="cms:CMSE"/>
<rChild name="cavern:Wall"/>
<rRotation name="rotations:000D"/>
<Translation x="0*fm" y="0*fm" z="0*fm"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="cavern:Wall"/>
<rChild name="cavern:WallAir"/>
<rRotation name="rotations:000D"/>
<Translation x="0*fm" y="0*fm" z="0*fm"/>
</PosPart>
<!-- *********YB Feet Inner*********** -->
<PosPart copyNumber="1">
<rParent name="muonBase:MBWheel_2N"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1852"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="muonBase:MBWheel_1N"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1852"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="muonBase:MBWheel_0"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1852"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="muonBase:MBWheel_1P"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1852"/>
</PosPart>
<PosPart copyNumber="5">
<rParent name="muonBase:MBWheel_2P"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1852"/>
</PosPart>
<PosPart copyNumber="6">
<rParent name="muonBase:MBWheel_2N"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="-365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1832"/>
</PosPart>
<PosPart copyNumber="7">
<rParent name="muonBase:MBWheel_1N"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="-365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1832"/>
</PosPart>
<PosPart copyNumber="8">
<rParent name="muonBase:MBWheel_0"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="-365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1832"/>
</PosPart>
<PosPart copyNumber="9">
<rParent name="muonBase:MBWheel_1P"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="-365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1832"/>
</PosPart>
<PosPart copyNumber="10">
<rParent name="muonBase:MBWheel_2P"/>
<rChild name="cavern:YBFeetI"/>
<Translation x="-365*cm" y="-670*cm" z="0*fm"/>
<rRotation name="rotations:RM1832"/>
</PosPart>
<!-- *********YB Feet Outer*********** -->
<PosPart copyNumber="1">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetLeftO"/>
<rRotation name="rotations:000D"/>
<Translation x="[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="-5.342*m"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetLeftO"/>
<rRotation name="rotations:000D"/>
<Translation x="[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="-2.686*m"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetLeftO"/>
<rRotation name="rotations:000D"/>
<Translation x="[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="0*fm"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetLeftO"/>
<rRotation name="rotations:000D"/>
<Translation x="[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="2.686*m"/>
</PosPart>
<PosPart copyNumber="5">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetLeftO"/>
<rRotation name="rotations:000D"/>
<Translation x="[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="5.342*m"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetRightO"/>
<rRotation name="rotations:000D"/>
<Translation x="-[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="-5.342*m"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetRightO"/>
<rRotation name="rotations:000D"/>
<Translation x="-[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="-2.686*m"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetRightO"/>
<rRotation name="rotations:000D"/>
<Translation x="-[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="0*fm"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetRightO"/>
<rRotation name="rotations:000D"/>
<Translation x="-[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="2.686*m"/>
</PosPart>
<PosPart copyNumber="5">
<rParent name="cms:CMSE"/>
<rChild name="cavern:YBFeetRightO"/>
<rRotation name="rotations:000D"/>
<Translation x="-[cavernData:YBFeetPosX]" y="[cavernData:YBFeetPosY]" z="5.342*m"/>
</PosPart>
<!-- *********Electronic Racks*********** -->
<PosPart copyNumber="1">
<rParent name="WallAir"/>
<rChild name="cavern:RackAV"/>
<rRotation name="rotations:000D"/>
<Translation x="925*cm+2*cm" y="0*fm" z="0*fm"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="WallAir"/>
<rChild name="cavern:RackAV"/>
<rRotation name="rotations:000D"/>
<Translation x="-925*cm-2*cm" y="0*fm" z="0*fm"/>
</PosPart>
<!-- *********HF Risers*********** -->
<PosPart copyNumber="1">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-325*cm" z="1245*cm"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-485*cm" z="1245*cm"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-645*cm" z="1245*cm"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-805*cm" z="1245*cm"/>
</PosPart>
<PosPart copyNumber="5">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-325*cm" z="-1245*cm"/>
</PosPart>
<PosPart copyNumber="6">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-485*cm" z="-1245*cm"/>
</PosPart>
<PosPart copyNumber="7">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-645*cm" z="-1245*cm"/>
</PosPart>
<PosPart copyNumber="8">
<rParent name="WallAir"/>
<rChild name="cavern:HFRise"/>
<rRotation name="rotations:000D"/>
<Translation x="0*cm" y="-805*cm" z="-1245*cm"/>
</PosPart>
<!-- ********* Cavern Walls *********** -->
<PosPart copyNumber="1">
<rParent name="cms:CMSE"/>
<rChild name="cavern:OSFL"/>
<rRotation name="rotations:000D"/>
<Translation x="0*fm" y="-1240*cm" z="0*fm"/>
</PosPart>
</PosPartSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2018XML_cfi.py
View file
Expand Up @@ -17,7 +17,7 @@
'Geometry/CMSCommonData/data/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
'Geometry/CMSCommonData/data/cavern/2018/v1/cavern.xml',
'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
Expand Down

0 comments on commit 14d4e71

Please sign in to comment.