Skip to content
Snippets Groups Projects
Commit 62e4bea6 authored by Andreas Freise's avatar Andreas Freise
Browse files

Merge branch 'master' of gitlab.aei.uni-hannover.de:finesse/pykat

parents 7624b78a de850c0a
No related branches found
No related tags found
No related merge requests found
...@@ -1290,7 +1290,7 @@ class laser(Component): ...@@ -1290,7 +1290,7 @@ class laser(Component):
self._requested_node_names.append(node) self._requested_node_names.append(node)
self.__power = Param("P", self, SIfloat(P), canFsig=True, fsig_name="amp") self.__power = Param("P", self, SIfloat(P), canFsig=True, fsig_name="amp")
self.__f_offset = Param("f", self, SIfloat(f), canFsig=True, fsig_name="freq") self.__f_offset = Param("f", self, f, canFsig=True, fsig_name="freq")
self.__phase = Param("phase", self, SIfloat(phase), canFsig=True, fsig_name="phase") self.__phase = Param("phase", self, SIfloat(phase), canFsig=True, fsig_name="phase")
self.__noise = AttrParam("noise", self, None) self.__noise = AttrParam("noise", self, None)
self._svgItem = None self._svgItem = None
...@@ -1305,7 +1305,11 @@ class laser(Component): ...@@ -1305,7 +1305,11 @@ class laser(Component):
@property @property
def f(self): return self.__f_offset def f(self): return self.__f_offset
@f.setter @f.setter
def f(self,value): self.__f_offset.value = float(value) def f(self,value):
try:
self.__f_offset.value = SIfloat(value)
except:
self.__f_offset.value = value
@property @property
def phase(self): return self.__phase def phase(self): return self.__phase
...@@ -1381,7 +1385,9 @@ class squeezer(Component): ...@@ -1381,7 +1385,9 @@ class squeezer(Component):
self._requested_node_names.append(node) self._requested_node_names.append(node)
self.__f = Param("f", self, SIfloat(f), canFsig=True, fsig_name="f") self.__f = Param("f", self, 0, canFsig=True, fsig_name="f")
self.f = f
self.__phase = Param("phase", self, SIfloat(phase), canFsig=True, fsig_name="phase") self.__phase = Param("phase", self, SIfloat(phase), canFsig=True, fsig_name="phase")
self.__db = Param("db", self, SIfloat(db), canFsig=False, fsig_name="r") self.__db = Param("db", self, SIfloat(db), canFsig=False, fsig_name="r")
self.__angle = Param("angle", self, SIfloat(angle), canFsig=False, fsig_name="angle") self.__angle = Param("angle", self, SIfloat(angle), canFsig=False, fsig_name="angle")
...@@ -1401,7 +1407,11 @@ class squeezer(Component): ...@@ -1401,7 +1407,11 @@ class squeezer(Component):
@property @property
def f(self): return self.__f def f(self): return self.__f
@f.setter @f.setter
def f(self,value): self.__f.value = float(value) def f(self,value):
try:
self.__f.value = SIfloat(value)
except:
self.__f.value = value
@property @property
def phase(self): return self.__phase def phase(self): return self.__phase
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment