diff --git a/script/Averager.py b/script/Averager.py index 0a4cd06..c83dbeb 100644 --- a/script/Averager.py +++ b/script/Averager.py @@ -7,7 +7,6 @@ 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): ReadonlyRegisterBase.__init__(self, "Averager") @@ -23,28 +22,17 @@ class Averager(ReadonlyRegisterBase, ReadonlyRegisterArray): def doRead(self): start = time.time() self.samples = [] - print self.getSize() for i in range(self.getSize()): self.samples.append([]) - print self.samples values = [] while True: for i in range (self.getSize()): v = self.devices[i].read() - print "----------" - print v - print i - print self.samples - print "##########" self.samples[i].append(v) - print self.samples - print "!!!!!!!!!!!" if self.integration_time is None or (time.time() - start) >= self.integration_time: break - print "Resampling" sleep(0.1) self.values = [] - print "**********" print self.samples for i in range (self.getSize()): self.values.append(mean(self.samples[i]))