fix minor issues in ppmssim and k2601b

merging changes in gitpsi and gitmlz branch

Change-Id: I4996da637ad62c5bd76596ea95aee1decaaccaf2

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'

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