diff --git a/script/Averager.py b/script/Averager.py index e2f1a84..0ac802d 100644 --- a/script/Averager.py +++ b/script/Averager.py @@ -5,7 +5,7 @@ class AveragerSensor(Readable): self.index =index def read(self): - return self.averager.getSample[self.index] + return self.averager.values[self.index] class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): @@ -15,12 +15,14 @@ class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): self.integration_time = integration_time self.initialize() self.samples = [[],] * len(devices) + self.values = [] def getSize(self): return len(self.devices) def doRead(self): - start = time.time() + start = time.time() self.values + measures = [] measures = [] while True: @@ -29,23 +31,20 @@ class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): if self.integration_time is None or (time.time() - start) >= self.integration_time: break sleep(0.1) - ret = [] + self.values = [] for i in range (self.getSize()): - ret.append(getSample(i)) - - - def getSample(self, index): - return mean(self.samples[index]) - + self.values.append(mean(self.samples[index])) + return self.values + def getSensor(self, index): return AveragerSensor(self, index) - def getDevices(): + def getSensors(): ret = [] for i in range (self.getSize()): ret.apppend(AveragerSensor(this,i)) return ret averager = Averager() -tscan ([averager,] + averager.devices, 10, 3.0) +tscan ([averager,] + averager.sensors, 10, 3.0) \ No newline at end of file