diff --git a/pykat/optics/ABCD.py b/pykat/optics/ABCD.py index 7d7db98d74711bfce546ced3188f6a207f318ccf..4b6977d16b9f303fc740e111253c2808b33999ee 100644 --- a/pykat/optics/ABCD.py +++ b/pykat/optics/ABCD.py @@ -1,5 +1,5 @@ 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])) diff --git a/pykat/optics/maps.py b/pykat/optics/maps.py index a9d5d80305688f15b9d89800ded9150db0b019dc..f7e438b703c9a990054ed02b25127e56150419c5 100644 --- a/pykat/optics/maps.py +++ b/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): diff --git a/pykat/optics/romhom.py b/pykat/optics/romhom.py index 91aad436ff6790c0801a0bb4e8be2032f0514866..7119fb4366866df19b2a4c4659bb2da89dc5f765 100644 --- a/pykat/optics/romhom.py +++ b/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]