merge with wip branch

2023-05-17 17:00:06 +02:00
parent 439c9d34c1
commit e1b30bf37e
56 changed files with 6679 additions and 638 deletions
--- 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