From 8c288800cfa6011d82efc21f9c3e6e7f471bf4bb Mon Sep 17 00:00:00 2001 From: Daniel Brown <ddb@star.sr.bham.ac.uk> Date: Fri, 16 Jan 2015 12:50:00 +0000 Subject: [PATCH] fixing fsig parsing --- pykat/finesse.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pykat/finesse.py b/pykat/finesse.py index bc335e2..8333468 100644 --- a/pykat/finesse.py +++ b/pykat/finesse.py @@ -853,25 +853,28 @@ class kat(object): if len(v) == 5: param == None - freq = float(v[3]) - phase = float(v[4]) + freq = SIfloat(v[3]) + phase = SIfloat(v[4]) elif len(v) == 6: - if v[3].isdigit(): - freq = float(v[3]) - phase = float(v[4]) - amp = float(v[5]) + if v[3][0].isdigit(): + freq = SIfloat(v[3]) + phase = SIfloat(v[4]) + amp = SIfloat(v[5]) else: - param = v[3] - freq = float(v[4]) - phase = float(v[5]) + param = str(v[3]) + freq = SIfloat(v[4]) + phase = SIfloat(v[5]) + elif len(v) == 7: param = v[3] - freq = float(v[4]) - phase = float(v[5]) - amp = float(v[6]) + freq = SIfloat(v[4]) + phase = SIfloat(v[5]) + amp = SIfloat(v[6]) else: raise pkex.BasePyKatException("'{0}' isnot a valid fsig command".format(line)) + print(param, freq, phase, amp) + self.signals.f = freq self.signals.apply(comp._default_fsig(), amp, phase, name) else: -- GitLab