fixing imports to new locations

examples/asc_test/master4.py

 from pykat import finesse
 from pykat.commands import *
-from pykat.utilities.optics.gaussian_beams import gauss_param
+from pykat.optics.gaussian_beams import gauss_param
 
 import pylab as pl
 import scipy
@@ -192,7 +192,7 @@ def get_qs(tmpkat,f):
         # computing beam size at ITM 
         # and then we reflect of ITM, an set it as new startnode
         q_in = complex(out['w1'][0],out['w1'][1])
-        from pykat.utilities.optics.ABCD import apply, mirror_refl
+        from pykat.optics.ABCD import apply, mirror_refl
         abcd = mirror_refl(1,-2500)
         q_out = apply(abcd,q_in,1,1)
         beam1 = gauss_param(q=q_out)    

examples/asc_test/master5.py

 from pykat import finesse
 from pykat.commands import *
-from pykat.utilities.optics.gaussian_beams import gauss_param
+from pykat.optics.gaussian_beams import gauss_param
 
 import pylab as pl
 import scipy
@@ -155,7 +155,7 @@ def get_qs(tmpkat):
         # computing beam size at ITM 
         # and then we reflect of ITM, an set it as new startnode
         q_in = complex(out['w1'][0],out['w1'][1])
-        from pykat.utilities.optics.ABCD import apply, mirror_refl
+        from pykat.optics.ABCD import apply, mirror_refl
         abcd = mirror_refl(1,-2500)
         q_out = apply(abcd,q_in,1,1)
         beam1 = gauss_param(q=q_out)    

examples/cavity_scan.py

@@ -292,7 +292,7 @@ kat.add(
 
 # set q value 1m from ITM, i.e. at the n1 node
 # use the utility method for this purpose
-kat.space1.n1.q = pykat.utilities.optics.gaussian_beams.gauss_param(q = 1.050412 + 24.243836j)
+kat.space1.n1.q = pykat.optics.gaussian_beams.gauss_param(q = 1.050412 + 24.243836j)
 # you can alternatively set w0 and z with gauss_param(w0 = #, z = #)
 
 ##############################

examples/fft/spatial_filter.py

@@ -8,7 +8,7 @@ BACKEND = 'Qt4Agg'
 matplotlib.use(BACKEND)
 import pylab as pl
 
-from pykat.utilities.optics.gaussian_beams import HG_beam, beam_param
+from pykat.optics.gaussian_beams import HG_beam, beam_param
 from pykat.fft.fft import *
 import numpy as np
 import scipy

examples/gauss_param.py

-from pykat.utilities.optics.ABCD import apply, mirror_trans
-from pykat.utilities.optics.gaussian_beams import gauss_param
+from pykat.optics.ABCD import apply, mirror_trans
+from pykat.optics.gaussian_beams import gauss_param
 
 nr1 = 1
 nr2 = 1.44963098985906

examples/length_tuning.py

@@ -9,7 +9,7 @@ import sys
 sys.path.append("../")
 
 import pykat
-from pykat.utilities.optics.gaussian_beams import gauss_param
+from pykat.optics.gaussian_beams import gauss_param
 import pykat.finesse as finesse
 from pykat.commands import xaxis
 import pylab as pl