##// END OF EJS Templates
Se agrega el metodo __jumpToLastBlock para saltar al ultimo bloque datos (solo lectura online). Faltan hacer pruebas con el sistema de adquisicion operando en linea.
Daniel Valdez -
r321:dc367d7b08c2
parent child
Show More
@@ -314,6 +314,8 class JRODataReader(JRODataIO, ProcessingUnit):
314
314
315 flagNoMoreFiles = 0
315 flagNoMoreFiles = 0
316
316
317 __isFirstTimeOnline = 1
318
317 def __init__(self):
319 def __init__(self):
318
320
319 """
321 """
@@ -638,13 +640,39 class JRODataReader(JRODataIO, ProcessingUnit):
638 time.sleep( self.delay )
640 time.sleep( self.delay )
639
641
640
642
641 return 0
643 return 0
644
645 def __jumpToLastBlock(self):
646
647 if not(self.__isFirstTimeOnline):
648 return
649
650 csize = self.fileSize - self.fp.tell()
651
652 #sata el primer bloque de datos
653 if csize > self.processingHeaderObj.blockSize:
654 self.fp.seek(self.fp.tell() + self.processingHeaderObj.blockSize)
655 else:
656 return
657
658 csize = self.fileSize - self.fp.tell()
659 neededsize = self.processingHeaderObj.blockSize + self.basicHeaderSize
660 factor = int(csize/neededsize)
661 if factor > 0:
662 self.fp.seek(self.fp.tell() + factor*neededsize)
663
664 self.flagIsNewFile = 0
665 self.__isFirstTimeOnline = 0
666
642
667
643 def __setNewBlock(self):
668 def __setNewBlock(self):
644
669
645 if self.fp == None:
670 if self.fp == None:
646 return 0
671 return 0
647
672
673 if self.online:
674 self.__jumpToLastBlock()
675
648 if self.flagIsNewFile:
676 if self.flagIsNewFile:
649 return 1
677 return 1
650
678
@@ -663,7 +691,7 class JRODataReader(JRODataIO, ProcessingUnit):
663 return 0
691 return 0
664
692
665 deltaTime = self.basicHeaderObj.utc - self.lastUTTime #
693 deltaTime = self.basicHeaderObj.utc - self.lastUTTime #
666
694
667 self.flagTimeBlock = 0
695 self.flagTimeBlock = 0
668
696
669 if deltaTime > self.maxTimeStep:
697 if deltaTime > self.maxTimeStep:
@@ -1291,6 +1319,8 class VoltageReader(JRODataReader):
1291 self.nReadBlocks = 0
1319 self.nReadBlocks = 0
1292
1320
1293 self.flagIsNewFile = 1
1321 self.flagIsNewFile = 1
1322
1323 self.__isFirstTimeOnline = 1
1294
1324
1295 self.ippSeconds = 0
1325 self.ippSeconds = 0
1296
1326
@@ -1883,6 +1913,8 class SpectraReader(JRODataReader):
1883 self.nReadBlocks = 0
1913 self.nReadBlocks = 0
1884
1914
1885 self.flagIsNewFile = 1
1915 self.flagIsNewFile = 1
1916
1917 self.__isFirstTimeOnline = 1
1886
1918
1887 self.ippSeconds = 0
1919 self.ippSeconds = 0
1888
1920
General Comments 0
You need to be logged in to leave comments. Login now