Commit in lcsim/src/org/lcsim/contrib/subdetector/tracker/silicon on MAIN
GeometryInfo.java+5-51.1 -> 1.2
PVolume.java+1-11.1 -> 1.2
Hep3Rotation.java+11.1 -> 1.2
+7-6
3 modified files
Resolve minor bugs that broke compile.
lcsim/src/org/lcsim/contrib/subdetector/tracker/silicon
GeometryInfo.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- GeometryInfo.java	10 Nov 2006 21:06:22 -0000	1.1
+++ GeometryInfo.java	14 Feb 2007 23:34:33 -0000	1.2
@@ -58,14 +58,14 @@

     public String childVolumeName(Hep3Vector global_point)
     {
         Hep3Vector parent_point = globalToLocal(global_point);

-        List<PVolume> daughter_volumes = getLogicalVolume().getDaughters();

+        List<PVolume> daughter_volumes = getLogicalVolume().getPVolumes();

         
         String volume_name = "";
         for (PVolume daughter_volume : _daughter_volumes)
         {            

-            if (daughter_volume.getLogicalVolume().getSolid().isInside(daughter_volume.parentToLocal(parent_point)));

+            if (daughter_volume.getLVolume().getSolid().isInside(daughter_volume.parentToLocal(parent_point)));

             {

-                volume_name = daughter_volume.getLogicalVolume().getName();

+                volume_name = daughter_volume.getLVolumeName();

                 break;
             }
         }        

@@ -75,12 +75,12 @@

     public PVolume childVolume(Hep3Vector global_point)
     {
         Hep3Vector parent_point = globalToLocal(global_point);

-        List<PVolume> daughter_volumes = getLogicalVolume().getDaughters();

+        List<PVolume> daughter_volumes = getLogicalVolume().getPVolumes();

         
         PVolume volume = null;
         for (PVolume daughter_volume : _daughter_volumes)
         {            

-            if (daughter_volume.getLogicalVolume().getSolid().isInside(daughter_volume.parentToLocal(parent_point)));

+            if (daughter_volume.getLVolume().getSolid().isInside(daughter_volume.parentToLocal(parent_point)));

             {
                 volume = daughter_volume;
                 break;
lcsim/src/org/lcsim/contrib/subdetector/tracker/silicon
PVolume.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- PVolume.java	10 Nov 2006 21:06:22 -0000	1.1
+++ PVolume.java	14 Feb 2007 23:34:33 -0000	1.2
@@ -50,7 +50,7 @@

         return _lvolume_name;
     }
     

-    public LVolume getLVolume(String name)

+    public LVolume getLVolume()

     {
         return GeometryCatalog.getInstance().getLVolume(_lvolume_name);
     }
lcsim/src/org/lcsim/contrib/subdetector/tracker/silicon
Hep3Rotation.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Hep3Rotation.java	10 Nov 2006 21:06:23 -0000	1.1
+++ Hep3Rotation.java	14 Feb 2007 23:34:33 -0000	1.2
@@ -25,6 +25,7 @@

     /** Creates a new instance of Hep3Rotation */
     public Hep3Rotation()
     {

+        // FIXME: Need to have identity as default.  Not currently supported in freehep

     }
 
     // Static Methods
CVSspam 0.2.8