From d0b0deefe1de42a7fc37d7e0c8ccb54901601313 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 11:08:00 +0100 Subject: [PATCH] Script execution --- script/Averager.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/script/Averager.py b/script/Averager.py index e922b98..7acb5e9 100644 --- a/script/Averager.py +++ b/script/Averager.py @@ -8,24 +8,31 @@ class AveragerSensor(Readable): return self.averager.getSample[self.index] -class Averager(ReadonlyRegisterBase): +class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): def __init__(self, devices = [signal_tey, signal_i0, signal_trans], integration_time=None): ReadonlyRegisterBase.__init__(self, devices[0].getName()) self.devices = devices self.integration_time = integration_time self.initialize() self.samples = [[],] * len(devices) + + def getSize(self): + return len(self. devices) def doRead(self): start = time.time() measures = [] + while True: - for i in range (len[self.devices]): + for i in range (getSize()): self.samples[i].append(self.devices[i].read()) if integration_time is None or (time.time() - start) >= integration_time: break sleep(0.1) - return getSample[0] + ret = [] + for i in range (getSize()): + ret.append(getSample[i]) + def getSample(self, index): return mean(self.samples[index]) @@ -35,7 +42,7 @@ class Averager(ReadonlyRegisterBase): def getDevices(): ret = [] - for i in range (len[self.devices]): + for i in range (getSize()): ret.apppend(AveragerSensor(this,i)) return ret