Merge pull request #20548 from forthommel/ctpps-ufsd_geometry-9_4_X

CTPPS: Geometry for UFSDetectors
cms-sw · Sep 20, 2017 · cd854a8 · cd854a8
2 parents 84ca783 + 81fbf07
commit cd854a8
Show file tree

Hide file tree

Showing 22 changed files with 543 additions and 80 deletions.
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_Detector_Assembly.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_Detector_Assembly.xml
@@ -7,15 +7,14 @@
 
   <SolidSection label="CTPPS_Diamond_Detector_Assembly.xml">
     <!-- Detector Main Box and Planes -->
-    <Box name="Main_Box_main" dx="[CTPPS_Diamond_Parameters:PCB_dx]/2" dy="[CTPPS_Diamond_Parameters:PCB_dy]/2" dz="[box_dz]/2"/>
+    <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="Downstream_Plane" dx="0*mm" dy="0*mm" dz="0*mm"/>-->
     <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">
@@ -40,10 +39,10 @@
 
   <PosPartSection label="CTPPS_Diamond_Detector_Assembly.xml">
     <PosPart copyNumber="1">
-      <rParent name="CTPPS_Timing_Horizontal_Pot:Bottom_Wall"/>
+      <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_Timing_Horizontal_Pot:plane_length]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/>
+      <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"/>
@@ -63,9 +62,8 @@
     </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"/>
-      <rRotation name="CTPPS_Diamond_Transformations:planes_x_rotation"/>
+      <rChild name="CTPPS_UFSD_Plane4:CTPPS_UFSD_Plane"/>
+      <Translation y="0*cm" x="[Shift_dx]-(4*[CTPPS_Diamond_Parameters:Diamond_dx]-[CTPPS_UFSD_Parameters:UFSD_dx])/2" z="([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/>
     </PosPart>
   </PosPartSection>
 

diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
@@ -29,13 +29,6 @@
 
   <PosPartSection label="CTPPS_Diamond_Plane1.xml">
 
-    <PosPart copyNumber="1">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Detector_Assembly:PCB"/>
-      <Translation x="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:PCB_dx]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick]+[CTPPS_Diamond_Parameters:PCB_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
     <!-- ******** Pattern 4 ********* -->
     <PosPart copyNumber="000">
       <rParent name="CTPPS_Diamond_Plane"/>

diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
@@ -29,13 +29,6 @@
 
   <PosPartSection label="CTPPS_Diamond_Plane2.xml">
 
-    <PosPart copyNumber="2">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Detector_Assembly:PCB"/>
-      <Translation x="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:PCB_dx]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick]+[CTPPS_Diamond_Parameters:PCB_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
     <!-- ******** Pattern 4 ********* -->
     <PosPart copyNumber="100">
       <rParent name="CTPPS_Diamond_Plane"/>

diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml
@@ -29,13 +29,6 @@
 
   <PosPartSection label="CTPPS_Diamond_Plane3.xml">
 
-    <PosPart copyNumber="3">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Detector_Assembly:PCB"/>
-      <Translation x="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:PCB_dx]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick]+[CTPPS_Diamond_Parameters:PCB_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
     <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="200">
       <rParent name="CTPPS_Diamond_Plane"/>

diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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_Plane3.xml">
+  <ConstantsSection label="CTPPS_Diamond_Plane4.xml">
     <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2"/>
     <Constant name="Str2_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
     <Constant name="Str3_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
@@ -29,13 +29,6 @@
 
   <PosPartSection label="CTPPS_Diamond_Plane4.xml">
 
-    <PosPart copyNumber="4">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Detector_Assembly:PCB"/>
-      <Translation x="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:PCB_dx]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick]+[CTPPS_Diamond_Parameters:PCB_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
     <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="300">
       <rParent name="CTPPS_Diamond_Plane"/>

diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets.xml
@@ -0,0 +1,14 @@
+<?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 ../../DDLSchema/DDLSchema.xsd">
+    <SpecParSection label="CTPPS_Diamond_Sensitive_Dets.xml">
+        <SpecPar name="ROUHitsCTPPSDiamond">
+
+            <PartSelector path="//CTPPS_Diamond_Pattern.*_Segment.*:CTPPS_Diamond_Segment"/>
+
+            <Parameter name="SensitiveDetector" value="CTPPSDiamondSensitiveDetector" eval="false"/>
+            <Parameter name="ReadOutName" value="CTPPSHitsDiamond" eval="false"/>
+        </SpecPar>
+    </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.xml b/Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.xml
@@ -8,12 +8,13 @@
     <Constant name="cut_depth" value="1.7*mm"/>
     <Constant name="thin_window_thickness" value="0.2*mm"/>
     <Constant name="bottom_wall_thickness" value="[thin_window_thickness]+[cut_depth]"/>
+    <Constant name="external_wall_thickness" value="1*mm"/>
   </ConstantsSection>
 
   <SolidSection label="CTPPS_Timing_Horizontal_Pot.xml" eval="true">
-    <Tubs name="Primary_Vacuum_nocut" rMin="0*mm" rMax="[inner_diameter]/2" dz="[plane_length]/2" startPhi="0*deg" deltaPhi="360*deg"/>
-    <Tubs name="Bottom_Wall_nocut" rMin="0*mm" rMax="[inner_diameter]/2" dz="([cut_depth]+[thin_window_thickness])/2" startPhi="0*deg" deltaPhi="360*deg"/>
-    <Tubs name="External_Wall" rMin="[inner_diameter]/2" rMax="[inner_diameter]/2+1*mm" dz="[plane_length]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="Primary_Vacuum_nocut" rMin="0*mm" rMax="[inner_diameter]/2+[external_wall_thickness]" dz="[plane_length]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="Bottom_Wall_nocut" rMin="0*mm" rMax="[inner_diameter]/2" dz="([bottom_wall_thickness])/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="External_Wall" rMin="[inner_diameter]/2" rMax="[inner_diameter]/2+[external_wall_thickness]" dz="[plane_length]/2" startPhi="0*deg" deltaPhi="360*deg"/>
     <Trd1 name="Window_Cut" dz="[cut_depth]/2" dy2="[cut_width]/2+[cut_depth]" dy1="[cut_width]/2" dx1="[inner_diameter]/2" dx2="[inner_diameter]/2"/>
     <UnionSolid name="Primary_Vacuum">
       <rSolid name="Primary_Vacuum_nocut"/>
@@ -30,7 +31,7 @@
   <LogicalPartSection label="CTPPS_Timing_Horizontal_Pot.xml">
     <LogicalPart name="Primary_Vacuum">
       <rSolid name="Primary_Vacuum"/>
-      <rMaterial name="materials:Vacuum"/>
+      <rMaterial name="CTPPS_Diamond_Materials:PPS_Timing_Primary_Vacuum"/>
     </LogicalPart>
     <LogicalPart name="External_Wall">
       <rSolid name="External_Wall"/>
@@ -46,12 +47,12 @@
     <PosPart copyNumber="1">
       <rParent name="Primary_Vacuum"/>
       <rChild name="External_Wall"/>
-      <Translation x="0*cm" y="0*mm" z="-[bottom_wall_thickness]"/>
+      <Translation x="0*cm" y="0*mm" z="0*mm"/>
     </PosPart>
     <PosPart copyNumber="1">
       <rParent name="Primary_Vacuum"/>
       <rChild name="Bottom_Wall"/>
-      <Translation x="0*cm" y="0*mm" z="-[plane_length]/2-[bottom_wall_thickness]/2"/>
+      <Translation x="0*cm" y="0*mm" z="-[plane_length]/2+[bottom_wall_thickness]/2"/>
     </PosPart>
   </PosPartSection>
 

diff --git a/Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station.xml b/Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station.xml
@@ -3,7 +3,7 @@
 
   <SolidSection label="CTPPS_Timing_Negative_Station.xml">  
     <Tube name="CTPPS_Timing_Negative_Station" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Device_Envelope_Radius]*1.1" dz="[CTPPS_Timing_Station_Parameters:Station_Length]/2"/>
-    <Tube name="CTPPS_Timing_Negative_Station_Tube_1" rMin="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2+[CTPPS_Timing_Station_Parameters:Wall_Thickness]" dz="[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2"/>
+    <Tube name="CTPPS_Timing_Negative_Station_Tube_1" rMin="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2+[CTPPS_Timing_Station_Parameters:Wall_Thickness]" dz="([CTPPS_Timing_Station_Parameters:Station_Pipe_Length]-[RP_220_Left_Station:RP_220_Left_Prim_Hor_z]-[RP_Device:RP_Device_Length_z]/2)/2"/>
     <Tube name="CTPPS_Timing_Negative_Station_Tube_2" rMin="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2+[CTPPS_Timing_Station_Parameters:Wall_Thickness]" dz="[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2"/>
     <Tube name="CTPPS_Timing_Negative_Station_Vacuum_1" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" dz="[CTPPS_Timing_Station_Parameters:Station_Length]/2"/>
     <Tube name="CTPPS_Timing_Negative_Station_Hor_Vacuum" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Timing_Hole_Diam]/2" dz="[CTPPS_Timing_Station_Parameters:Hor_Vac_Length]/2"/>
@@ -41,24 +41,24 @@
       <Translation x="[CTPPS_Diamond_X_Distance:CTPPS_Diamond_Detector_X_distance]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:180R"/>
     </PosPart>
-    <PosPart copyNumber="1">
+    <PosPart copyNumber="16">
       <rParent name="CTPPS_Timing_Negative_Station:CTPPS_Timing_Negative_Station_Vacuum_4"/>
       <rChild name="CTPPS_Timing_Horizontal_Pot:Primary_Vacuum"/>
       <rRotation name="rotations:90YX"/>
-      <Translation x="([CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:cut_depth]+[CTPPS_Timing_Horizontal_Pot:thin_window_thickness])/2" y="0*cm" z="0*cm"/>
+      <Translation x="([CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness])/2" y="0*cm" z="0*cm"/>
     </PosPart>
     <PosPart copyNumber="1">
       <rParent name="CTPPS_Timing_Negative_Station:CTPPS_Timing_Negative_Station"/>
       <rChild name="CTPPS_Timing_Negative_Station_Tube_1"/>
       <rRotation name="rotations:000D"/>
-      <Translation x="0*mm" y="0*mm" z="-([CTPPS_Timing_Station_Parameters:Station_Length]/2-[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2)"/>
-    </PosPart>
-    <PosPart copyNumber="1">
-      <rParent name="CTPPS_Timing_Negative_Station:CTPPS_Timing_Negative_Station"/>
-      <rChild name="CTPPS_Timing_Negative_Station_Tube_2"/>
-      <rRotation name="rotations:000D"/>
-      <Translation x="0*mm" y="0*mm" z="[CTPPS_Timing_Station_Parameters:Station_Length]/2-[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2"/>
+      <Translation x="0*mm" y="0*mm" z="-([CTPPS_Timing_Station_Parameters:Station_Length]/2-([CTPPS_Timing_Station_Parameters:Station_Pipe_Length]+[RP_220_Left_Station:RP_220_Left_Prim_Hor_z]+[RP_Device:RP_Device_Length_z]/2)/2)"/>
     </PosPart>
+    <!--<PosPart copyNumber="1">-->
+      <!--<rParent name="CTPPS_Timing_Negative_Station:CTPPS_Timing_Negative_Station"/>-->
+      <!--<rChild name="CTPPS_Timing_Negative_Station_Tube_2"/>-->
+      <!--<rRotation name="rotations:000D"/>-->
+      <!--<Translation x="0*mm" y="0*mm" z="[CTPPS_Timing_Station_Parameters:Station_Length]/2-[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2"/>-->
+    <!--</PosPart>-->
   </PosPartSection>
 
 </DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station.xml b/Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station.xml
@@ -3,7 +3,7 @@
 
   <SolidSection label="CTPPS_Timing_Positive_Station.xml">  
     <Tube name="CTPPS_Timing_Positive_Station" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Device_Envelope_Radius]*1.1" dz="[CTPPS_Timing_Station_Parameters:Station_Length]/2"/>
-    <Tube name="CTPPS_Timing_Positive_Station_Tube_1" rMin="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2+[CTPPS_Timing_Station_Parameters:Wall_Thickness]" dz="[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2"/>
+    <Tube name="CTPPS_Timing_Positive_Station_Tube_1" rMin="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2+[CTPPS_Timing_Station_Parameters:Wall_Thickness]" dz="([CTPPS_Timing_Station_Parameters:Station_Pipe_Length]-[RP_220_Right_Station:RP_220_Right_Prim_Hor_z]-[RP_Device:RP_Device_Length_z]/2)/2"/>
     <Tube name="CTPPS_Timing_Positive_Station_Tube_2" rMin="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2+[CTPPS_Timing_Station_Parameters:Wall_Thickness]" dz="[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2"/>
     <Tube name="CTPPS_Timing_Positive_Station_Vacuum_1" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Beam_Hole_Diam]/2" dz="[CTPPS_Timing_Station_Parameters:Station_Length]/2"/>
     <Tube name="CTPPS_Timing_Positive_Station_Hor_Vacuum" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Timing_Hole_Diam]/2" dz="[CTPPS_Timing_Station_Parameters:Hor_Vac_Length]/2"/>
@@ -41,23 +41,17 @@
       <Translation x="[CTPPS_Diamond_X_Distance:CTPPS_Diamond_Detector_X_distance]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
-    <PosPart copyNumber="1">
+    <PosPart copyNumber="116">
       <rParent name="CTPPS_Timing_Positive_Station:CTPPS_Timing_Positive_Station_Vacuum_4"/>
       <rChild name="CTPPS_Timing_Horizontal_Pot:Primary_Vacuum"/>
       <rRotation name="rotations:90YX"/>
-      <Translation x="([CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:cut_depth]+[CTPPS_Timing_Horizontal_Pot:thin_window_thickness])/2" y="0*cm" z="0*cm"/>
+      <Translation x="([CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness])/2" y="0*cm" z="0*cm"/>
     </PosPart>
     <PosPart copyNumber="1">
       <rParent name="CTPPS_Timing_Positive_Station:CTPPS_Timing_Positive_Station"/>
       <rChild name="CTPPS_Timing_Positive_Station_Tube_1"/>
       <rRotation name="rotations:000D"/>
-      <Translation x="0*mm" y="0*mm" z="-([CTPPS_Timing_Station_Parameters:Station_Length]/2-[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2)"/>
-    </PosPart>
-    <PosPart copyNumber="1">
-      <rParent name="CTPPS_Timing_Positive_Station:CTPPS_Timing_Positive_Station"/>
-      <rChild name="CTPPS_Timing_Positive_Station_Tube_2"/>
-      <rRotation name="rotations:000D"/>
-      <Translation x="0*mm" y="0*mm" z="([CTPPS_Timing_Station_Parameters:Station_Length]/2-[CTPPS_Timing_Station_Parameters:Station_Pipe_Length]/2)"/>
+      <Translation x="0*mm" y="0*mm" z="-([CTPPS_Timing_Station_Parameters:Station_Length]/2-([CTPPS_Timing_Station_Parameters:Station_Pipe_Length]+[RP_220_Right_Station:RP_220_Right_Prim_Hor_z]+[RP_Device:RP_Device_Length_z]/2)/2)"/>
     </PosPart>
   </PosPartSection>