From b184418f483da0b9679beeb2ac0272b752d5b31c Mon Sep 17 00:00:00 2001
From: Andreas Freise <adf@star.bham.ac.uk>
Date: Sat, 20 Dec 2014 23:36:24 +0000
Subject: [PATCH] fixing imports to new locations
---
examples/asc_test/master4.py | 4 ++--
examples/asc_test/master5.py | 4 ++--
examples/cavity_scan.py | 2 +-
examples/fft/spatial_filter.py | 2 +-
examples/gauss_param.py | 4 ++--
examples/length_tuning.py | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/asc_test/master4.py b/examples/asc_test/master4.py
index 5debc2b..5c1e51f 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 c33d0c2..1ba4d7f 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 90a4848..10b196e 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 c255507..a8de970 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 75acf38..bd30d08 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 4bc8df4..8a1c524 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
--
GitLab