diff -u -r1.5 -r1.6
--- BField.java	1 Feb 2009 19:40:41 -0000	1.5
+++ BField.java	6 Apr 2009 19:49:30 -0000	1.6
@@ -2,7 +2,7 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 import org.lcsim.contrib.onoprien.util.job.JobEvent;
 import org.lcsim.contrib.onoprien.util.job.JobEventListener;
 import org.lcsim.contrib.onoprien.util.job.JobManager;

@@ -12,7 +12,7 @@

  * geometrical trajectory parameters into particle momentum.
  *
  * @author D. Onoprienko

- * @version $Id: BField.java,v 1.5 2009/02/01 19:40:41 onoprien Exp $

+ * @version $Id: BField.java,v 1.6 2009/04/06 19:49:30 onoprien Exp $

  */
 public class BField implements JobEventListener {
   

diff -u -r1.8 -r1.9
--- Helix.java	27 Mar 2009 19:52:55 -0000	1.8
+++ Helix.java	6 Apr 2009 19:49:30 -0000	1.9
@@ -3,13 +3,13 @@

 import hep.physics.matrix.SymmetricMatrix;
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * Helical {@link Trajectory} with its axis parallel to Z.
  *
  * @author D. Onoprienko

- * @version $Id: Helix.java,v 1.8 2009/03/27 19:52:55 onoprien Exp $

+ * @version $Id: Helix.java,v 1.9 2009/04/06 19:49:30 onoprien Exp $

  */
 public class Helix extends AbstractTrajectory {
   

diff -u -r1.2 -r1.3
--- IntersectionHelixZ.java	22 Jan 2009 21:01:58 -0000	1.2
+++ IntersectionHelixZ.java	6 Apr 2009 19:49:30 -0000	1.3
@@ -4,7 +4,7 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * Specialized implementation of {@link Intersection} interface suitable for use when

@@ -14,7 +14,7 @@

  * a surface parallel to Z axis.
  *
  * @author D. Onoprienko

- * @version $Id: IntersectionHelixZ.java,v 1.2 2009/01/22 21:01:58 onoprien Exp $

+ * @version $Id: IntersectionHelixZ.java,v 1.3 2009/04/06 19:49:30 onoprien Exp $

  */
 public class IntersectionHelixZ extends IntersectionPeriodicBound {
   

diff -u -r1.6 -r1.7
--- Line.java	27 Mar 2009 19:52:55 -0000	1.6
+++ Line.java	6 Apr 2009 19:49:30 -0000	1.7
@@ -2,13 +2,13 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * Straight line {@link Trajectory}.
  *
  * @author D. Onoprienko

- * @version $Id: Line.java,v 1.6 2009/03/27 19:52:55 onoprien Exp $

+ * @version $Id: Line.java,v 1.7 2009/04/06 19:49:30 onoprien Exp $

  */
 public class Line extends AbstractTrajectory {
   

diff -u -r1.3 -r1.4
--- Poca.java	27 Mar 2009 19:52:55 -0000	1.3
+++ Poca.java	6 Apr 2009 19:49:30 -0000	1.4
@@ -2,14 +2,14 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * {@link Surface} that represents point of closest approach to the point supplied to
  * its constructor.
  *
  * @author D. Onoprienko

- * @version $Id: Poca.java,v 1.3 2009/03/27 19:52:55 onoprien Exp $

+ * @version $Id: Poca.java,v 1.4 2009/04/06 19:49:30 onoprien Exp $

  */
 public class Poca extends AbstractSurface {
   

diff -u -r1.3 -r1.4
--- PocaXY.java	27 Mar 2009 19:52:55 -0000	1.3
+++ PocaXY.java	6 Apr 2009 19:49:30 -0000	1.4
@@ -2,14 +2,14 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * {@link Surface} that represents point of closest approach in XY plane to the 
  * point supplied to its constructor.
  *
  * @author D. Onoprienko

- * @version $Id: PocaXY.java,v 1.3 2009/03/27 19:52:55 onoprien Exp $

+ * @version $Id: PocaXY.java,v 1.4 2009/04/06 19:49:30 onoprien Exp $

  */
 public class PocaXY extends AbstractSurface {
   

diff -u -r1.4 -r1.5
--- ZCylinder.java	27 Mar 2009 19:52:55 -0000	1.4
+++ ZCylinder.java	6 Apr 2009 19:49:30 -0000	1.5
@@ -2,13 +2,13 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * {@link Surface} that represents a bounded cylinder parallel to Z axis.
  *
  * @author D. Onoprienko

- * @version $Id: ZCylinder.java,v 1.4 2009/03/27 19:52:55 onoprien Exp $

+ * @version $Id: ZCylinder.java,v 1.5 2009/04/06 19:49:30 onoprien Exp $

  */
 public class ZCylinder extends AbstractSurface {
 

diff -u -r1.3 -r1.4
--- ZDisk.java	27 Mar 2009 19:52:55 -0000	1.3
+++ ZDisk.java	6 Apr 2009 19:49:30 -0000	1.4
@@ -2,13 +2,13 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * {@link Surface} that represents a disk centered around Z axis and perpendicular to it.
  *
  * @author D. Onoprienko

- * @version $Id: ZDisk.java,v 1.3 2009/03/27 19:52:55 onoprien Exp $

+ * @version $Id: ZDisk.java,v 1.4 2009/04/06 19:49:30 onoprien Exp $

  */
 public class ZDisk extends AbstractSurface {
 

diff -u -r1.3 -r1.4
--- ZPlane.java	27 Mar 2009 19:52:55 -0000	1.3
+++ ZPlane.java	6 Apr 2009 19:49:30 -0000	1.4
@@ -2,13 +2,13 @@

 
 import hep.physics.vec.Hep3Vector;
 

-import org.lcsim.contrib.onoprien.util.ConstHep3Vector;

+import org.lcsim.contrib.onoprien.util.vector.ConstHep3Vector;

 
 /**
  * {@link Surface} that represents a plane perpendicular to Z axis.
  *
  * @author D. Onoprienko

- * @version $Id: ZPlane.java,v 1.3 2009/03/27 19:52:55 onoprien Exp $

+ * @version $Id: ZPlane.java,v 1.4 2009/04/06 19:49:30 onoprien Exp $

  */
 public class ZPlane extends AbstractSurface {
   

diff -N AbstractHep3Vector.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ AbstractHep3Vector.java	6 Apr 2009 19:49:30 -0000	1.1
@@ -0,0 +1,90 @@

+package org.lcsim.contrib.onoprien.util.vector;
+
+import hep.physics.vec.Hep3Vector;
+
+/**
+ * Abstract class that provides a skeletal implementation of {@link Hep3Vector}.
+ *
+ * @author D. Onoprienko
+ * @version $Id: AbstractHep3Vector.java,v 1.1 2009/04/06 19:49:30 onoprien Exp $
+ */
+abstract public class AbstractHep3Vector implements Hep3Vector {
+
+// -- Private parts :  ---------------------------------------------------------
+
+  double _x, _y, _z;
+
+
+// -- Constructors and initialization :  ---------------------------------------
+
+  public AbstractHep3Vector() {
+    _x = 0.;
+    _y = 0.;
+    _z = 0.;
+  }
+
+  public AbstractHep3Vector(double x, double y, double z) {
+    _x = x;
+    _y = y;
+    _z = z;
+   }
+
+  public AbstractHep3Vector(double[] d) {
+    _x = d[0];
+    _y = d[1];
+    _z = d[2];
+  }
+
+  public AbstractHep3Vector(float[] f) {
+    _x = f[0];
+    _y = f[1];
+    _z = f[2];
+  }
+
+  public AbstractHep3Vector(Hep3Vector vector) {
+    _x = vector.x();
+    _y = vector.y();
+    _z = vector.z();
+  }
+
+// -- Implementing Hep3Vector :  -----------------------------------------------
+
+  public double x() {
+    return _x;
+  }
+  public double y() {
+    return _y;
+  }
+  public double z() {
+    return _z;
+  }
+  public double magnitude() {
+    return Math.sqrt(_x*_x + _y*_y + _z*_z);
+  }
+  public double magnitudeSquared() {
+    return _x*_x + _y*_y + _z*_z;
+  }
+  public double[] v() {
+    return new double[] { _x, _y, _z };
+  }
+
+// -- Overriding Object :  -----------------------------------------------------
+
+  public boolean equals(Object obj) {
+    if (obj instanceof Hep3Vector) {
+      Hep3Vector that = (Hep3Vector) obj;
+      return _x == that.x() && _y == that.y() && _z == that.z();
+    } else {
+      return false;
+    }
+  }
+
+  public String toString() {
+    return "("+ _x +" "+ _y +" "+ _z +")";
+  }
+
+  public int hashCode() {
+    return (int) (Double.doubleToLongBits(_x) + Double.doubleToLongBits(_y) + Double.doubleToLongBits(_z));
+  }
+
+}

diff -N BasicHep3Vector.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ BasicHep3Vector.java	6 Apr 2009 19:49:30 -0000	1.1
@@ -0,0 +1,179 @@

+package org.lcsim.contrib.onoprien.util.vector;
+
+import java.io.Serializable;
+
+import hep.physics.vec.Hep3Vector;
+
+/**
+ * Mutable implementation of {@link Hep3Vector}.
+ * <p>
+ * Coordinates supplied to constructors and setters are interpreted as cartesian.
+ *
+ * @author D. Onoprienko
+ * @version $Id: BasicHep3Vector.java,v 1.1 2009/04/06 19:49:30 onoprien Exp $
+ */
+final public class BasicHep3Vector extends AbstractHep3Vector implements Serializable {
+
+// -- Constructors and initialization :  ---------------------------------------
+
+  public BasicHep3Vector() {
+    super();
+  }
+
+  public BasicHep3Vector(double x, double y, double z) {
+    super(x,y,z);
+  }
+
+  public BasicHep3Vector(double[] d) {
+    super(d);
+  }
+
+  public BasicHep3Vector(float[] f) {
+    super(f);
+  }
+
+  public BasicHep3Vector(Hep3Vector vector) {
+    super(vector);
+  }
+
+
+// -- Setters :  ---------------------------------------------------------------
+
+  /**
+   * Sets cartesian coordinates.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setV(double x, double y, double z) {
+    _x = x;
+    _y = y;
+    _z = z;
+    return this;
+  }
+
+  /**
+   * Sets cartesian coordinates.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setV(double[] d) {
+    _x = d[0];
+    _y = d[1];
+    _z = d[2];
+    return this;
+  }
+
+  /**
+   * Sets cartesian coordinates.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setV(float[] f) {
+    _x = f[0];
+    _y = f[1];
+    _z = f[2];
+    return this;
+  }
+
+  /**
+   * Sets cartesian coordinates.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setV(Hep3Vector vector) {
+    _x = vector.x();
+    _y = vector.y();
+    _z = vector.z();
+    return this;
+  }
+
+  /**
+   * Sets cartesian coordinate.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setX(double x) {
+    _x = x;
+    return this;
+  }
+
+  /**
+   * Sets cartesian coordinate.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setY(double y) {
+    _y = y;
+    return this;
+  }
+
+  /**
+   * Sets cartesian coordinate.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setZ(double z) {
+    _z = z;
+    return this;
+  }
+
+  /**
+   * Sets magnitude.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector setMagnitude(double magnitude) {
+    return scale(magnitude / Math.sqrt(_x*_x + _y*_y + _z*_z));
+  }
+
+
+// -- Operations :  ------------------------------------------------------------
+
+  /**
+   * Multiply this vector by the specified scalar.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector scale(double scaleFactor) {
+    _x *= scaleFactor;
+    _y *= scaleFactor;
+    _z *= scaleFactor;
+    return this;
+  }
+
+  /**
+   * Add the specified vector to this vector.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector add(Hep3Vector vector) {
+    _x += vector.x();
+    _y += vector.y();
+    _z += vector.z();
+    return this;
+  }
+
+  /**
+   * Add the specified vector multiplied by the specified scalar to this vector.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector add(Hep3Vector vector, double scaleFactor) {
+    _x += vector.x()*scaleFactor;
+    _y += vector.y()*scaleFactor;
+    _z += vector.z()*scaleFactor;
+    return this;
+  }
+
+  /**
+   * Subtract the specified vector from this vector.
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector subtract(Hep3Vector vector) {
+    _x -= vector.x();
+    _y -= vector.y();
+    _z -= vector.z();
+    return this;
+  }
+
+  /**
+   * Multiply this vector by the specified vector (<tt>this = this x vector</tt>).
+   * @return  This vector after the operation.
+   */
+  public BasicHep3Vector cross(Hep3Vector vector) {
+    _x = _y * vector.z() - _z * vector.y();
+    _y = _z * vector.x() - _x * vector.z();
+    _z = _x * vector.y() - _y * vector.x();
+    return this;
+  }
+
+}

diff -N ConstHep3Vector.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ConstHep3Vector.java	6 Apr 2009 19:49:30 -0000	1.1
@@ -0,0 +1,55 @@

+package org.lcsim.contrib.onoprien.util.vector;
+
+import java.io.Serializable;
+
+import hep.physics.vec.Hep3Vector;
+
+/**
+ * Immutable implementation of {@link Hep3Vector}. Also defines static constants
+ * corresponding to frequently used unit vectors.
+ * <p>
+ * Coordinates supplied to constructors are interpreted as cartesian.
+ *
+ * @author D. Onoprienko
+ * @version $Id: ConstHep3Vector.java,v 1.1 2009/04/06 19:49:30 onoprien Exp $
+ */
+final public class ConstHep3Vector extends AbstractHep3Vector implements Serializable {
+  
+// -- Constant vectors :  ------------------------------------------------------
+  
+  /** Constant vector (0.,0.,0.) */
+  static public final ConstHep3Vector V000 = new ConstHep3Vector(0.,0.,0.);
+  
+  /** Constant vector (1.,0.,0.) */
+  static public final ConstHep3Vector V100 = new ConstHep3Vector(1.,0.,0.);
+  
+  /** Constant vector (0.,1.,0.) */
+  static public final ConstHep3Vector V010 = new ConstHep3Vector(0.,1.,0.);
+  
+  /** Constant vector (0.,0.,1.) */
+  static public final ConstHep3Vector V001 = new ConstHep3Vector(0.,0.,1.);
+
+
+// -- Constructors :  ----------------------------------------------------------
+  
+  public ConstHep3Vector() {
+    super();
+  }
+
+  public ConstHep3Vector(double x, double y, double z) {
+    super(x,y,z);
+  }
+  
+  public ConstHep3Vector(double[] d) {
+    super(d);
+  }
+  
+  public ConstHep3Vector(float[] f) {
+    super(f);
+  }
+  
+  public ConstHep3Vector(Hep3Vector vector) {
+    super(vector);
+  }
+
+}

diff -N ConstSymmetricMatrix.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ConstSymmetricMatrix.java	6 Apr 2009 19:49:30 -0000	1.1
@@ -0,0 +1,39 @@

+package org.lcsim.contrib.onoprien.util.vector;
+
+import hep.physics.matrix.Matrix;
+import hep.physics.matrix.MatrixOp;
+import hep.physics.matrix.SymmetricMatrix;
+
+/**
+ *
+ *
+ * @author D. Onoprienko
+ * @version $Id: ConstSymmetricMatrix.java,v 1.1 2009/04/06 19:49:30 onoprien Exp $
+ */
+public final class ConstSymmetricMatrix extends SymmetricMatrix {
+  
+// -- Constructors :  ----------------------------------------------------------
+  
+  public ConstSymmetricMatrix(int size) {
+    super(size);
+  }
+  
+  public ConstSymmetricMatrix(int size, double[] initialValues, boolean isLower) {
+    super(size, initialValues, isLower);
+  }
+  
+  public ConstSymmetricMatrix(Matrix mIn) {
+    super(mIn);
+  }
+  
+// -- Disable modifying operations :  ------------------------------------------
+
+  public void transpose() {throw new UnsupportedOperationException();}
+
+  public void invert() throws MatrixOp.IndeterminateMatrixException {throw new UnsupportedOperationException();}
+
+  public void setElement(int x, int y, double value) {throw new UnsupportedOperationException();}
+
+  public void incrementElement(int x, int y, double value) {throw new UnsupportedOperationException();}
+  
+}

diff -N package-info.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ package-info.java	6 Apr 2009 19:49:30 -0000	1.1
@@ -0,0 +1,7 @@

+/**
+ * Vector and matrix classes extending functionality of hep.physics.vec package.
+ *
+ * @author D. Onoprienko
+ */
+package org.lcsim.contrib.onoprien.util.vector;
+

diff -N ConstHep3Vector.java
--- ConstHep3Vector.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,111 +0,0 @@

-package org.lcsim.contrib.onoprien.util;
-
-import java.io.Serializable;
-
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.VecOp;
-
-/**
- * Immutable implementation of <tt>Hep3Vector</tt>.
- * <p>
- * Coordinates supplied to constructors are interpreted as cartesian.
- * The class is identical to <tt>hep.physics.vec.BasicHep3Vector</t> except:
- * <ul><li>No <tt>set</tt> method, making it immutable
- *     <li>Constructor that takes <tt>Hep3Vector</tt>
- *     <li>No input array length check in constructors.</ul>
- *
- * @author D. Onoprienko
- * @version $Id: ConstHep3Vector.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
- */
-final public class ConstHep3Vector implements Hep3Vector, Serializable {
-  
-// -- Constant vectors :  ------------------------------------------------------
-  
-  /** Constant vector (0.,0.,0.) */
-  static public final ConstHep3Vector V000 = new ConstHep3Vector(0.,0.,0.);
-  
-  /** Constant vector (1.,0.,0.) */
-  static public final ConstHep3Vector V100 = new ConstHep3Vector(1.,0.,0.);
-  
-  /** Constant vector (0.,1.,0.) */
-  static public final ConstHep3Vector V010 = new ConstHep3Vector(0.,1.,0.);
-  
-  /** Constant vector (0.,0.,1.) */
-  static public final ConstHep3Vector V001 = new ConstHep3Vector(0.,0.,1.);
-  
-// -- Constructors :  ----------------------------------------------------------
-  
-  public ConstHep3Vector() {
-    _x = 0.;
-    _y = 0.;
-    _z = 0.;
-  }
-
-  public ConstHep3Vector(double x, double y, double z) {
-    _x = x;
-    _y = y;
-    _z = z;
-   }
-  
-  public ConstHep3Vector(double[] d) {
-    _x = d[0];
-    _y = d[1];
-    _z = d[2];
-  }
-  
-  public ConstHep3Vector(float[] f) {
-    _x = f[0];
-    _y = f[1];
-    _z = f[2];
-  }
-  
-  public ConstHep3Vector(Hep3Vector vector) {
-    _x = vector.x();
-    _y = vector.y();
-    _z = vector.z();
-  }
-  
-// -- Implementing Hep3Vector :  -----------------------------------------------
-  
-  public double x() {
-    return _x;
-  }
-  public double y() {
-    return _y;
-  }
-  public double z() {
-    return _z;
-  }
-  public double magnitude() {
-    return Math.sqrt(_x*_x + _y*_y + _z*_z);
-  }
-  public double magnitudeSquared() {
-    return _x*_x + _y*_y + _z*_z;
-  }
-  public double[] v() {
-    return new double[] { _x, _y, _z };
-  }
-  
-// -- Overriding Object :  -----------------------------------------------------
-
-  public boolean equals(Object obj) {
-    if (obj instanceof Hep3Vector) {
-      Hep3Vector that = (Hep3Vector) obj;
-      return _x == that.x() && _y == that.y() && _z == that.z();
-    } else {
-      return false;
-    }
-  }
-  
-  public String toString() {
-    return VecOp.toString(this);
-  }
-  
-  public int hashCode() {
-    return (int) (Double.doubleToLongBits(_x) + Double.doubleToLongBits(_y) + Double.doubleToLongBits(_z));
-  }
-  
-// -- Private parts :  ---------------------------------------------------------
-  
-  double _x, _y, _z;
-}

diff -N ConstSymmetricMatrix.java
--- ConstSymmetricMatrix.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@

-package org.lcsim.contrib.onoprien.util;
-
-import hep.physics.matrix.Matrix;
-import hep.physics.matrix.MatrixOp;
-import hep.physics.matrix.SymmetricMatrix;
-
-/**
- *
- *
- * @author D. Onoprienko
- * @version $Id: ConstSymmetricMatrix.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
- */
-public final class ConstSymmetricMatrix extends SymmetricMatrix {
-  
-// -- Constructors :  ----------------------------------------------------------
-  
-  public ConstSymmetricMatrix(int size) {
-    super(size);
-  }
-  
-  public ConstSymmetricMatrix(int size, double[] initialValues, boolean isLower) {
-    super(size, initialValues, isLower);
-  }
-  
-  public ConstSymmetricMatrix(Matrix mIn) {
-    super(mIn);
-  }
-  
-// -- Disable modifying operations :  ------------------------------------------
-
-  public void transpose() {throw new UnsupportedOperationException();}
-
-  public void invert() throws MatrixOp.IndeterminateMatrixException {throw new UnsupportedOperationException();}
-
-  public void setElement(int x, int y, double value) {throw new UnsupportedOperationException();}
-
-  public void incrementElement(int x, int y, double value) {throw new UnsupportedOperationException();}
-  
-}