diff -u -r1.8 -r1.9
--- compact.xml	29 May 2012 21:39:19 -0000	1.8
+++ compact.xml	4 Jun 2012 23:36:57 -0000	1.9
@@ -3,31 +3,38 @@

        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
     
     <info name="HPS-TestRun-v2">

-        <comment>HPS Test Proposal detector explicit SVT module placements</comment>

+        <comment>HPS JLab Test Run detector</comment>

     </info>
 
     <define>

+    

         <!-- world -->
         <constant name="world_side" value="500.0*cm" />
         <constant name="world_x" value="world_side" />
         <constant name="world_y" value="world_side" />
         <constant name="world_z" value="world_side" />

+        

         <!-- tracking region -->
         <constant name="tracking_region_radius" value="200.0*cm"/>
         <constant name="tracking_region_min" value="5.0*cm"/>
         <constant name="tracking_region_zmax" value="100.0*cm"/>

+        
+        <!-- ECAL -->
+        <constant name="ecal_front" value="13.3/2*mm" />
+        <constant name="ecal_back" value="16/2*mm" />
+        <constant name="ecal_z" value="160/2*mm" />
+        <constant name="ecal_dx" value="41.27*mm" />
+                

         <!-- SVT module dimensions -->
         <constant name="moduleLength" value="100.0"/>
         <constant name="moduleWidth" value="40.34"/>

+        

         <!-- SVT sensor dimensions -->
         <constant name="sensorLength" value="98.33"/>

+        

         <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
         <constant name="sensorWidth" value="38.3399"/>

-        <!-- ECAL -->
-        <constant name="ecal_front" value="13.3/2*mm" />
-        <constant name="ecal_back" value="16/2*mm" />
-        <constant name="ecal_z" value="160/2*mm" />
-        

+                

         <!-- positions derived from drawing assuming 1.35/1.2 degress open on top/bottom -->
         <constant name="x_rot_top" value="-0.0235619449" />
         <constant name="x_rot_bot" value="0.020943951" />

@@ -202,23 +209,13 @@

             <comment>The crystal ECal</comment>
             <material name="LeadTungstate" />
             <dimensions x1="ecal_front" y1="ecal_front" x2="ecal_back" y2="ecal_back" z="ecal_z" />

-          <!--  <layout beamgap="20.0*mm" nx="46" ny="5" dface="137.0*cm">-->
-          <!-- Measurements as found in installation by Stepan -->

+            <!-- Measurements as found in installation by Stepan -->

             <layout beamgap="37.0*mm" nx="46" ny="5" dface="152.4*cm">
                 <remove ixmin="-10" ixmax="-2" iymin="-1" iymax="1" />

+                <top dx="ecal_dx" dy="0." dz="0."/>
+                <bottom dx="ecal_dx" dy="0." dz="0."/>

             </layout>
         </detector>

-<!--        <detector id="10" name="Target" type="SiTrackerSpectrometer" readout="TargetHits" reflect="false">
-            <comment>The Tungsten fixed target</comment>
-            <module name="TungstenTarget">
-                <trd x1="5*cm" x2="5*cm" z="5*cm" />
-                <module_component thickness="0.3504*cm*0.00125" material="Tungsten" sensitive="false"/>
-            </module>
-            <layer id="1">
-                <quadrant xStart="0" nx="1" xStep="moduleLength" yStart="0" ny="1" yStep="moduleWidth" phi0="0.0" z="0.0" dz="0.0*cm"  module="TungstenTarget"/>
-            </layer>
-        </detector>-->
-

     </detectors>
     
     <readouts>   

@@ -229,9 +226,6 @@

             <segmentation type="GridXYZ" gridSizeX="0.0" gridSizeY="0.0" gridSizeZ="0.0" />
             <id>system:6,layer:2,ix:-8,iy:-6</id>
         </readout>

-        <readout name="TargetHits">
-            <id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12</id>
-        </readout>

     </readouts>
 
     <fields>