@@ -425,8 +425,6 class JRODataIO: | |||||
425 |
|
425 | |||
426 | processingHeaderObj = None |
|
426 | processingHeaderObj = None | |
427 |
|
427 | |||
428 | online = 0 |
|
|||
429 |
|
||||
430 | dtype = None |
|
428 | dtype = None | |
431 |
|
429 | |||
432 | pathList = [] |
|
430 | pathList = [] | |
@@ -494,6 +492,11 class JRODataIO: | |||||
494 |
|
492 | |||
495 | class JRODataReader(JRODataIO): |
|
493 | class JRODataReader(JRODataIO): | |
496 |
|
494 | |||
|
495 | ||||
|
496 | online = 0 | |||
|
497 | ||||
|
498 | realtime = 0 | |||
|
499 | ||||
497 | nReadBlocks = 0 |
|
500 | nReadBlocks = 0 | |
498 |
|
501 | |||
499 | delay = 10 #number of seconds waiting a new file |
|
502 | delay = 10 #number of seconds waiting a new file | |
@@ -756,7 +759,7 class JRODataReader(JRODataIO): | |||||
756 |
|
759 | |||
757 | for nTries in range( tries ): |
|
760 | for nTries in range( tries ): | |
758 | if firstTime_flag: |
|
761 | if firstTime_flag: | |
759 | print "\t[Reading] Waiting %0.2f sec for the file \"%s\" , try %03d ..." % ( self.delay, filename, nTries+1 ) |
|
762 | print "\t[Reading] Waiting %0.2f sec for the next file: \"%s\" , try %03d ..." % ( self.delay, filename, nTries+1 ) | |
760 | sleep( self.delay ) |
|
763 | sleep( self.delay ) | |
761 | else: |
|
764 | else: | |
762 | print "\t[Reading] Searching the next \"%s%04d%03d%03d%s\" file ..." % (self.optchar, self.year, self.doy, self.set, self.ext) |
|
765 | print "\t[Reading] Searching the next \"%s%04d%03d%03d%s\" file ..." % (self.optchar, self.year, self.doy, self.set, self.ext) | |
@@ -915,28 +918,38 class JRODataReader(JRODataIO): | |||||
915 |
|
918 | |||
916 | if self.fp == None: |
|
919 | if self.fp == None: | |
917 | return 0 |
|
920 | return 0 | |
918 |
|
921 | |||
919 | if self.online: |
|
922 | # if self.online: | |
920 | self.__jumpToLastBlock() |
|
923 | # self.__jumpToLastBlock() | |
921 |
|
924 | |||
922 | if self.flagIsNewFile: |
|
925 | if self.flagIsNewFile: | |
|
926 | self.lastUTTime = self.basicHeaderObj.utc | |||
923 | return 1 |
|
927 | return 1 | |
924 |
|
928 | |||
925 | self.lastUTTime = self.basicHeaderObj.utc |
|
929 | if self.realtime: | |
|
930 | self.flagDiscontinuousBlock = 1 | |||
|
931 | if not(self.setNextFile()): | |||
|
932 | return 0 | |||
|
933 | else: | |||
|
934 | return 1 | |||
|
935 | ||||
926 | currentSize = self.fileSize - self.fp.tell() |
|
936 | currentSize = self.fileSize - self.fp.tell() | |
927 | neededSize = self.processingHeaderObj.blockSize + self.basicHeaderSize |
|
937 | neededSize = self.processingHeaderObj.blockSize + self.basicHeaderSize | |
928 |
|
938 | |||
929 | if (currentSize >= neededSize): |
|
939 | if (currentSize >= neededSize): | |
930 | self.basicHeaderObj.read(self.fp) |
|
940 | self.basicHeaderObj.read(self.fp) | |
|
941 | self.lastUTTime = self.basicHeaderObj.utc | |||
931 | return 1 |
|
942 | return 1 | |
932 |
|
943 | |||
933 | if self.__waitNewBlock(): |
|
944 | if self.__waitNewBlock(): | |
|
945 | self.lastUTTime = self.basicHeaderObj.utc | |||
934 | return 1 |
|
946 | return 1 | |
935 |
|
947 | |||
936 | if not(self.setNextFile()): |
|
948 | if not(self.setNextFile()): | |
937 | return 0 |
|
949 | return 0 | |
938 |
|
950 | |||
939 | deltaTime = self.basicHeaderObj.utc - self.lastUTTime # |
|
951 | deltaTime = self.basicHeaderObj.utc - self.lastUTTime # | |
|
952 | self.lastUTTime = self.basicHeaderObj.utc | |||
940 |
|
953 | |||
941 | self.flagDiscontinuousBlock = 0 |
|
954 | self.flagDiscontinuousBlock = 0 | |
942 |
|
955 | |||
@@ -1134,7 +1147,8 class JRODataReader(JRODataIO): | |||||
1134 | delay = 60, |
|
1147 | delay = 60, | |
1135 | walk = True, |
|
1148 | walk = True, | |
1136 | getblock = False, |
|
1149 | getblock = False, | |
1137 |
nTxs = 1 |
|
1150 | nTxs = 1, | |
|
1151 | realtime=False): | |||
1138 |
|
1152 | |||
1139 | if path == None: |
|
1153 | if path == None: | |
1140 | raise ValueError, "[Reading] The path is not valid" |
|
1154 | raise ValueError, "[Reading] The path is not valid" | |
@@ -1188,6 +1202,7 class JRODataReader(JRODataIO): | |||||
1188 | last_set = int(basename[-3:]) |
|
1202 | last_set = int(basename[-3:]) | |
1189 |
|
1203 | |||
1190 | self.online = online |
|
1204 | self.online = online | |
|
1205 | self.realtime = realtime | |||
1191 | self.delay = delay |
|
1206 | self.delay = delay | |
1192 | ext = ext.lower() |
|
1207 | ext = ext.lower() | |
1193 | self.ext = ext |
|
1208 | self.ext = ext |
General Comments 0
You need to be logged in to leave comments.
Login now