From 5e003794056583dbb8aef5c005f40466ca554434 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 11:39:46 +0100 Subject: [PATCH] Script execution --- script/Averager.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/script/Averager.py b/script/Averager.py index c83dbeb..e7c4756 100644 --- a/script/Averager.py +++ b/script/Averager.py @@ -1,5 +1,5 @@ -class AveragerSensor(Readable): +class AccumulatorSensor(Readable): def __init__(self, averager, index): self.averager =averager self.index =index @@ -7,8 +7,8 @@ class AveragerSensor(Readable): def read(self): return self.averager.values[self.index] -class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): - def __init__(self, devices = [signal_tey, signal_i0, signal_trans], integration_time=None): +class Accumulator(ReadonlyRegisterBase, ReadonlyRegisterArray): + def __init__(self, devices, integration_time=None): ReadonlyRegisterBase.__init__(self, "Averager") self.devices = devices self.integration_time = integration_time @@ -32,8 +32,7 @@ class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): if self.integration_time is None or (time.time() - start) >= self.integration_time: break sleep(0.1) - self.values = [] - print self.samples + self.values = [] for i in range (self.getSize()): self.values.append(mean(self.samples[i])) return self.values @@ -47,6 +46,6 @@ class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): ret.append(AveragerSensor(self,i)) return ret -averager = Averager() -tscan ([averager,] + averager.getSensors(), 10, 3.0) +acc = Accumulator([signal_tey, signal_i0, signal_trans], integration_time = 0.5) +tscan ([acc,] + acc.sensors, 10, 3.0) \ No newline at end of file