even more merges from gerrit

Change-Id: I4cfddc8fd4157ceae353789f2f60d834ec05974e

secop_psi/ppmssim.py

@@ -26,6 +26,7 @@ import time
 def num(string):
     return json.loads(string)
 
+
 class NamedList:
     def __init__(self, keys, *args, **kwargs):
         self.__keys__ = keys.split()
@@ -49,8 +50,10 @@ class NamedList:
     def __repr__(self):
         return ",".join("%.7g" % val for val in self.aslist())
 
+
 class PpmsSim:
     CHANNELS = 'st t mf pos r1 i1 r2 i2'.split()
+
     def __init__(self):
         self.status = NamedList('t mf ch pos', 1, 1, 1, 1)
         self.st = 0x1111
@@ -176,7 +179,6 @@ class PpmsSim:
                 if abs(self.t - self.temp.target) < 1:
                     self.status.t = 6 # outside tolerance
 
-
         if abs(self.pos - self.move.target) < 0.01:
             self.status.pos = 1
         else:
@@ -187,8 +189,7 @@ class PpmsSim:
         self.i1 = self.t % 10.0
         self.r2 = 1000 / self.t
         self.i2 = math.log(self.t)
-        self.level.value = round(100 - (self.time - self.start) * 0.01 % 100, 1)
-        # print('PROGRESS T=%.7g B=%.7g x=%.7g' % (self.t, self.mf, self.pos))
+        self.level.value = 100 - (self.time - self.start) * 0.01 % 100
 
     def getdat(self, mask):
         mask = int(mask) & 0xff # all channels up to i2
@@ -198,6 +199,7 @@ class PpmsSim:
                 output.append("%.7g" % getattr(self, chan))
         return ",".join(output)
 
+
 class QDevice:
     def __init__(self, classid):
         self.sim = PpmsSim()
@@ -225,5 +227,6 @@ class QDevice:
             result = "OK"
         return result
 
+
 def shutdown():
     pass