GeomConverter/src/org/lcsim/detector
diff -u -r1.3 -r1.4
--- Transform3D.java 30 Mar 2007 21:09:44 -0000 1.3
+++ Transform3D.java 31 Mar 2007 06:29:32 -0000 1.4
@@ -67,20 +67,8 @@
// 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;
-
rotate(coordinates);
translate(coordinates);
-
}
public void translate(Hep3Vector coordinates)
@@ -114,53 +102,35 @@
// Invert the transformation
public void invert()
{
-// _translation = VecOp.mult(-1.0,VecOp.mult(_rotation.getRotationMatrix(),_translation));
-// _rotation.invert();
_translation = VecOp.mult(-1.0,VecOp.mult(_rotation.inverse().getRotationMatrix(),_translation));
_rotation.invert();
}
public Transform3D inverse()
{
-// Transform3D transform = new Transform3D(
-// VecOp.mult(-1.0,VecOp.mult(_rotation.getRotationMatrix(),_translation)),
-// _rotation.inverse());
-
Transform3D transform = new Transform3D(
VecOp.mult(-1.0,VecOp.mult(_rotation.inverse().getRotationMatrix(),_translation)),
_rotation.inverse());
return transform;
}
- // Static functions
public static Transform3D multiply(ITransform3D transformation_second, ITransform3D transformation_first)
{
-// Hep3Vector translation = VecOp.add(
-// VecOp.mult(transformation2.getRotation().inverse().getRotationMatrix(),transformation1.getTranslation()),
-// transformation2.getTranslation());
-// Rotation3D rotation = Rotation3D.multiply(transformation1.getRotation(),transformation2.getRotation());
-
Hep3Vector translation = VecOp.add(
VecOp.mult(transformation_second.getRotation().getRotationMatrix(),transformation_first.getTranslation()),
transformation_second.getTranslation());
Rotation3D rotation = Rotation3D.multiply(transformation_second.getRotation(),transformation_first.getRotation());
- return new Transform3D(translation,rotation);
+ return new Transform3D(translation,rotation);
}
// multiply in place
public void multiplyBy(ITransform3D transformation_first)
{
-// _translation = VecOp.add(
-// VecOp.mult(transformation.getRotation().inverse().getRotationMatrix(),_translation),
-// transformation.getTranslation());
-// _rotation.multiplyBy(transformation.getRotation());
-
_translation = VecOp.add(
- VecOp.mult(_rotation.getRotationMatrix(),transformation_first.getTranslation()),
- _translation);
+ VecOp.mult(this.getRotation().getRotationMatrix(),transformation_first.getTranslation()),
+ this.getTranslation());
_rotation.multiplyBy(transformation_first.getRotation());
-
}
public String toString()