Merge branch 'master' into tests_tekdpo70000

instrumentkit · Sep 8, 2020 · 8a76dc1 · 8a76dc1
2 parents 6827047 + f10497d
commit 8a76dc1
Show file tree

Hide file tree

Showing 2 changed files with 624 additions and 1 deletion.
diff --git a/instruments/srs/srsctc100.py b/instruments/srs/srsctc100.py
@@ -235,7 +235,8 @@ def get_log_point(self, which='next', units=None):
                     'getLog.xy {}, {}'.format(self._chan_name, which)
                 ).split(',')
             ]
-            return u.Quantity(point[0], 'ms'), u.Quantity(point[1], units)
+            return u.Quantity(float(point[0]), 'ms'), \
+                   u.Quantity(float(point[1]), units)
 
         def get_log(self):
             """