| @@ -471,7 +471,7 class CohInt(Operation): | |||||
| 471 | if self.__profIndex == 0: |
|
471 | if self.__profIndex == 0: | |
| 472 | self.__buffer = [[data.copy(), datatime]] |
|
472 | self.__buffer = [[data.copy(), datatime]] | |
| 473 | else: |
|
473 | else: | |
| 474 |
self.__buffer.append([data.copy(), |
|
474 | self.__buffer.append([data.copy(),datatime]) | |
| 475 | self.__profIndex += 1 |
|
475 | self.__profIndex += 1 | |
| 476 | self.__dataReady = False |
|
476 | self.__dataReady = False | |
| 477 |
|
477 | |||
| @@ -488,15 +488,13 class CohInt(Operation): | |||||
| 488 | self.__bufferStride.append((data, avgdatatime)) |
|
488 | self.__bufferStride.append((data, avgdatatime)) | |
| 489 |
|
489 | |||
| 490 | if self.__dataToPutStride: |
|
490 | if self.__dataToPutStride: | |
| 491 |
self.__dataReady = |
|
491 | self.__dataReady = True | |
| 492 | self.__profIndexStride += 1 |
|
492 | self.__profIndexStride += 1 | |
| 493 | if self.__profIndexStride == self.stride: |
|
493 | if self.__profIndexStride == self.stride: | |
| 494 | self.__dataReady = True |
|
|||
| 495 | self.__dataToPutStride = False |
|
494 | self.__dataToPutStride = False | |
| 496 | self.__profIndexStride = 0 |
|
|||
| 497 | # print self.__bufferStride[self.__profIndexStride - 1] |
|
495 | # print self.__bufferStride[self.__profIndexStride - 1] | |
| 498 | # raise |
|
496 | # raise | |
| 499 | return (numpy.sum([t[0] for t in self.__bufferStride], axis=0), numpy.average([t[1] for t in self.__bufferStride])) |
|
497 | return self.__bufferStride[self.__profIndexStride - 1] | |
| 500 |
|
498 | |||
| 501 |
|
499 | |||
| 502 | return None, None |
|
500 | return None, None | |
General Comments 0
You need to be logged in to leave comments.
Login now