Skip to content

Commit

Permalink
merging diamond 2018 geometry
Browse files Browse the repository at this point in the history 
Merge remote-tracking branch 'ctpps/ctpps_diamondGeometry2018' into restructGeo_1010pre1
  • Loading branch information
@fabferro
fabferro committed Feb 14, 2018
2 parents 4bdaf37 + 7896ddb commit b156253
Show file tree
Hide file tree
Showing 10 changed files with 1,161 additions and 7 deletions.
6 changes: 6 additions & 0 deletions Geometry/VeryForwardData/data/2016_ctpps_15sigma_margin0/RP_Dist_Beam_Cent.xml
View file
Expand Up @@ -37,5 +37,11 @@
<Constant name="RP_220_Right_Det_Dist_3" value="+43.396*mm"/> <!-- RESOLVER: +43.396, offset: +0.000 -->
<Constant name="RP_220_Right_Det_Dist_4" value="+42.571*mm"/> <!-- RESOLVER: +42.571, offset: +0.000 -->
<Constant name="RP_220_Right_Det_Dist_5" value="+43.340*mm"/> <!-- RESOLVER: +43.340, offset: +0.000 -->

<!-- sector 45, diamond station -->
<Constant name="CTPPS_45_Det_Dist" value="0.0*mm"/>

<!-- sector 56, diamond station -->
<Constant name="CTPPS_56_Det_Dist" value="0.0*mm"/>
</ConstantsSection>
</DDDefinition>
71 changes: 71 additions & 0 deletions Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml
View file
@@ -0,0 +1,71 @@
<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="CTPPS_Diamond_Detector_Assembly.xml" eval="true">
<Constant name="Shift_dx" value="[CTPPS_Diamond_Parameters:Plane_dx]/2-([CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness])/2-[CTPPS_Timing_Horizontal_Pot:cut_depth]"/>
<Constant name="box_dz" value="([CTPPS_Diamond_Parameters:Metalized_thick]*2+[CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:PCB_thick])*4+[CTPPS_Diamond_Parameters:Plane_gap]*3"/>
</ConstantsSection>

<SolidSection label="CTPPS_Diamond_Detector_Assembly.xml">
<!-- Detector Main Box and Planes -->
<Box name="Main_Box_main" dx="[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]+[CTPPS_Timing_Horizontal_Pot:cut_depth]" dy="[CTPPS_Diamond_Parameters:PCB_dy]/2" dz="[box_dz]/2"/>
<Trd1 name="Main_Box_extra" dz="[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" dy1="[CTPPS_Diamond_Parameters:PCB_extend_dy1]/2" dy2="[CTPPS_Diamond_Parameters:PCB_extend_dy2]/2" dx1="[box_dz]/2" dx2="[box_dz]/2"/>
<UnionSolid name="CTPPS_Diamond_Main_Box">
<rSolid name="Main_Box_main"/>
<rSolid name="Main_Box_extra"/>
<rRotation name="rotations:90YX"/>
<Translation x="-[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" y="0*mm" z="0*mm"/>
</UnionSolid>
<Box name="PCB_main" dx="[CTPPS_Diamond_Parameters:PCB_dx]/2" dy="[CTPPS_Diamond_Parameters:PCB_dy]/2" dz="[CTPPS_Diamond_Parameters:PCB_thick]/2"/>
<Trd1 name="PCB_extra" dz="[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" dy1="[CTPPS_Diamond_Parameters:PCB_extend_dy1]/2" dy2="[CTPPS_Diamond_Parameters:PCB_extend_dy2]/2" dx1="[CTPPS_Diamond_Parameters:PCB_thick]/2" dx2="[CTPPS_Diamond_Parameters:PCB_thick]/2"/>
<UnionSolid name="PCB">
<rSolid name="PCB_main"/>
<rSolid name="PCB_extra"/>
<rRotation name="rotations:90YX"/>
<Translation x="-[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" y="0*mm" z="0*mm"/>
</UnionSolid>
</SolidSection>

<LogicalPartSection label="CTPPS_Diamond_Detector_Assembly.xml">
<!-- ****** Detector Box and Downstream Plane ****** -->
<LogicalPart name="CTPPS_Diamond_Main_Box" category="envelope">
<rSolid name="CTPPS_Diamond_Main_Box"/>
<rMaterial name="materials:Vacuum"/>
</LogicalPart>
<LogicalPart name="PCB" category="support">
<rSolid name="PCB"/>
<rMaterial name="RP_Materials:PCB"/> <!--should be equivalent to actual RO4350B-->
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="CTPPS_Diamond_Detector_Assembly.xml">
<PosPart copyNumber="1">
<rParent name="CTPPS_Timing_Horizontal_Pot:Primary_Vacuum"/>
<rChild name="CTPPS_Diamond_Main_Box"/>
<rRotation name="CTPPS_Diamond_Transformations:planes_box_rotation"/>
<Translation x="0*cm" y="0*cm" z="-[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="CTPPS_Diamond_Main_Box"/>
<rChild name="CTPPS_Diamond_Plane1:CTPPS_Diamond_Plane"/>
<Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="CTPPS_Diamond_Main_Box"/>
<rChild name="CTPPS_Diamond_Plane2:CTPPS_Diamond_Plane"/>
<Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])/2"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="CTPPS_Diamond_Main_Box"/>
<rChild name="CTPPS_Diamond_Plane3:CTPPS_Diamond_Plane"/>
<Translation y="0*cm" x="[Shift_dx]" z="([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])/2"/>
<rRotation name="CTPPS_Diamond_Transformations:planes_x_rotation"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="CTPPS_Diamond_Main_Box"/>
<rChild name="CTPPS_Diamond_Plane4:CTPPS_Diamond_Plane"/>
<Translation y="0*cm" x="[Shift_dx]" z="([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/>
</PosPart>
</PosPartSection>

</DDDefinition>

0 comments on commit b156253

Please sign in to comment.