moving more files out of utilities

pykat/utilities/knm.py → pykat/optics/knm.py

 from itertools import combinations_with_replacement as combinations
-from pykat.utilities.optics.gaussian_beams import beam_param, HG_beam
+from pykat.optics.gaussian_beams import beam_param, HG_beam
 from pykat.exceptions import BasePyKatException
-from romhom import u_star_u
+from pykat.optics.romhom import u_star_u
 from pykat.external.progressbar import ProgressBar, ETA, Percentage, Bar
 from scipy.interpolate import interp2d
 from scipy.integrate import dblquad
 
 import time
-import maps
+import pykat.optics.maps
 import os.path
 import numpy as np
 import pykat

pykat/utilities/maps.py → pykat/optics/maps.py

+"""
+------------------------------------------------------
+Utility functions for handling mirror surface
+maps. Some functions based on earlier version
+in Matlab (http://www.gwoptics.org/simtools/)
+Work in progress, currently these functions are
+untested!
+
+http://www.gwoptics.org/pykat/
+------------------------------------------------------
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from pykat.utilities.romhom import makeReducedBasis, makeEmpiricalInterpolant, makeWeights
 from scipy.interpolate import interp2d
 import numpy as np

pykat/utilities/romhom.py → pykat/optics/romhom.py

@@ -5,10 +5,10 @@ import collections
     
 from pykat.external.progressbar import ProgressBar, ETA, Percentage, Bar
 from itertools import combinations_with_replacement as combinations
-from pykat.utilities.optics.gaussian_beams import beam_param, HG_beam
+from pykat.optics.gaussian_beams import beam_param, HG_beam
 from scipy.linalg import inv
 from math import factorial
-from hermite import *
+from pykat.math.hermite import *
 
 import numpy as np