diff --git a/pykat/components.py b/pykat/components.py index e6a9a7d8ebe736b361820562f79933cdde08cd49..96c5c68767e37d32d4ed2156583c19427db146b7 100644 --- a/pykat/components.py +++ b/pykat/components.py @@ -7,10 +7,12 @@ Created on Mon Jan 28 11:10:01 2013 import exceptions import pykat from pykat.node_network import * +from pykat.exceptions import * import pykat.gui.resources import pykat.gui.graphics from pykat.gui.graphics import * +from pykat.SIfloat import * class Component(object) : def __init__(self, name): @@ -200,8 +202,8 @@ class space(Component): self._requested_node_names.append(node1) self._requested_node_names.append(node2) - self.__L = float(L) - self.__n = float(n) + self.__L = SIfloat(L) + self.__n = SIfloat(n) self._QItem = None @property @@ -297,7 +299,7 @@ class laser(Component): elif len(values) == 4: return laser(values[0],values[3],P=values[1],f_offset=values[2], phase=0) else: - raise exceptions.RuntimeError("Laser Finesse code format incorrect '{0}'".format(text)) + raise exceptions.FinesseParse("Laser Finesse code format incorrect '{0}'".format(text)) def getFinesseText(self): nodes = self.getNodes()