diff --git a/script/Accumulator.py b/script/Accumulator.py index c239857..6f1d829 100644 --- a/script/Accumulator.py +++ b/script/Accumulator.py @@ -2,13 +2,14 @@ #Not using a simple Readable because cannot change name (Jython bug with default methods) class AccumulatorSensor(ReadonlyRegisterBase): def __init__(self, averager, index): - print averager.devices[index].name ReadonlyRegisterBase.__init__(self, averager.devices[index].name) self.averager = averager self.index =index self.initialize() def doRead(self): + if self.index == 0: + self.averager.doRead() return self.averager.values[self.index] class Accumulator(ReadonlyRegisterBase, ReadonlyRegisterArray): @@ -26,7 +27,7 @@ class Accumulator(ReadonlyRegisterBase, ReadonlyRegisterArray): def doRead(self): start = time.time() self.samples = [] - for i in range(self.getSize()): + for i in range(self.getSize()): self.samples.append([]) values = [] while True: @@ -51,5 +52,5 @@ class Accumulator(ReadonlyRegisterBase, ReadonlyRegisterArray): return ret #acc = Accumulator([signal_tey, signal_i0, signal_trans], integration_time = 0.5) -#tscan ([acc,] + acc.getSensors(), 10, 3.0) +#tscan (acc.getSensors(), 10, 3.0) \ No newline at end of file