fixing imports to new locations

pykat/optics/ABCD.py

 import numpy as np
-from pykat.utilities.optics.gaussian_beams import gauss_param
+from pykat.optics.gaussian_beams import gauss_param
 
 def apply(ABCD, q1, n1, n2):
     return gauss_param(nr=n2, q=n2 * (ABCD[0,0] * q1/float(n1) + ABCD[0,1]) / (ABCD[1,0] * q1/float(n1) + ABCD[1,1]))

pykat/optics/maps.py

@@ -13,11 +13,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from pykat.utilities.romhom import makeReducedBasis, makeEmpiricalInterpolant, makeWeights
+from pykat.optics.romhom import makeReducedBasis, makeEmpiricalInterpolant, makeWeights
 from scipy.interpolate import interp2d
 import numpy as np
 import math
-from pykat.utilities.zernike import *        
+from pykat.math.zernike import *        
 		   
 class surfacemap(object):
     def __init__(self, name, maptype, size, center, step_size, scaling, data=None):

pykat/optics/romhom.py

@@ -125,7 +125,7 @@ def makeReducedBasis(x, isModeMatched=True, tolerance = 1e-12, sigma = 1, greedy
         else:
             greedypts = 'mismatched20.txt'
     
-    greedyfile = os.path.join(pykat.__path__[0],'utilities','greedypoints',greedypts)
+    greedyfile = os.path.join(pykat.__path__[0],'optics','greedypoints',greedypts)
     
     limits = np.loadtxt(greedyfile, usecols=(1,))[:5]