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