Merge pull request #1073 from JeffersonLab/swimtools-cleanup

Swimtools cleanup

Author: baltzell

common-tools/clas-decay-tools/src/main/java/org/jlab/clas/decay/analysis/Particle.java

@@ -997,7 +997,7 @@ private double calcUncorrMass(Particle part1, Particle part2) { //momentum not c
         } else {
             swim.SetSwimParameters(vxch, vych, vzch, 
                 -pxch, -pych, -pzch, -q);
-            double[] tr1 = swim.SwimToPlaneBoundary((vzvo-buffer),new Vector3D(0,0,1), -1);
+            double[] tr1 = swim.SwimToPlaneBoundary((vzvo-buffer),new Vector3D(0,0,1));
 
             swim.SetSwimParameters(tr1[0], tr1[1], tr1[2], -tr1[3], -tr1[4], -tr1[5], q);
         }

common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/ASwim.java

@@ -11,27 +11,31 @@
 public abstract class ASwim extends SwimPars implements ISwim {
 
     @Override
-    public double[] SwimToPlaneTiltSecSys(int sector, double z_cm) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public double[] SwimToPlaneTiltSecSysBdlXZPlane(int sector, double z_cm) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public double[] SwimToPlaneBoundary(double d_cm, Vector3D n, int dir) {
-        throw new UnsupportedOperationException("Not supported yet.");
+    public double[] SwimToPlaneBoundary(double d_cm, Vector3D n) {
+        // Normalize the normal - should already be done, but just in case
+        Vector3D nhat = n.asUnit();
+
+        // Point on the plane at distance d_cm from origin
+        Point3D p = new Point3D(
+            nhat.x() * d_cm,
+            nhat.y() * d_cm,
+            nhat.z() * d_cm
+        );
+        return SwimPlane(nhat, p, accuracy);
     }
 
     @Override
     public double[] SwimToPlaneLab(double z_cm) {
         return SwimPlane(new Vector3D(0,0,1), new Point3D(0,0,z_cm), accuracy);
     }
 
+    //@Override
+    //public double[] SwimToCylinder(double radius) {
+    //    return SwimGenCylinder(new Point3D(0,0,-1), new Point3D(0,0,1), radius, accuracy);
+    //}
+    
     @Override
-    public double[] SwimToCylinder(double radius) {
+    public double[] SwimRho(double radius, double accuracy) {
         return SwimGenCylinder(new Point3D(0,0,-1), new Point3D(0,0,1), radius, accuracy);
     }
 

common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/AdaptiveSwim.java

@@ -15,8 +15,6 @@
 import cnuphys.adaptiveSwim.AdaptiveSwimmer;
 import cnuphys.adaptiveSwim.geometry.Plane;
 
-import cnuphys.swim.SwimTrajectory;
-
 public class AdaptiveSwim extends ASwim {
 
     private static double[] convert(AdaptiveSwimResult result, double p) {
@@ -135,9 +133,5 @@ public double[] SwimToLine(Line3D l) {
         return null;
     }
 
-    @Override
-    public double[] SwimToDCA(SwimTrajectory trk2) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
 
 }

common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/ISwim.java

@@ -1,24 +1,18 @@
 package org.jlab.clas.swimtools;
 
-import cnuphys.swim.SwimTrajectory;
 import org.jlab.geom.prim.Line3D;
 import org.jlab.geom.prim.Point3D;
 import org.jlab.geom.prim.Vector3D;
 
 /**
- * FIXME:  Can any of these be removed?
  * 
  * @author baltzell
  */
 interface ISwim {
 
-    public double[] SwimToPlaneTiltSecSys(int sector, double z_cm);
-    
-    public double[] SwimToPlaneTiltSecSysBdlXZPlane(int sector, double z_cm);
-    
     public double[] SwimToPlaneLab(double z_cm);
 
-    public double[] SwimToCylinder(double Rad);
+    //public double[] SwimToCylinder(double Rad);
 
     public double[] SwimRho(double radius, double accuracy);
 
@@ -28,14 +22,12 @@ interface ISwim {
 
     public double[] SwimToSphere(double Rad);
 
-    public double[] SwimToPlaneBoundary(double d_cm, Vector3D n, int dir);
+    public double[] SwimToPlaneBoundary(double d_cm, Vector3D n);
 
     public double[] SwimToBeamLine(double xB, double yB);
 
     public double[] SwimToLine(Line3D l);
 
     public double[] SwimToZ(double Z, int dir);
 
-    public double[] SwimToDCA(SwimTrajectory trk2);
-
 }