From 1daeac04b1989496bd0e094f0f58d26d02bf70fa Mon Sep 17 00:00:00 2001
From: Steven <skaplan@physics.rutgers.edu>
Date: Wed, 26 Mar 2014 19:57:49 -0500
Subject: [PATCH 1/2] new plt geometry

---
 Geometry/ForwardCommonData/data/plt.xml  | 55 ++++++++++--------------
 Geometry/ForwardSimData/data/pltsens.xml |  4 +-
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/Geometry/ForwardCommonData/data/plt.xml b/Geometry/ForwardCommonData/data/plt.xml
index b9d3dd37812aa..cfb97254f354d 100755
--- a/Geometry/ForwardCommonData/data/plt.xml
+++ b/Geometry/ForwardCommonData/data/plt.xml
@@ -18,14 +18,15 @@
         <Constant name = "SiPlane1ZtoCenter" value = "1751.8*mm" />
         <Constant name = "SiPlane2ZtoCenter" value = "1789.5*mm" />
         
-        <Constant name = "ROCWidthX" value = "10.0*mm"  />
-        <Constant name = "ROCWidthY" value = "10.0*mm"  />
+        <Constant name = "ROCWidthX" value = "8.0*mm"  />
+        <Constant name = "ROCWidthY" value = "10.5*mm"  />
         <Constant name = "SiThkZ"   value = "0.30*mm" />
         
-        <Constant name = "TelWidthX" value = "[ROCWidthX]+2.*mm" />
-        <Constant name = "TelWidthY" value = "[ROCWidthY]" />
+        <Constant name = "TelWidthX" value = "[ROCWidthX]" />
+        <Constant name = "TelWidthY" value = "[ROCWidthY]+2.*mm" />
         <Constant name = "TelWidthZ" value = "[SiPlane2ZtoCenter]-[SiPlane0ZtoCenter]+[SiThkZ]"  />
-        <Constant name = "PLTMaxR"   value = "sqrt((([SiPlane2RtoCenter]+[ROCWidthX]/2.)*([SiPlane2RtoCenter]+[ROCWidthX]/2.))+([ROCWidthX]/2.)*([ROCWidthX]/2.))" />
+        <Constant name = "PLTMinR"   value = "[cms:TrackBeamR1]" />
+        <Constant name = "PLTMaxR"   value = "[cms:TrackLumiR1]" />
         
         <Constant name = "NumberOfRows" value = "80" />
         <Constant name = "NumberOfColumns" value = "52" />
@@ -39,29 +40,20 @@
     <!-- Declare PLT component Solids  -->
     <SolidSection label="plt">
         
-        <!-- Declare telescope components-->
-        <Box  name="PLTSensorPlane"        dx="[ROCWidthX]/2."       dy="[ROCWidthY]/2."       
-        dz="[SiThkZ]/2." /> 
+        <Box  name="PLTSensorPlane" dx="[ROCWidthX]/2." dy="[ROCWidthY]/2." dz="[SiThkZ]/2." /> 
         
-        <Tubs name="PLT"    startPhi="0.0*deg" deltaPhi="360*deg" rMin="[cms:TrackBeamR1]" 
-        rMax="[PLTMaxR]" 
-        dz="[TelWidthZ]/2."/>
-        <!--
-        <Tubs name="Telescope"      startPhi="-22.5*deg" deltaPhi="45.*deg" rMin="0.*mm"
-        rMax="56.*mm"  dz="[TelWidthZ]"/> -->
+        <Tubs name="PLT" startPhi="0.0*deg" deltaPhi="360*deg" rMin="[PLTMinR]" rMax="[PLTMaxR]" dz="[TelWidthZ]/2."/>
         
         <Box  name="Telescope"  dx="[TelWidthX]/2."  dy="[TelWidthY]/2."   dz="[TelWidthZ]/2." />
         
-        <Box  name="PLTPixel"  dx="[PixelColumnWidth]/2."  dy="[PixelRowWidth]/2."   dz="[SiThkZ]/2." />
+        <Box  name="PLTPixel"  dx="[PixelColumnWidth]/2." dy="[PixelRowWidth]/2." dz="[SiThkZ]/2." />
         
-        <Box name ="PLTSensorRow" dx="[ActiveAreaColumnWidth]/2." dy="[PixelRowWidth]/2." dz="[SiThkZ]/2." />
+        <Box  name="PLTSensorRow" dx="[ActiveAreaColumnWidth]/2." dy="[PixelRowWidth]/2." dz="[SiThkZ]/2." />
         
     </SolidSection>
     
     <!-- Define the Physical PLT Solids, i.e. the Logical Parts --> 
     <LogicalPartSection label="plt">
-        <!--Changed all materials to be materials:Vacuum except for silicon -->
-        <!-- Telescope logical parts -->
         <LogicalPart name="PLT" category="unspecified">
             <rSolid name="PLT"/>
             <rMaterial name="materials:Vacuum"/>
@@ -89,11 +81,8 @@
         
     </LogicalPartSection>
     
-    <!-- Position the Silicon in the telescope and copy the telescope to have 8 of them.  Take this amalgamation of 8 telescopes then copy it to have one on each end of the IP--> 
+    <!-- Position the Silicon in the telescope and copy the telescope to have 8 of them.  Take this amalgamation of 8 telescopes then copy it into the PLTBCM volume--> 
     <PosPartSection label="plt">
-        
-        <!-- Positioning Silicon in the telescope -->
-        
         <!-- Copy the pixels into a row to form the columns -->
         <Algorithm name="global:DDLinear">
             <rParent name="PLTSensorRow"/>
@@ -118,32 +107,33 @@
             <Numeric name="Theta" value="90*deg"/>
             <Numeric name="Phi" value="-90.*deg"/>
         </Algorithm>
-        
+        <!-- Copy the three sensor planes into the telescope-->
         <PosPart copyNumber="0">
             <rParent name="Telescope"/>
             <rChild name="PLTSensorPlane"/>
-            <Translation x="-[TelWidthX]/2.+[ROCWidthX]/2." y="0.*mm" z="-[TelWidthZ]/2.+[SiThkZ]/2." />
+            <Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2." z="-[TelWidthZ]/2.+[SiThkZ]/2." />
             <rRotation  name="rotations:000D" />
         </PosPart>
         
         <PosPart copyNumber="1">
             <rParent name="Telescope"/>
             <rChild name="PLTSensorPlane"/>
-            <Translation x="-[TelWidthX]/2.+[ROCWidthX]/2.+1.*mm" y="0.*mm" z="0.*mm" />
+            <Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+1.*mm" z="0.*mm" />
             <rRotation  name="rotations:000D" />
         </PosPart>
         
         <PosPart copyNumber="2">
             <rParent name="Telescope"/>
             <rChild name="PLTSensorPlane"/>
-            <Translation x="-[TelWidthX]/2.+[ROCWidthX]/2.+2.*mm" y="0.*mm" z="[TelWidthZ]/2.-[SiThkZ]/2" />
+            <Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+2.*mm" z="[TelWidthZ]/2.-[SiThkZ]/2" />
             <rRotation  name="rotations:000D" />
         </PosPart>
-
+        <!-- Copy the PLT into the PLTBCM volume -->
+        <!-- NOTE: The 2mm shift is due to the new tracker volume to make the plt planes positioned in |z| correctly.-->
         <PosPart copyNumber="1">
             <rParent name="pltbcm:PLTBCM"/>
             <rChild name="PLT"/>
-            <Translation x="0.*mm" y="0.*mm" z="[SiPlane1ZtoCenter]-[pltbcm:PltBcmZ]" />
+            <Translation x="0.*mm" y="0.*mm" z="[SiPlane1ZtoCenter]-[pltbcm:PltBcmZ]-2.*mm" />
             <rRotation name="rotations:000D"/>
         </PosPart>
 
@@ -155,14 +145,14 @@
             <rRotation name="rotations:000D"/>
         </PosPart>
 
-	
+    
         <PosPart copyNumber="0">
             <rParent name="cms:CMSE"/>
             <rChild name="PLT"/>
             <Translation x="0.*mm" y="0.*mm" z="-[SiPlane1ZtoCenter]" />
             <rRotation name="rotations:180D"/>
         </PosPart> -->
-        
+        <!-- Copy the telescopes into the PLT volume starting with phi=90 degrees.  RotateSolid vector gives correct orientation of the planes-->
         <Algorithm name="global:DDAngular">
             <rParent name="PLT"/>
             <String name="ChildName" value="Telescope"/>
@@ -170,13 +160,12 @@
             <Numeric name="IncrCopyNo" value="1"/>
             <Numeric name="N" value="8"/>
             <Numeric name="Radius" value="[SiPlane1RtoCenter]"/>
-            <Numeric name="StartAngle" value="0.*deg"/>
+            <Numeric name="StartAngle" value="90.*deg"/>
             <Numeric name="RangeAngle" value="360*deg"/>
             <Vector name="Center" type="numeric" nEntries="3"> 0, 0, 0 </Vector>
             <Vector name="RotateSolid" type="numeric" nEntries="24"> 0.*deg, 0.*deg, -90.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg </Vector>
         </Algorithm>
-        
-        
+
     </PosPartSection>
     
 </DDDefinition>
diff --git a/Geometry/ForwardSimData/data/pltsens.xml b/Geometry/ForwardSimData/data/pltsens.xml
index b083b9f6298ec..09766c48686cd 100644
--- a/Geometry/ForwardSimData/data/pltsens.xml
+++ b/Geometry/ForwardSimData/data/pltsens.xml
@@ -2,9 +2,9 @@
 <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">
  <SpecParSection label="pltsens.xml" eval="true">
   <SpecPar name="plt">
-   <PartSelector path="//PLTSensitiveDetector"/>
+   <PartSelector path="//PLTPixel"/>
    <Parameter name="SensitiveDetector" value="PLTSensitiveDetector" eval="false"/>
    <Parameter name="ReadOutName" value="PLTHits" eval="false"/>
   </SpecPar>
  </SpecParSection>
-</DDDefinition>
+</DDDefinition>
\ No newline at end of file

From c5db4a42992f3c890721447b71bd3fea275dfc0e Mon Sep 17 00:00:00 2001
From: Steven <skaplan@physics.rutgers.edu>
Date: Thu, 27 Mar 2014 14:14:16 -0500
Subject: [PATCH 2/2] final measurment changes, shift telescopes by 22.5
 degrees

---
 Geometry/ForwardCommonData/data/plt.xml | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Geometry/ForwardCommonData/data/plt.xml b/Geometry/ForwardCommonData/data/plt.xml
index cfb97254f354d..bd56c177ef3fd 100755
--- a/Geometry/ForwardCommonData/data/plt.xml
+++ b/Geometry/ForwardCommonData/data/plt.xml
@@ -10,20 +10,20 @@
     <ConstantsSection label="plt" eval="true">
         <Constant name = "pltTilt" value = "1.57*deg" />
         
-        <Constant name = "SiPlane0RtoCenter" value = "48.5*mm" />
-        <Constant name = "SiPlane1RtoCenter" value = "49.5*mm" />
-        <Constant name = "SiPlane2RtoCenter" value = "50.5*mm" />
+        <Constant name = "SiPlane0RtoCenter" value = "49.9*mm" />
+        <Constant name = "SiPlane1RtoCenter" value = "51.*mm" />
+        <Constant name = "SiPlane2RtoCenter" value = "52.1*mm" />
         
-        <Constant name = "SiPlane0ZtoCenter" value = "1714.1*mm" />
-        <Constant name = "SiPlane1ZtoCenter" value = "1751.8*mm" />
-        <Constant name = "SiPlane2ZtoCenter" value = "1789.5*mm" />
+        <Constant name = "SiPlane0ZtoCenter" value = "1726.9*mm" />
+        <Constant name = "SiPlane1ZtoCenter" value = "1764.6*mm" />
+        <Constant name = "SiPlane2ZtoCenter" value = "1802.3*mm" />
         
         <Constant name = "ROCWidthX" value = "8.0*mm"  />
         <Constant name = "ROCWidthY" value = "10.5*mm"  />
         <Constant name = "SiThkZ"   value = "0.30*mm" />
         
         <Constant name = "TelWidthX" value = "[ROCWidthX]" />
-        <Constant name = "TelWidthY" value = "[ROCWidthY]+2.*mm" />
+        <Constant name = "TelWidthY" value = "[ROCWidthY]+2.2*mm" />
         <Constant name = "TelWidthZ" value = "[SiPlane2ZtoCenter]-[SiPlane0ZtoCenter]+[SiThkZ]"  />
         <Constant name = "PLTMinR"   value = "[cms:TrackBeamR1]" />
         <Constant name = "PLTMaxR"   value = "[cms:TrackLumiR1]" />
@@ -40,15 +40,15 @@
     <!-- Declare PLT component Solids  -->
     <SolidSection label="plt">
         
-        <Box  name="PLTSensorPlane" dx="[ROCWidthX]/2." dy="[ROCWidthY]/2." dz="[SiThkZ]/2." /> 
+        <Box name="PLTSensorPlane" dx="[ROCWidthX]/2." dy="[ROCWidthY]/2." dz="[SiThkZ]/2." /> 
         
         <Tubs name="PLT" startPhi="0.0*deg" deltaPhi="360*deg" rMin="[PLTMinR]" rMax="[PLTMaxR]" dz="[TelWidthZ]/2."/>
         
-        <Box  name="Telescope"  dx="[TelWidthX]/2."  dy="[TelWidthY]/2."   dz="[TelWidthZ]/2." />
+        <Box name="Telescope"  dx="[TelWidthX]/2."  dy="[TelWidthY]/2."   dz="[TelWidthZ]/2." />
         
-        <Box  name="PLTPixel"  dx="[PixelColumnWidth]/2." dy="[PixelRowWidth]/2." dz="[SiThkZ]/2." />
+        <Box name="PLTPixel"  dx="[PixelColumnWidth]/2." dy="[PixelRowWidth]/2." dz="[SiThkZ]/2." />
         
-        <Box  name="PLTSensorRow" dx="[ActiveAreaColumnWidth]/2." dy="[PixelRowWidth]/2." dz="[SiThkZ]/2." />
+        <Box name="PLTSensorRow" dx="[ActiveAreaColumnWidth]/2." dy="[PixelRowWidth]/2." dz="[SiThkZ]/2." />
         
     </SolidSection>
     
@@ -118,14 +118,14 @@
         <PosPart copyNumber="1">
             <rParent name="Telescope"/>
             <rChild name="PLTSensorPlane"/>
-            <Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+1.*mm" z="0.*mm" />
+            <Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+1.1*mm" z="0.*mm" />
             <rRotation  name="rotations:000D" />
         </PosPart>
         
         <PosPart copyNumber="2">
             <rParent name="Telescope"/>
             <rChild name="PLTSensorPlane"/>
-            <Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+2.*mm" z="[TelWidthZ]/2.-[SiThkZ]/2" />
+            <Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+2.2*mm" z="[TelWidthZ]/2.-[SiThkZ]/2" />
             <rRotation  name="rotations:000D" />
         </PosPart>
         <!-- Copy the PLT into the PLTBCM volume -->
@@ -152,7 +152,7 @@
             <Translation x="0.*mm" y="0.*mm" z="-[SiPlane1ZtoCenter]" />
             <rRotation name="rotations:180D"/>
         </PosPart> -->
-        <!-- Copy the telescopes into the PLT volume starting with phi=90 degrees.  RotateSolid vector gives correct orientation of the planes-->
+        <!-- Copy the telescopes into the PLT volume starting with phi=112.5 degrees.  RotateSolid vector gives correct orientation of the planes-->
         <Algorithm name="global:DDAngular">
             <rParent name="PLT"/>
             <String name="ChildName" value="Telescope"/>
@@ -160,7 +160,7 @@
             <Numeric name="IncrCopyNo" value="1"/>
             <Numeric name="N" value="8"/>
             <Numeric name="Radius" value="[SiPlane1RtoCenter]"/>
-            <Numeric name="StartAngle" value="90.*deg"/>
+            <Numeric name="StartAngle" value="112.5*deg"/>
             <Numeric name="RangeAngle" value="360*deg"/>
             <Vector name="Center" type="numeric" nEntries="3"> 0, 0, 0 </Vector>
             <Vector name="RotateSolid" type="numeric" nEntries="24"> 0.*deg, 0.*deg, -90.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg </Vector>