Commit in GeomConverter on MAIN
test/org/lcsim/geometry/field/FieldMap3DTest.java+1-11.3 -> 1.4
testResources/org/lcsim/geometry/field/FieldMap3DTest.xml+4-821.5 -> 1.6
+5-83
2 modified files
backing out on tests

GeomConverter/test/org/lcsim/geometry/field
FieldMap3DTest.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- FieldMap3DTest.java	10 Sep 2013 19:19:13 -0000	1.3
+++ FieldMap3DTest.java	10 Sep 2013 21:04:06 -0000	1.4
@@ -30,7 +30,7 @@
         FieldMap map = det.getFieldMap();
 
         double[] off = {2.117, 0.0, 45.72};
-        double[] fp = {-250.0, -89.0, -1500.};
+        double[] fp = {-25.0, -8.9, -150.};
         double[] B = new double[3];
 
         // field at first map position should be zero since we offset the field

GeomConverter/testResources/org/lcsim/geometry/field
FieldMap3DTest.xml 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- FieldMap3DTest.xml	10 Sep 2013 19:19:13 -0000	1.5
+++ FieldMap3DTest.xml	10 Sep 2013 21:04:06 -0000	1.6
@@ -13,95 +13,17 @@
 
     <!-- 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="131.8*cm"/>
-    
-       <!-- SVT module dimensions -->
-        <constant name="moduleLength" value="100.0"/>
-        <constant name="moduleWidth" value="100.0"/>
-        
-        <!-- SVT sensor dimensions -->
-        <constant name="sensorLength" value="100.0"/>
-        
-        
-        <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
-        <constant name="sensorWidth" value="100.0"/> 
-        
-        <!-- Positions of sensor centers along beam relative to nominal target position -->
-        <constant name="z01" value="92.5-3.685" />
-        <constant name="z02" value="92.5+3.685" />
-        <constant name="z03" value="192.5-3.685" />
-        <constant name="z04" value="192.5+3.685" />
-        <constant name="z05" value="292.5-3.685" />
-        <constant name="z06" value="292.5+3.685" />
-        <constant name="z07" value="492.5-3.685" />
-        <constant name="z08" value="492.5+3.685" />
-        <constant name="z09" value="692.5-3.685" />
-        <constant name="z10" value="692.5+3.685" />
-        <constant name="z11" value="892.5-3.685" />
-        <constant name="z12" value="892.5+3.685" />           
+          
   </define>
 
-  <materials>
-<!-- Set tracking material to vacuum. -->
-        <material name="TrackingMaterial">
-            <D type="density" unit="g/cm3" value="0.0000000000000001"/>
-            <fraction n="1.0" ref="Air" />
-        </material>      
+  <materials>     
   </materials>
 
-  <detectors>
-        <detector id="1" name="SimpleTracker" type="HPSTracker2" readout="TrackerHits" combineHits="true">
-            <comment>The Silicon Vertex Tracker</comment>
-            <module name="TestPlane">
-                <box x="moduleLength" y="moduleWidth" />
-                <module_component thickness="0.032*cm" material = "TrackingMaterial" sensitive="true">
-                    <dimensions x="sensorLength" y="sensorWidth" /> 
-                </module_component>
-            </module>            
-            <layer id="1">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z01" rx="0.0" ry="0.0" rz="0.0"/>
-                  </layer>
-            <layer id="2">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z02" rx="0.0" ry="0.0" rz="0.0"/>
-                   </layer>
-            <layer id="3">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z03" rx="0.0" ry="0.0" rz="0.0"/>
-            </layer>
-            <layer id="4">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z04" rx="0.0" ry="0.0" rz="0.0"/>
-            </layer>
-            <layer id="5">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z05" rx="0.0" ry="0.0" rz="0.0"/>
-           </layer>
-            <layer id="6">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z06" rx="0.0" ry="0.0" rz="0.0"/>
-            </layer>
-            <layer id="7">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z07" rx="0.0" ry="0.0" rz="0.0"/>
-           </layer>
-            <layer id="8">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z08" rx="0.0" ry="0.0" rz="0.0"/>
-          </layer>
-            <layer id="9">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z09" rx="0.0" ry="0.0" rz="0.0"/>
-          </layer>
-            <layer id="10">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z10" rx="0.0" ry="0.0" rz="0.0"/>
-          </layer>
-            <layer id="11">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z11" rx="0.0" ry="0.0" rz="0.0"/>
-           </layer>
-            <layer id="12">
-                <module_placement name="TestPlane" id="0" x="0.0" y="0.0" z="z12" rx="0.0" ry="0.0" rz="0.0"/>
-            </layer>
-        </detector>      
+  <detectors>  
   </detectors>
 
-  <readouts>
-        <readout name="TrackerHits">
-            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
-        </readout>      
+  <readouts>      
   </readouts>
   
   <fields>
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1