GeomConverter/testResources/org/lcsim/geometry/subdetector

diff -u -r1.4 -r1.5
--- HPSMuonCalorimeterTest.xml	5 Dec 2012 01:05:24 -0000	1.4
+++ HPSMuonCalorimeterTest.xml	5 Dec 2012 19:57:38 -0000	1.5
@@ -5,6 +5,7 @@

     <info name="HPSMuonCalorimeterTest"/>
     
     <define>   

+        

         <!-- world volume -->
         <constant name="world_side" value="10000.0*cm" />
         <constant name="world_x" value="world_side" />

@@ -68,8 +69,7 @@

         
         <constant name="muon_sens8_x" value="muon_sens7_x" />
         <constant name="muon_sens8_y" value="muon_sens7_y" />

-        <constant name="muon_sens8_pz" value="muon_sens7_pz + muon_sens_z + muon_strip_gap" />        
-        

+        <constant name="muon_sens8_pz" value="muon_sens7_pz + muon_sens_z + muon_strip_gap" />

                      
     </define>
     

@@ -79,13 +79,14 @@

     <detectors>        
         <detector id="2" name="MUON" type="HPSMuonCalorimeter" insideTrackingVolume="false" readout="MUON_HITS">
             <layer id="1">

+                <!-- nstrips="26" strip_orientation="x" strip_gap="0.01" -->

                 <box x="muon_abs1_x" y="muon_abs1_y" z="muon_abs1_z" py="muon_py" pz="muon_abs1_pz" material="Steel235" />
                 <box x="muon_abs1_x" y="muon_abs1_y" z="muon_abs1_z" py="-muon_py" pz="muon_abs1_pz" material="Steel235"  />
                 <box x="muon_sens1_x" y="muon_sens1_y" z="muon_sens_z" py="muon_py" pz="muon_sens1_pz" material="Polystyrene" sensitive="true" />

-                <box x="muon_sens2_x" y="muon_sens2_y" z="muon_sens_z" py="muon_py" pz="muon_sens2_pz" material="Polystyrene" sensitive="true" />

                 <box x="muon_sens1_x" y="muon_sens1_y" z="muon_sens_z" py="-muon_py" pz="muon_sens1_pz" material="Polystyrene" sensitive="true" />

+                <box x="muon_sens2_x" y="muon_sens2_y" z="muon_sens_z" py="muon_py" pz="muon_sens2_pz" material="Polystyrene" sensitive="true" />

                 <box x="muon_sens2_x" y="muon_sens2_y" z="muon_sens_z" py="-muon_py" pz="muon_sens2_pz" material="Polystyrene" sensitive="true" />

-            </layer>            

+            </layer>

             <layer id="2">
                 <box x="muon_abs2_x" y="muon_abs2_y" z="muon_abs_z" py="muon_py" pz="muon_abs2_pz" material="Steel235" />
                 <box x="muon_abs2_x" y="muon_abs2_y" z="muon_abs_z" py="-muon_py" pz="muon_abs2_pz" material="Steel235" />

@@ -109,13 +110,13 @@

                 <box x="muon_sens8_x" y="muon_sens8_y" z="muon_sens_z" py="muon_py" pz="muon_sens8_pz" material="Polystyrene" sensitive="true" />
                 <box x="muon_sens7_x" y="muon_sens7_y" z="muon_sens_z" py="-muon_py" pz="muon_sens7_pz" material="Polystyrene" sensitive="true" /> 
                 <box x="muon_sens8_x" y="muon_sens8_y" z="muon_sens_z" py="-muon_py" pz="muon_sens8_pz" material="Polystyrene" sensitive="true" />         

-            </layer>                        

+            </layer>

         </detector>                
     </detectors>
     
     <readouts>
         <readout name="MUON_HITS">

-            <segmentation type="GridXYZ" gridSizeX="0.0" gridSizeY="0.0" gridSizeZ="0.0" />

+            <segmentation type="GridXYZ" gridSizeX="10.0" gridSizeY="10.0" gridSizeZ="0.0" />

             <id>system:6,side:-2,layer:4,slice:3,ix:32:-8,iy:-6</id>
         </readout>
     </readouts>