| @@ -999,8 +999,7 class JRODataReader(JRODataIO): | |||||
| 999 | return 0 |
|
999 | return 0 | |
| 1000 |
|
1000 | |||
| 1001 | # if self.online: |
|
1001 | # if self.online: | |
| 1002 | # self.__jumpToLastBlock() |
|
1002 | # self.__jumpToLastBlock() | |
| 1003 | print 'xxxx' |
|
|||
| 1004 |
|
1003 | |||
| 1005 | if self.flagIsNewFile: |
|
1004 | if self.flagIsNewFile: | |
| 1006 | self.lastUTTime = self.basicHeaderObj.utc |
|
1005 | self.lastUTTime = self.basicHeaderObj.utc | |
| @@ -1011,8 +1010,7 class JRODataReader(JRODataIO): | |||||
| 1011 | if not(self.setNextFile()): |
|
1010 | if not(self.setNextFile()): | |
| 1012 | return 0 |
|
1011 | return 0 | |
| 1013 | else: |
|
1012 | else: | |
| 1014 | return 1 |
|
1013 | return 1 | |
| 1015 | print 'xxxx' |
|
|||
| 1016 | #if self.server is None: |
|
1014 | #if self.server is None: | |
| 1017 | currentSize = self.fileSize - self.fp.tell() |
|
1015 | currentSize = self.fileSize - self.fp.tell() | |
| 1018 | neededSize = self.processingHeaderObj.blockSize + self.basicHeaderSize |
|
1016 | neededSize = self.processingHeaderObj.blockSize + self.basicHeaderSize | |
| @@ -1044,12 +1042,11 class JRODataReader(JRODataIO): | |||||
| 1044 | def readNextBlock(self): |
|
1042 | def readNextBlock(self): | |
| 1045 |
|
1043 | |||
| 1046 | #Skip block out of startTime and endTime |
|
1044 | #Skip block out of startTime and endTime | |
| 1047 | while True: |
|
1045 | while True: | |
| 1048 | print 'cxxxx' |
|
|||
| 1049 | if not(self.__setNewBlock()): |
|
1046 | if not(self.__setNewBlock()): | |
| 1050 | print 'returning' |
|
1047 | print 'returning' | |
| 1051 | return 0 |
|
1048 | return 0 | |
| 1052 |
|
|
1049 | ||
| 1053 | if not(self.readBlock()): |
|
1050 | if not(self.readBlock()): | |
| 1054 | return 0 |
|
1051 | return 0 | |
| 1055 |
|
1052 | |||
| @@ -217,7 +217,6 class VoltageReader(JRODataReader, ProcessingUnit): | |||||
| 217 | Si un bloque leido no es un bloque valido |
|
217 | Si un bloque leido no es un bloque valido | |
| 218 | """ |
|
218 | """ | |
| 219 |
|
219 | |||
| 220 | print 'READ BLOCK' |
|
|||
| 221 | # if self.server is not None: |
|
220 | # if self.server is not None: | |
| 222 | # self.zBlock = self.receiver.recv() |
|
221 | # self.zBlock = self.receiver.recv() | |
| 223 | # self.zHeader = self.zBlock[:24] |
|
222 | # self.zHeader = self.zBlock[:24] | |
| @@ -232,7 +231,6 class VoltageReader(JRODataReader, ProcessingUnit): | |||||
| 232 |
|
231 | |||
| 233 | try: |
|
232 | try: | |
| 234 | junk = junk.reshape( (self.processingHeaderObj.profilesPerBlock, self.processingHeaderObj.nHeights, self.systemHeaderObj.nChannels) ) |
|
233 | junk = junk.reshape( (self.processingHeaderObj.profilesPerBlock, self.processingHeaderObj.nHeights, self.systemHeaderObj.nChannels) ) | |
| 235 | print'junked' |
|
|||
| 236 | except: |
|
234 | except: | |
| 237 | #print "The read block (%3d) has not enough data" %self.nReadBlocks |
|
235 | #print "The read block (%3d) has not enough data" %self.nReadBlocks | |
| 238 |
|
236 | |||
| @@ -633,9 +633,7 class Decoder(Operation): | |||||
| 633 | code_block = numpy.reshape(junk, (self.nCode*repetitions, self.nBaud)) |
|
633 | code_block = numpy.reshape(junk, (self.nCode*repetitions, self.nBaud)) | |
| 634 |
|
634 | |||
| 635 | for i in range(self.__nChannels): |
|
635 | for i in range(self.__nChannels): | |
| 636 | for j in range(self.__nProfiles): |
|
636 | for j in range(self.__nProfiles): | |
| 637 | print self.datadecTime[i,j,:].shape |
|
|||
| 638 | print numpy.correlate(data[i,j,:], code_block[j,:], mode='full')[self.nBaud-1:].shape |
|
|||
| 639 | self.datadecTime[i,j,:] = numpy.correlate(data[i,j,:], code_block[j,:], mode='full')[self.nBaud-1:] |
|
637 | self.datadecTime[i,j,:] = numpy.correlate(data[i,j,:], code_block[j,:], mode='full')[self.nBaud-1:] | |
| 640 |
|
638 | |||
| 641 | return self.datadecTime |
|
639 | return self.datadecTime | |
General Comments 0
You need to be logged in to leave comments.
Login now