diff --git a/frappy_psi/k2601b.py b/frappy_psi/k2601b.py index d4dde6cb..df92219e 100644 --- a/frappy_psi/k2601b.py +++ b/frappy_psi/k2601b.py @@ -60,7 +60,7 @@ class SourceMeter(HasIO, Module): ioClass = K2601bIO def read_mode(self): - return float(self.communicate('print((smua.source.func+1)*smua.source.output)')) + return int(float(self.communicate('print((smua.source.func+1)*smua.source.output)'))) def write_mode(self, value): assert self.communicate(SOURCECMDS[value]) == 'ok' diff --git a/frappy_psi/ppmssim.py b/frappy_psi/ppmssim.py index 5936e0e8..d8d9939e 100644 --- a/frappy_psi/ppmssim.py +++ b/frappy_psi/ppmssim.py @@ -188,7 +188,7 @@ class PpmsSim: else: self.status.pos = 5 - self.st = sum(self.status[i] << (i * 4) for i in range(4)) + self.st = sum((self.status[i] << (i * 4) for i in range(4))) self.r1 = self.t * 0.1 self.i1 = self.t % 10.0 self.r2 = 1000 / self.t