From d612ed3d14d88d4b2a4f6d6ebe100bdde09f177f Mon Sep 17 00:00:00 2001
From: Daniel Brown <ddb@star.sr.bham.ac.uk>
Date: Mon, 20 Feb 2017 23:56:45 +0000
Subject: [PATCH] updating version and changes to beam tracing
---
pykat/__init__.py | 2 +-
pykat/components.py | 7 ++++---
pykat/finesse.py | 1 +
pykat/optics/gaussian_beams.py | 2 +-
pykat/tools/plotting/beamtrace.py | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pykat/__init__.py b/pykat/__init__.py
index daf2400..4317258 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 fb78a5e..7c6067c 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 b6e3f41..8cf9ecb 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 9467f34..0900fae 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 dc99be3..0cddd6b 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 = """
--
GitLab