generalize

Author: baltzell

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

@@ -0,0 +1,37 @@
+package org.jlab.clas.swimtools;
+
+import org.jlab.geom.prim.Point3D;
+import org.jlab.geom.prim.Vector3D;
+
+/**
+ *
+ * @author baltzell
+ */
+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[] 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[] SwimToZ(double Z, int dir) {
+        return SwimPlane(new Vector3D(0,0,dir*1), new Point3D(0,0,Z), accuracy);
+    }
+
+}

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

@@ -14,27 +14,7 @@
 
 import cnuphys.swim.SwimTrajectory;
 
-public class AdaptiveSwim 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[] 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);
-    }
+public class AdaptiveSwim extends ASwim {
 
     @Override
     public double[] SwimRho(double radius, double accuracy) {
@@ -166,11 +146,6 @@ public double[] SwimToLine(Line3D l) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public double[] SwimToZ(double Z, int dir) {
-        return SwimPlane(new Vector3D(0,0,dir*1), new Point3D(0,0,Z), accuracy);
-    }
-
     @Override
     public double[] SwimToDCA(SwimTrajectory trk2) {
         throw new UnsupportedOperationException("Not supported yet.");

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

@@ -27,7 +27,7 @@
  *
  * @author ziegler
  */
-public class Swim extends SwimPars implements ISwim {
+public class Swim extends ASwim {
 
     private SwimTrajectory swimTraj;