mv xy2uv, uv2xy to desimeter.transform.xy2qs

bin/desi_fit_circles

@@ -7,23 +7,9 @@ from scipy import optimize
 import matplotlib.pyplot as plt
 import argparse
 
-# from desimeter.transform.xy2qs import xy2qs, qs2xy
-from desimodel.focalplane import xy2qs, qs2xy
-
-#- Transform between CS5 x,y and curved focal surface
-def xy2uv(x, y):
-    q, s = xy2qs(x, y)
-    qrad = np.radians(q)
-    u = s*np.cos(qrad)
-    v = s*np.sin(qrad)
-    return u, v
-
-def uv2xy(u, v):
-    s = np.sqrt(u**2 + v**2)
-    qrad = np.arctan2(v, u)
-    q = np.degrees(qrad)
-    x, y = qs2xy(q, s)
-    return x, y
+
+from desimeter.transform.xy2qs import xy2uv, uv2xy
+
 
 #- Least squares fit to circle; adapted from "Method 2b" in
 #- https://scipy-cookbook.readthedocs.io/items/Least_Squares_Circle.html

py/desimeter/transform/xy2qs.py

@@ -48,3 +48,18 @@ def qs2xy(q, s):
     y = r*np.sin(np.radians(q))
 
     return x, y
+
+#- Transform between CS5 x,y and curved focal surface
+def xy2uv(x, y):
+    q, s = xy2qs(x, y)
+    qrad = np.radians(q)
+    u = s*np.cos(qrad)
+    v = s*np.sin(qrad)
+    return u, v
+
+def uv2xy(u, v):
+    s = np.sqrt(u**2 + v**2)
+    qrad = np.arctan2(v, u)
+    q = np.degrees(qrad)
+    x, y = qs2xy(q, s)
+    return x, y