diff -N Transform3D.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Transform3D.java	9 Mar 2007 22:23:55 -0000	1.1
@@ -0,0 +1,165 @@

+/*
+ * CoordinateTransformation3D.java
+ */
+
+package org.lcsim.detector;
+
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import hep.physics.vec.VecOp;
+
+/**
+ * A class for representing a 3D coordinate transformation
+ * using a @see Rotation3D for the rotation and a
+ * @see hep.physics.vec.Hep3Vector for the translation.
+ *
+ * @author Tim Nelson <[log in to unmask]>
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
+public class Transform3D 
+implements ICoordinateTransformation3D
+{
+    
+    // Fields
+    Hep3Vector _translation = new BasicHep3Vector(0.0,0.0,0.0);
+    Rotation3D _rotation = new Rotation3D();
+            
+    /**
+     * Creates a new instance of CoordinateTransformation3D
+     * with the identity matrix.
+     */
+    public Transform3D()
+    {}
+    
+    public Transform3D(Rotation3D rotation)
+    {
+    	this._rotation = rotation;
+    }
+    
+    public Transform3D(Hep3Vector translation)
+    {
+    	this._translation = translation;
+    }
+    
+    public Transform3D(Hep3Vector translation, Rotation3D rotation)
+    {
+        _translation = translation;
+        _rotation = rotation;
+    }
+    
+    public Transform3D(Hep3Vector translation, IRotation3D rotation)
+    {
+    	_translation = translation;
+    	_rotation = (Rotation3D)rotation;
+    }
+    
+    // Access to translation and rotation
+    public Hep3Vector getTranslation()
+    {
+        return _translation;
+    }
+    
+    public Rotation3D getRotation()
+    {
+        return _rotation;
+    }
+    
+    // Transformations in place
+    public void transform(Hep3Vector coordinates)
+    {
+//        System.out.println("Input coordinates: "+coordinates);
+//        System.out.println("Translation: "+_translation);
+        translate(coordinates);
+//        System.out.println("Translated coordinates: "+coordinates);
+        
+//        System.out.println("Rotation: "+_rotation);
+        rotate(coordinates);
+//        System.out.println("Rotated coordinates: "+coordinates);
+        
+//        return coordinates;
+    }
+    
+    public void translate(Hep3Vector coordinates)
+    {
+        Hep3Vector new_coordinates = VecOp.add(coordinates,_translation);
+        ((BasicHep3Vector)coordinates).setV(new_coordinates.x(),new_coordinates.y(),new_coordinates.z());
+    }
+    
+    public void rotate(Hep3Vector coordinates)
+    {
+        Hep3Vector new_coordinates = VecOp.mult(_rotation.getRotationMatrix(),coordinates);
+        ((BasicHep3Vector)coordinates).setV(new_coordinates.x(),new_coordinates.y(),new_coordinates.z());
+    }
+     
+    // Return transformed vectors
+    public Hep3Vector transformed(Hep3Vector coordinates)
+    {    
+        return rotated(translated(coordinates));
+    }
+    
+    public Hep3Vector translated(Hep3Vector coordinates)
+    {
+        return VecOp.add(coordinates,_translation);
+    }
+    
+    public Hep3Vector rotated(Hep3Vector coordinates)
+    {
+        return VecOp.mult(_rotation.getRotationMatrix(),coordinates);
+    }
+    
+    // Invert the transformation
+    public void invert()
+    {
+        _translation = VecOp.mult(-1.0,VecOp.mult(_rotation.getRotationMatrix(),_translation));
+        _rotation.invert();
+    }
+    
+    public Transform3D inverse()
+    {
+        Transform3D transform = new Transform3D(
+                VecOp.mult(-1.0,VecOp.mult(_rotation.getRotationMatrix(),_translation)),
+                _rotation.inverse());
+        return transform;
+    }
+    
+    // Static functions
+    public static Transform3D multiply(ICoordinateTransformation3D transformation1, ICoordinateTransformation3D transformation2)
+    {
+        Rotation3D rotation = Rotation3D.multiply(transformation1.getRotation(),transformation2.getRotation());
+        Hep3Vector translation = VecOp.add(
+                VecOp.mult(transformation2.getRotation().inverse().getRotationMatrix(),transformation1.getTranslation()),
+                transformation2.getTranslation());
+        return new Transform3D(translation,rotation);
+    }
+    
+    // multiply in place
+    public void multiplyBy(ICoordinateTransformation3D transformation)
+    {
+        _rotation.multiplyBy(transformation.getRotation());
+        _translation = VecOp.add(
+                VecOp.mult(transformation.getRotation().inverse().getRotationMatrix(),_translation),
+                transformation.getTranslation());
+    }
+    
+    public String toString()
+    {
+    	return _translation.toString() + '\n' + _rotation.toString();
+    }
+    
+    public static Transform3D copy(ICoordinateTransformation3D ci)
+    {
+    	Transform3D c = (Transform3D)ci; 
+    	try { return (Transform3D)c.clone(); } catch (Throwable x) {}
+    	return null;
+    }
+    
+    public static Transform3D copy(Transform3D c)
+    {
+    	try {
+    		return (Transform3D)c.clone();
+    	}
+    	catch (Exception x)
+    	{}
+    	return null;
+    }
+}

\ No newline at end of file

diff -u -r1.6 -r1.7
--- IPhysicalVolumeNavigator.java	7 Mar 2007 01:13:17 -0000	1.6
+++ IPhysicalVolumeNavigator.java	9 Mar 2007 22:23:55 -0000	1.7
@@ -11,7 +11,7 @@

  * transform of an IPhysicalVolumePath.
  * 
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: IPhysicalVolumeNavigator.java,v 1.6 2007/03/07 01:13:17 jeremy Exp $

+ * @version $Id: IPhysicalVolumeNavigator.java,v 1.7 2007/03/09 22:23:55 jeremy Exp $

  */
 public interface IPhysicalVolumeNavigator 
 {

@@ -51,7 +51,7 @@

 	 * @param path
 	 * @return
 	 */

-	public CoordinateTransformation3D getTransform(String path);

+	public Transform3D getTransform(String path);

 	
 	/**
 	 * Get the full transformation from the origin of

@@ -60,7 +60,7 @@

 	 * @param path
 	 * @return
 	 */

-	CoordinateTransformation3D getTransform(IPhysicalVolumePath path);

+	Transform3D getTransform(IPhysicalVolumePath path);

 
 	/**
 	 * Given a global point, return the full path to

diff -N CoordinateTransformation3D.java
--- CoordinateTransformation3D.java	3 Mar 2007 13:33:56 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,165 +0,0 @@

-/*
- * CoordinateTransformation3D.java
- */
-
-package org.lcsim.detector;
-
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.VecOp;
-
-/**
- * A class for representing a 3D coordinate transformation
- * using a @see Rotation3D for the rotation and a
- * @see hep.physics.vec.Hep3Vector for the translation.
- *
- * @author Tim Nelson <[log in to unmask]>
- * @author Jeremy McCormick <[log in to unmask]>
- */
-public class CoordinateTransformation3D 
-implements ICoordinateTransformation3D
-{
-    
-    // Fields
-    Hep3Vector _translation = new BasicHep3Vector(0.0,0.0,0.0);
-    Rotation3D _rotation = new Rotation3D();
-            
-    /**
-     * Creates a new instance of CoordinateTransformation3D
-     * with the identity matrix.
-     */
-    public CoordinateTransformation3D()
-    {}
-    
-    public CoordinateTransformation3D(Rotation3D rotation)
-    {
-    	this._rotation = rotation;
-    }
-    
-    public CoordinateTransformation3D(Hep3Vector translation)
-    {
-    	this._translation = translation;
-    }
-    
-    public CoordinateTransformation3D(Hep3Vector translation, Rotation3D rotation)
-    {
-        _translation = translation;
-        _rotation = rotation;
-    }
-    
-    public CoordinateTransformation3D(Hep3Vector translation, IRotation3D rotation)
-    {
-    	_translation = translation;
-    	_rotation = (Rotation3D)rotation;
-    }
-    
-    // Access to translation and rotation
-    public Hep3Vector getTranslation()
-    {
-        return _translation;
-    }
-    
-    public Rotation3D getRotation()
-    {
-        return _rotation;
-    }
-    
-    // Transformations in place
-    public void transform(Hep3Vector coordinates)
-    {
-//        System.out.println("Input coordinates: "+coordinates);
-//        System.out.println("Translation: "+_translation);
-        translate(coordinates);
-//        System.out.println("Translated coordinates: "+coordinates);
-        
-//        System.out.println("Rotation: "+_rotation);
-        rotate(coordinates);
-//        System.out.println("Rotated coordinates: "+coordinates);
-        
-//        return coordinates;
-    }
-    
-    public void translate(Hep3Vector coordinates)
-    {
-        Hep3Vector new_coordinates = VecOp.add(coordinates,_translation);
-        ((BasicHep3Vector)coordinates).setV(new_coordinates.x(),new_coordinates.y(),new_coordinates.z());
-    }
-    
-    public void rotate(Hep3Vector coordinates)
-    {
-        Hep3Vector new_coordinates = VecOp.mult(_rotation.getRotationMatrix(),coordinates);
-        ((BasicHep3Vector)coordinates).setV(new_coordinates.x(),new_coordinates.y(),new_coordinates.z());
-    }
-     
-    // Return transformed vectors
-    public Hep3Vector transformed(Hep3Vector coordinates)
-    {    
-        return rotated(translated(coordinates));
-    }
-    
-    public Hep3Vector translated(Hep3Vector coordinates)
-    {
-        return VecOp.add(coordinates,_translation);
-    }
-    
-    public Hep3Vector rotated(Hep3Vector coordinates)
-    {
-        return VecOp.mult(_rotation.getRotationMatrix(),coordinates);
-    }
-    
-    // Invert the transformation
-    public void invert()
-    {
-        _translation = VecOp.mult(-1.0,VecOp.mult(_rotation.getRotationMatrix(),_translation));
-        _rotation.invert();
-    }
-    
-    public CoordinateTransformation3D inverse()
-    {
-        CoordinateTransformation3D transform = new CoordinateTransformation3D(
-                VecOp.mult(-1.0,VecOp.mult(_rotation.getRotationMatrix(),_translation)),
-                _rotation.inverse());
-        return transform;
-    }
-    
-    // Static functions
-    public static CoordinateTransformation3D multiply(CoordinateTransformation3D transformation1, CoordinateTransformation3D transformation2)
-    {
-        Rotation3D rotation = Rotation3D.multiply(transformation1.getRotation(),transformation2.getRotation());
-        Hep3Vector translation = VecOp.add(
-                VecOp.mult(transformation2.getRotation().inverse().getRotationMatrix(),transformation1.getTranslation()),
-                transformation2.getTranslation());
-        return new CoordinateTransformation3D(translation,rotation);
-    }
-    
-    // multiply in place
-    public void multiplyBy(ICoordinateTransformation3D transformation)
-    {
-        _rotation.multiplyBy(transformation.getRotation());
-        _translation = VecOp.add(
-                VecOp.mult(transformation.getRotation().inverse().getRotationMatrix(),_translation),
-                transformation.getTranslation());
-    }
-    
-    public String toString()
-    {
-    	return _translation.toString() + '\n' + _rotation.toString();
-    }
-    
-    public static CoordinateTransformation3D copy(ICoordinateTransformation3D ci)
-    {
-    	CoordinateTransformation3D c = (CoordinateTransformation3D)ci; 
-    	try { return (CoordinateTransformation3D)c.clone(); } catch (Throwable x) {}
-    	return null;
-    }
-    
-    public static CoordinateTransformation3D copy(CoordinateTransformation3D c)
-    {
-    	try {
-    		return (CoordinateTransformation3D)c.clone();
-    	}
-    	catch (Exception x)
-    	{}
-    	return null;
-    }
-}

\ No newline at end of file