diff -u -r1.6 -r1.7
--- HPS-Test-JLAB-v4pt0.lcdd	23 Feb 2012 00:08:11 -0000	1.6
+++ HPS-Test-JLAB-v4pt0.lcdd	19 Mar 2012 22:51:54 -0000	1.7
@@ -2,7 +2,7 @@

 <lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
   <header>
     <detector name="HPS-Test-JLAB-v4pt0" />

-    <generator name="GeomConverter" version="1.0" file="compact.xml" checksum="4015074162" />

+    <generator name="GeomConverter" version="1.0" file="./detectors/HPS-Test-JLAB-v4pt0/compact.xml" checksum="2204325222" />

     <author name="NONE" />
     <comment>HPS Test Proposal detector</comment>
   </header>

@@ -85,8 +85,8 @@

       <constant name="world_y" value="5000.0" />
       <constant name="world_z" value="5000.0" />
       <constant name="world_x" value="5000.0" />

-      <constant name="SA2" value="0.05" />

       <constant name="ecal_front" value="6.65" />

+      <constant name="SA2" value="0.05" />

       <constant name="tracking_region_min" value="50.0" />
       <constant name="ygap5" value="21.0" />
       <constant name="ygap3" value="9.0" />

@@ -97,6 +97,7 @@

       <constant name="tracking_region_zmax" value="1000.0" />
       <constant name="ecal_back" value="8.0" />
       <constant name="moduleWidth" value="40.34" />

+      <constant name="pi" value="3.14159" />

       <constant name="SA" value="0.1" />
       <position name="TungstenTargetVolume_component0_position" x="0.0" y="0.0" z="0.0" unit="mm" />
       <rotation name="TungstenTargetVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />

@@ -109,45 +110,45 @@

       <position name="Module1Volume_component1_position" x="0.0" y="0.0" z="0.16" unit="mm" />
       <rotation name="Module1Volume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
       <position name="Tracker_layer1_module0_position" x="0.0" y="21.67" z="100.0" unit="mm" />

-      <rotation name="Tracker_layer1_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer1_module0_rotation" x="0.0" y="0.0" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_layer1_module0_reflect_position" x="0.0" y="-21.67" z="100.0" unit="mm" />

-      <rotation name="Tracker_layer1_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer1_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />

       <position name="Tracker_layer2_module0_position" x="0.0" y="21.67" z="110.0" unit="mm" />

-      <rotation name="Tracker_layer2_module0_rotation" x="0.0" y="0.0" z="1.6707963267948966" unit="radian" />

+      <rotation name="Tracker_layer2_module0_rotation" x="0.0" y="3.14159" z="-4.812386326794897" unit="radian" />

       <position name="Tracker_layer2_module0_reflect_position" x="0.0" y="-21.67" z="110.0" unit="mm" />

-      <rotation name="Tracker_layer2_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />

+      <rotation name="Tracker_layer2_module0_reflect_rotation" x="0.0" y="3.14159" z="-1.5707936732051033" unit="radian" />

       <position name="Tracker_layer3_module0_position" x="0.0" y="23.17" z="200.0" unit="mm" />

-      <rotation name="Tracker_layer3_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer3_module0_rotation" x="0.0" y="0.0" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_layer3_module0_reflect_position" x="0.0" y="-23.17" z="200.0" unit="mm" />

-      <rotation name="Tracker_layer3_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer3_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />

       <position name="Tracker_layer4_module0_position" x="0.0" y="23.17" z="210.0" unit="mm" />

-      <rotation name="Tracker_layer4_module0_rotation" x="0.0" y="0.0" z="1.6707963267948966" unit="radian" />

+      <rotation name="Tracker_layer4_module0_rotation" x="0.0" y="3.14159" z="-4.812386326794897" unit="radian" />

       <position name="Tracker_layer4_module0_reflect_position" x="0.0" y="-23.17" z="210.0" unit="mm" />

-      <rotation name="Tracker_layer4_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />

+      <rotation name="Tracker_layer4_module0_reflect_rotation" x="0.0" y="3.14159" z="-1.5707936732051033" unit="radian" />

       <position name="Tracker_layer5_module0_position" x="0.0" y="24.67" z="300.0" unit="mm" />

-      <rotation name="Tracker_layer5_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer5_module0_rotation" x="0.0" y="0.0" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_layer5_module0_reflect_position" x="0.0" y="-24.67" z="300.0" unit="mm" />

-      <rotation name="Tracker_layer5_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer5_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />

       <position name="Tracker_layer6_module0_position" x="0.0" y="24.67" z="310.0" unit="mm" />

-      <rotation name="Tracker_layer6_module0_rotation" x="0.0" y="0.0" z="1.6707963267948966" unit="radian" />

+      <rotation name="Tracker_layer6_module0_rotation" x="0.0" y="3.14159" z="-4.812386326794897" unit="radian" />

       <position name="Tracker_layer6_module0_reflect_position" x="0.0" y="-24.67" z="310.0" unit="mm" />

-      <rotation name="Tracker_layer6_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />

+      <rotation name="Tracker_layer6_module0_reflect_rotation" x="0.0" y="3.14159" z="-1.5707936732051033" unit="radian" />

       <position name="Tracker_layer7_module0_position" x="0.0" y="27.67" z="500.0" unit="mm" />

-      <rotation name="Tracker_layer7_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer7_module0_rotation" x="0.0" y="0.0" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_layer7_module0_reflect_position" x="0.0" y="-27.67" z="500.0" unit="mm" />

-      <rotation name="Tracker_layer7_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer7_module0_reflect_rotation" x="0.0" y="0.0" z="1.5207963267948965" unit="radian" />

       <position name="Tracker_layer8_module0_position" x="0.0" y="27.67" z="510.0" unit="mm" />

-      <rotation name="Tracker_layer8_module0_rotation" x="0.0" y="0.0" z="1.6207963267948966" unit="radian" />

+      <rotation name="Tracker_layer8_module0_rotation" x="0.0" y="3.14159" z="-4.762386326794896" unit="radian" />

       <position name="Tracker_layer8_module0_reflect_position" x="0.0" y="-27.67" z="510.0" unit="mm" />

-      <rotation name="Tracker_layer8_module0_reflect_rotation" x="0.0" y="0.0" z="1.5207963267948965" unit="radian" />

+      <rotation name="Tracker_layer8_module0_reflect_rotation" x="0.0" y="3.14159" z="-1.5707936732051033" unit="radian" />

       <position name="Tracker_layer9_module0_position" x="0.0" y="30.67" z="700.0" unit="mm" />

-      <rotation name="Tracker_layer9_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer9_module0_rotation" x="0.0" y="0.0" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_layer9_module0_reflect_position" x="0.0" y="-30.67" z="700.0" unit="mm" />

-      <rotation name="Tracker_layer9_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_layer9_module0_reflect_rotation" x="0.0" y="0.0" z="1.5207963267948965" unit="radian" />

       <position name="Tracker_layer10_module0_position" x="0.0" y="30.67" z="710.0" unit="mm" />

-      <rotation name="Tracker_layer10_module0_rotation" x="0.0" y="0.0" z="1.6207963267948966" unit="radian" />

+      <rotation name="Tracker_layer10_module0_rotation" x="0.0" y="3.14159" z="-4.762386326794896" unit="radian" />

       <position name="Tracker_layer10_module0_reflect_position" x="0.0" y="-30.67" z="710.0" unit="mm" />

-      <rotation name="Tracker_layer10_module0_reflect_rotation" x="0.0" y="0.0" z="1.5207963267948965" unit="radian" />

+      <rotation name="Tracker_layer10_module0_reflect_rotation" x="0.0" y="3.14159" z="-1.5707936732051033" unit="radian" />

       <position name="crystal1-1_pos_pos_bot" x="7.4747392753955415" y="-27.474739275395542" z="1450.1626281236922" unit="mm" />
       <rotation name="crystal1-1_rot_pos_bot" x="-0.0084372997827221" y="-0.0084372997827221" z="0.0" unit="radian" />
       <position name="crystal1-1_pos_neg_bot" x="-7.4747392753955415" y="-27.474739275395542" z="1450.1626281236922" unit="mm" />