| @@ -34,7 +34,7 controller.start() | |||
|
|
34 | 34 | ''' |
|
|
35 | 35 | |
|
|
36 | 36 | multiprocess = '''from schainpy.controller import Project, MPProject |
|
|
37 | ||
|
|
37 | from time import sleep | |
|
|
38 | 38 | desc = "{desc}" |
|
|
39 | 39 | |
|
|
40 | 40 | #################### |
| @@ -54,6 +54,8 rti.addParameter(name='colormap', value='jet', format='str') | |||
|
|
54 | 54 | |
|
|
55 | 55 | plotter.start() |
|
|
56 | 56 | |
|
|
57 | sleep(2) | |
|
|
58 | ||
|
|
57 | 59 | ################ |
|
|
58 | 60 | # DATA EMITTER # |
|
|
59 | 61 | ################ |
| @@ -89,16 +89,13 def isFileInEpoch(filename, startUTSeconds, endUTSeconds): | |||
|
|
89 | 89 | |
|
|
90 | 90 | |
|
|
91 | 91 | def isTimeInRange(thisTime, startTime, endTime): |
|
|
92 | ||
|
|
93 | 92 | if endTime >= startTime: |
|
|
94 | 93 | if (thisTime < startTime) or (thisTime > endTime): |
|
|
95 | 94 | return 0 |
|
|
96 | ||
|
|
97 | 95 | return 1 |
|
|
98 | 96 | else: |
|
|
99 | 97 | if (thisTime < startTime) and (thisTime > endTime): |
|
|
100 | 98 | return 0 |
|
|
101 | ||
|
|
102 | 99 | return 1 |
|
|
103 | 100 | |
|
|
104 | 101 | |
| @@ -1066,9 +1063,7 class JRODataReader(JRODataIO): | |||
|
|
1066 | 1063 | return 0 |
|
|
1067 | 1064 | |
|
|
1068 | 1065 | self.getBasicHeader() |
|
|
1069 | ||
|
|
1070 | if not isTimeInRange(self.dataOut.datatime.time(), self.startTime, self.endTime): | |
|
|
1071 | ||
|
|
1066 | if (self.dataOut.datatime < datetime.datetime.combine(self.startDate, self.startTime)) or (self.dataOut.datatime > datetime.datetime.combine(self.endDate, self.endTime)): | |
|
|
1072 | 1067 | print "[Reading] Block No. %d/%d -> %s [Skipping]" % (self.nReadBlocks, |
|
|
1073 | 1068 | self.processingHeaderObj.dataBlocksPerFile, |
|
|
1074 | 1069 | self.dataOut.datatime.ctime()) |
| @@ -1113,8 +1108,8 class JRODataReader(JRODataIO): | |||
|
|
1113 | 1108 | self.fileSizeByHeader = self.processingHeaderObj.dataBlocksPerFile * self.processingHeaderObj.blockSize + \ |
|
|
1114 | 1109 | self.firstHeaderSize + self.basicHeaderSize * \ |
|
|
1115 | 1110 | (self.processingHeaderObj.dataBlocksPerFile - 1) |
|
|
1116 | # self.dataOut.channelList = numpy.arange(self.systemHeaderObj.numChannels) | |
|
|
1117 | # self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels) | |
|
|
1111 | # self.dataOut.channelList = numpy.arange(self.systemHeaderObj.numChannels) | |
|
|
1112 | # self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels) | |
|
|
1118 | 1113 | self.getBlockDimension() |
|
|
1119 | 1114 | |
|
|
1120 | 1115 | def __verifyFile(self, filename, msgFlag=True): |
| @@ -1372,7 +1367,8 class JRODataReader(JRODataIO): | |||
|
|
1372 | 1367 | self.nTxs = nTxs |
|
|
1373 | 1368 | self.startTime = startTime |
|
|
1374 | 1369 | self.endTime = endTime |
|
|
1375 | ||
|
|
1370 | self.endDate = endDate | |
|
|
1371 | self.startDate = startDate | |
|
|
1376 | 1372 | # Added----------------- |
|
|
1377 | 1373 | self.selBlocksize = blocksize |
|
|
1378 | 1374 | self.selBlocktime = blocktime |
General Comments 0
You need to be logged in to leave comments.
Login now