diff --git a/pykat/__init__.py b/pykat/__init__.py index daf240044eb61ebfdf08d216553f99a0a664659f..4317258a538fd73f770c99a4277ecd8c86e7cef7 100644 --- a/pykat/__init__.py +++ b/pykat/__init__.py @@ -3,7 +3,7 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -__version__ = "1.0.17" +__version__ = "1.0.18" # This flag is used to switch on the gui features in pkat at import time USE_GUI = False diff --git a/pykat/components.py b/pykat/components.py index fb78a5ed368dc5a31bc8b0d2102a417488b6ad81..7c6067cb6985a3bfc749eef508e040a6637b1b76 100644 --- a/pykat/components.py +++ b/pykat/components.py @@ -478,9 +478,9 @@ class AbstractMirrorComponent(Component): self.Rc = value elif key in ["M","m", "Mass", "mass"]: self.mass = value - elif key in ["xbeta", "xBeta"]: + elif key in ["xbeta", "xBeta", "yaw"]: self.xbeta = value - elif key in ["ybeta","yBeta"]: + elif key in ["ybeta", "yBeta", "pitch"]: self.ybeta = value elif key in ["x_off"]: self.x_offset = value @@ -504,7 +504,8 @@ class AbstractMirrorComponent(Component): return True class mirror(AbstractMirrorComponent): - def __init__(self,name,node1,node2,R=None,T=None,L=None,phi=0,Rcx=None,Rcy=None,xbeta=None,ybeta=None,mass=None, r_ap=None): + def __init__(self, name, node1, node2, R=None, T=None, L=None, + phi=0, Rcx=None, Rcy=None, xbeta=None, ybeta=None, mass=None, r_ap=None): super(mirror, self).__init__(name, R, T, L, phi, Rcx, Rcy, xbeta, ybeta, mass, r_ap) self._requested_node_names.append(node1) diff --git a/pykat/finesse.py b/pykat/finesse.py index b6e3f41ed0f2b7e979879cc048d7ac7313b78621..8cf9ecb90b6d93cce75489969f9d28e9c0932836 100644 --- a/pykat/finesse.py +++ b/pykat/finesse.py @@ -646,6 +646,7 @@ class KatRun2D(object): def __init__(self): self._unfreeze() self.runtime = None + self.runDateTime = None self.startDateTime = datetime.datetime.now() self.x = None self.y = None diff --git a/pykat/optics/gaussian_beams.py b/pykat/optics/gaussian_beams.py index 9467f349cf4198aee37b7e3b6adec1fa820f2377..0900faeb4042356770203de2279c9fe23c9480d2 100644 --- a/pykat/optics/gaussian_beams.py +++ b/pykat/optics/gaussian_beams.py @@ -85,7 +85,7 @@ class BeamParam(object): def zr(self): return self.__q.imag @property - def w(self): + def w(self, z=None): return np.abs(self.__q)* np.sqrt(self.__lambda / (self.__nr * math.pi * self.__q.imag)) def beamsize(self, z=None, wavelength=None, nr=None, w0=None): diff --git a/pykat/tools/plotting/beamtrace.py b/pykat/tools/plotting/beamtrace.py index dc99be353c1d281f7d0e9854711669ff38b1b3d1..0cddd6b9ff02409747f4a827a2bec00e30735b70 100644 --- a/pykat/tools/plotting/beamtrace.py +++ b/pykat/tools/plotting/beamtrace.py @@ -65,7 +65,7 @@ def plot_beam_trace(_kat, from_node, to_node): for n in range(len(spaces)): s = spaces[n] Lmax = s.L - N = 1000 + N = 100 node = None cmds = """