LISTSERV 16.5 - LCD-CVS Archives

lcsim/src/org/lcsim/spacegeom

SpacePoint.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- SpacePoint.java	13 Sep 2005 09:31:18 -0000	1.5
+++ SpacePoint.java	18 Oct 2005 16:39:45 -0000	1.6
@@ -7,6 +7,10 @@

 
 import java.io.Serializable;

+/**
+ *
+ *@version $Id: SpacePoint.java,v 1.6 2005/10/18 16:39:45 ngraf Exp $
+ */

 public class SpacePoint implements Serializable, Cloneable, Hep3Vector
 {
     Representation _representation;

@@ -18,34 +22,41 @@

     double _phi;
     double _theta;

-    public double[] v() {
-        switch(_representation) {
-        case Cartesian: return new double[] {_x, _y, _z};
-        case Spherical: return new double[] {_xyz, _phi, _theta};
-        case Cylindrical: return new double[] {_xy, _phi, _z};
-        default: return new double[3];

+    public double[] v()
+    {
+        switch(_representation)
+        {
+            case Cartesian: return new double[] {_x, _y, _z};
+            case Spherical: return new double[] {_xyz, _phi, _theta};
+            case Cylindrical: return new double[] {_xy, _phi, _z};
+            default: return new double[3];

         }
     }

-
-    private void cartesianToCylindricalR() {

+    
+    private void cartesianToCylindricalR()
+    {

         _xy  = Math.sqrt(_x*_x+_y*_y);
     }

-    private void cartesianToPhi() {

+    private void cartesianToPhi()
+    {

         _phi = Math.atan2(_y,_x);
     }

-    private void cartesianToTheta() {

+    private void cartesianToTheta()
+    {

         if (Double.isNaN(_xy))
             cartesianToCylindricalR();
         _theta = Math.atan2(_xy,_z);
     }

-    public double magnitude() {

+    public double magnitude()
+    {

         return _xyz;
     }

-    public double magnitudeSquared() {

+    public double magnitudeSquared()
+    {

         return _xyz*_xyz;
     }

@@ -78,7 +89,8 @@

         _theta = spt.theta();
     }

-    public SpacePoint(Hep3Vector vec) {

+    public SpacePoint(Hep3Vector vec)
+    {

         _representation = Cartesian;
         _x = vec.x();
         _y = vec.y();

@@ -87,42 +99,48 @@

         _xy = _phi = _theta = Double.NaN;
     }

-    private void cylindricalToCartesianX() {

+    private void cylindricalToCartesianX()
+    {

         _x = _xy*cos(_phi);
     }

-
-    private void sphericalToCartesianX() {

+    
+    private void sphericalToCartesianX()
+    {

         _x = _xyz*cos(_phi)*sin(_theta);
     }

-        
-    private void sphericalToCartesianY() {

+    
+    private void sphericalToCartesianY()
+    {

         _y = _xyz*sin(_phi)*sin(_theta);
     }

-
-    private void sphericalToCartesianZ() {

+    
+    private void sphericalToCartesianZ()
+    {

         _z = _xyz*cos(_theta);
     }

     /**
      * Cartesian x
      * @return double
      */
     public double x()

-    {

+    {

         if (Double.isNaN(_x))

-            switch(_representation) {
-            case Spherical: sphericalToCartesianX(); break;
-            case Cylindrical: cylindricalToCartesianX(); break;

+            switch(_representation)
+            {
+                case Spherical: sphericalToCartesianX(); break;
+                case Cylindrical: cylindricalToCartesianX(); break;

-        return _x;

+            return _x;

-
-    private void cylindricalToCartesianY() {

+    
+    private void cylindricalToCartesianY()
+    {

         _y = _xy*sin(_phi);
     }

-
-

+    
+

     /**
      * Cartesian y
      * @return double

@@ -130,11 +148,12 @@

     public double y()
     {
         if (Double.isNaN(_y))

-            switch(_representation) {
-            case Spherical: sphericalToCartesianY(); break;
-            case Cylindrical: cylindricalToCartesianY(); break;

+            switch(_representation)
+            {
+                case Spherical: sphericalToCartesianY(); break;
+                case Cylindrical: cylindricalToCartesianY(); break;

-        return _y;

+            return _y;

     }
     
     /**

@@ -143,13 +162,14 @@

      */
     
     public double z()

-    {

+    {

         if (Double.isNaN(_z))
             sphericalToCartesianZ();
         return _z;
     }

-    private void sphericalToCylindricalR() {

+    private void sphericalToCylindricalR()
+    {

         _xy = _xyz*Math.sin(_theta);
     }

@@ -160,11 +180,12 @@

     public double rxy()
     {
         if (Double.isNaN(_xy))

-            switch(_representation) {
-            case Spherical: sphericalToCylindricalR(); break;
-            case Cartesian: cartesianToCylindricalR(); break;

+            switch(_representation)
+            {
+                case Spherical: sphericalToCylindricalR(); break;
+                case Cartesian: cartesianToCylindricalR(); break;

-        return _xy;

+            return _xy;

     }
     
     /**

@@ -183,7 +204,7 @@

      * @return double
      */
     public double rxyz()

-    {

+    {

         return _xyz;
     }

@@ -192,16 +213,18 @@

      * @return double
      */
     public double theta()

-    {

+    {

         if (Double.isNaN(_theta))

-            switch(_representation) {
-            case Cartesian: cartesianToTheta(); break;
-            case Cylindrical: cylindricalToTheta(); break;

+            switch(_representation)
+            {
+                case Cartesian: cartesianToTheta(); break;
+                case Cylindrical: cylindricalToTheta(); break;

-        return _theta;

+            return _theta;

-    private void cylindricalToTheta() {

+    private void cylindricalToTheta()
+    {

         _theta = Math.atan2(_xy,_z);
     }

@@ -240,11 +263,12 @@

         if ( !Double.isNaN(_xy) && _xyz != 0. )
             return _xy/_xyz;
         if (Double.isNaN(_theta))

-            switch(_representation) {
-            case Cartesian: cartesianToTheta(); break;
-            case Cylindrical: cylindricalToTheta(); break;

+            switch(_representation)
+            {
+                case Cartesian: cartesianToTheta(); break;
+                case Cylindrical: cylindricalToTheta(); break;

-        return sin(_theta);

+            return sin(_theta);

     }
     
     /**

@@ -256,11 +280,12 @@

         if ( !Double.isNaN(_z) && _xyz != 0. )
             return _z/_xyz;
         if (Double.isNaN(_theta))

-            switch(_representation) {
-            case Cartesian: cartesianToTheta(); break;
-            case Cylindrical: cylindricalToTheta(); break;

+            switch(_representation)
+            {
+                case Cartesian: cartesianToTheta(); break;
+                case Cylindrical: cylindricalToTheta(); break;

-        return cos(_theta);

+            return cos(_theta);

     }
     
     /**

@@ -338,21 +363,23 @@

         }
         return o;
     }

     // for legacy reasons
     // long name to make it visible in code
     /**
      * for legacy code
      * @deprecated
      */

-    @Deprecated public double[] getCartesianArray() {

+    @Deprecated public double[] getCartesianArray()
+    {

         return new double[] {_x, _y, _z};
     }

     /**
      * @return the representations of the object
      */

-    public Representation getRepresentation() {

+    public Representation getRepresentation()
+    {

         return _representation;
     }
 }

lcsim/src/org/lcsim/spacegeom

SpacePointVector.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- SpacePointVector.java	7 Sep 2005 01:09:58 -0000	1.5
+++ SpacePointVector.java	18 Oct 2005 16:39:45 -0000	1.6
@@ -191,7 +191,7 @@

  *
  *
  *@author Norman A. Graf

- *@version 1.0

+ *@version $Id: SpacePointVector.java,v 1.6 2005/10/18 16:39:45 ngraf Exp $

  *
  */

@@ -200,7 +200,8 @@

     SpacePoint startPoint;
     SpaceVector direction;

-    SpacePointVector() {

+    public SpacePointVector()
+    {

         startPoint = new SpacePoint();
         direction = new SpaceVector();
     }

@@ -208,17 +209,20 @@

     /**
      * Copy Constructor
      */

-    public SpacePointVector(SpacePointVector spv) {

+    public SpacePointVector(SpacePointVector spv)
+    {

         startPoint = spv.startPoint;
         direction = spv.direction;
     }

-    public SpacePointVector(SpacePoint start, SpaceVector dir) {

+    public SpacePointVector(SpacePoint start, SpaceVector dir)
+    {

         startPoint = start;
         direction = dir;
     }

-    public SpacePointVector(SpacePoint start, SpacePoint end) {

+    public SpacePointVector(SpacePoint start, SpacePoint end)
+    {

         startPoint = start;
         // This is expensive
         direction = new SpaceVector(sub(end, start));

@@ -235,7 +239,8 @@

      * v_x
      * @return double
      */

-    public double v_x() {

+    public double v_x()
+    {

         return direction.x();
     }

@@ -243,7 +248,8 @@

      * v_y
      * @return double
      */

-    public double v_y() {

+    public double v_y()
+    {

         return direction.y();
     }

@@ -251,7 +257,8 @@

      * v_z
      * @return double
      */

-    public double v_z() {

+    public double v_z()
+    {

         return direction.z();
     }

@@ -314,15 +321,18 @@

         return ! equals(spv);
     }

-    public SpacePoint getStartPoint() {

+    public SpacePoint getStartPoint()
+    {

         return startPoint;
     }

-    public SpacePoint getEndPoint() {

+    public SpacePoint getEndPoint()
+    {

         return new SpacePoint(add(startPoint, direction));
     }

-    public SpaceVector getDirection() {

+    public SpaceVector getDirection()
+    {

         return direction;
     }

@@ -333,13 +343,15 @@

      * @param alpha The length parameters. All real values are valid.
      * @return A SpacePoint at Origin + alpha* (Endpoint - Origin)
      */

-    public SpacePoint getPointAtLength(double alpha) {

+    public SpacePoint getPointAtLength(double alpha)
+    {

         return new SpacePoint(add(startPoint, mult(alpha, direction)));
     }

     public String toString()
     {

-        return super.toString()

+//        return super.toString()
+        return startPoint.toString()

         + "SpacePointVector:" + "\n"
                 + "      V_x: " + v_x() + "\n"
                 + "      V_y: " + v_y() + "\n"

Commit in `lcsim/src/org/lcsim/spacegeom` on MAIN
`CartesianPath.java`	+1	-1	1.2 -> 1.3
`CartesianPoint.java`	+3	-2	1.4 -> 1.5
`CartesianPointVector.java`	+5	-3	1.2 -> 1.3
`CartesianTwoPoint.java`	+1	-1	1.1 -> 1.2
`CartesianVector.java`	+9	-3	1.1 -> 1.2
`CylindricalPath.java`	+1	-1	1.1 -> 1.2
`CylindricalPoint.java`	+1	-1	1.2 -> 1.3
`CylindricalPointVector.java`	+1	-1	1.3 -> 1.4
`CylindricalTwoPoint.java`	+1	-1	1.2 -> 1.3
`CylindricalVector.java`	+10	-5	1.1 -> 1.2
`Eigensystem.java`	+4	-1	1.1 -> 1.2
`Matrix.java`	+9	-5	1.1 -> 1.2
`PrincipalAxesLineFitter.java`	+4	-1	1.1 -> 1.2
`Representation.java`	+6	-2	1.1 -> 1.2
`SpacePath.java`	+3	-3	1.7 -> 1.8
`SpacePoint.java`	+86	-59	1.5 -> 1.6
`SpacePointVector.java`	+26	-14	1.5 -> 1.6
`SpaceVector.java`	+13	-5	1.2 -> 1.3
`SpaceXform.java`	+1	-1	1.2 -> 1.3
`SphericalPath.java`	+1	-1	1.1 -> 1.2
`SphericalPoint.java`	+1	-1	1.2 -> 1.3
`SphericalPointVector.java`	+1	-1	1.3 -> 1.4
`SphericalVector.java`	+10	-4	1.1 -> 1.2
`TwoD.java`	+1	-1	1.2 -> 1.3
`TwoSegment.java`	+1	-1	1.1 -> 1.2
`TwoSpacePoint.java`	+1	-1	1.2 -> 1.3
	+201	-120