diff --git a/pykat/__init__.py b/pykat/__init__.py index f91c9789644c76b1be75846bf1fe1a8e4f6f2e51..c4a01afb687111ea1f9e36a095ad3df797d711b8 100644 --- a/pykat/__init__.py +++ b/pykat/__init__.py @@ -2,7 +2,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function from __future__ import unicode_literals -__version__ = "0.6.2" +__version__ = "0.7.2" # This flag is used to switch on the gui features in pkat at import time USE_GUI = False diff --git a/pykat/finesse.py b/pykat/finesse.py index b9dc5cb1bfab0b272726ce333c89937a3d3031dd..d3ae8f926684ef30edfc1c9a6ff540734c6f33b9 100644 --- a/pykat/finesse.py +++ b/pykat/finesse.py @@ -1265,7 +1265,8 @@ class kat(object): return rtn[0] else: return rtn - + except KeyboardInterrupt as ex: + print("Keyboard interrupt caught, stopped simulation.") except pkex.FinesseRunError as ex: pkex.PrintError("Error from Finesse:", ex) except pkex.BasePyKatException as ex: diff --git a/pykat/optics/knm.py b/pykat/optics/knm.py index 4ecd9b6a2a6551739ed5f81f46110b9b20a12d1a..1579ac563bf2fadee219a55aef7a74ee1cd9c196 100644 --- a/pykat/optics/knm.py +++ b/pykat/optics/knm.py @@ -330,7 +330,6 @@ def ROM_HG_knm(weights, mode_in, mode_out, q1, q2, q1y=None, q2y=None, cache=Non w_ij_Q3Q4 = cache["w_ij_Q3Q4"] w_ij_Q1Q2Q3Q4 = cache["w_ij_Q1Q2Q3Q4"] - u_xy_nodes = np.outer(u_x_nodes, u_y_nodes) n_mod_2 = n % 2 diff --git a/pykat/optics/maps.py b/pykat/optics/maps.py index d96ae12ced82da0c6d989149f4b1b6d6bc4a11cf..86b2e066947e308ce398ac66e54e98960cf37b36 100644 --- a/pykat/optics/maps.py +++ b/pykat/optics/maps.py @@ -128,9 +128,9 @@ class surfacemap(object): elif "absorption" in self.type: return np.sqrt(1.0 - data) - else: raise BasePyKatException("Map type needs handling") + elif direction == "transmission": if "phase" in self.type: k = math.pi * 2 / wavelength diff --git a/requirements.txt b/requirements.txt index 1ec8c6d2b728c9c4d3e65d3c1c94a0caa6c7ffc6..4dce5605ef020624781c22cb374829cb2cf5fe7c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ numpy >= 1.6.2 flask >= 0.10.1 -progressbar >= 2.2 diff --git a/setup.py b/setup.py index 83bf575a5ba3ec38b62e4f585eaf7c84fae07551..3b048cef0f7cb3d4e146d42616546c734845597e 100644 --- a/setup.py +++ b/setup.py @@ -4,17 +4,17 @@ Created on Sun Jan 27 09:43:16 2013 @author: Daniel """ -import pykat +from pykat import __version__ as version from distutils.core import setup REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()] setup( name='PyKat', - version=pykat.__version__, + version=version, author='Daniel Brown', author_email='ddb@star.sr.bham.ac.uk', - packages=['pykat','pykat.gui','pykat.gui.resources','pykat.testing','pykat.testing.web','pykat.math','pykat.optics', 'pykat.external', 'pykat.tools'], + packages=['pykat','pykat.testing','pykat.testing.web','pykat.maths','pykat.optics', 'pykat.external', 'pykat.tools'], url='http://pypi.python.org/pypi/PyKat/', license='GPL v2', description='Python interface and tools for FINESSE',