diff --git a/examples/asc_test/master4.py b/examples/asc_test/master4.py index 5debc2b1b6281f0e7b8a454ed47a0194dd45da1c..5c1e51ff0d5086a9acde240ea503a3933c5f3798 100644 --- a/examples/asc_test/master4.py +++ b/examples/asc_test/master4.py @@ -1,6 +1,6 @@ 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) diff --git a/examples/asc_test/master5.py b/examples/asc_test/master5.py index c33d0c2ada446d434f19e4dff9a39ddf8ae3f329..1ba4d7ff8ae0fc86a00aa28c87739b710709481c 100644 --- a/examples/asc_test/master5.py +++ b/examples/asc_test/master5.py @@ -1,6 +1,6 @@ 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) diff --git a/examples/cavity_scan.py b/examples/cavity_scan.py index 90a48489b60b3c7303455cd06f119746f05541c0..10b196eef46ef62a8cbf7a89bc2092c7e411c61d 100644 --- a/examples/cavity_scan.py +++ b/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 = #) ############################## diff --git a/examples/fft/spatial_filter.py b/examples/fft/spatial_filter.py index c255507781881e019b01725ca4932259c8491974..a8de970b0e645f2c75b847b1085e3d138745a962 100644 --- a/examples/fft/spatial_filter.py +++ b/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 diff --git a/examples/gauss_param.py b/examples/gauss_param.py index 75acf384131a5b0e50e41883f8a22e2b31ddbe33..bd30d0800bda41b45ee60e7482e31262a1d9ea50 100644 --- a/examples/gauss_param.py +++ b/examples/gauss_param.py @@ -1,5 +1,5 @@ -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 diff --git a/examples/length_tuning.py b/examples/length_tuning.py index 4bc8df4af2a1792fbd83ac77d4686c715915d0ac..8a1c524195a93ea01bcf36eb0eead4b646a0e250 100644 --- a/examples/length_tuning.py +++ b/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