##// END OF EJS Templates
Se modifico las condiciones de Decoder, en cada iteracion se actualiza el codigo. Se corrigieron bugs en la lectura de codigo. Se detecto que no se guarda el codigo actualizado en el header de pdata, esta pendiente su revision.
Daniel Valdez -
r464:f8fb1296f4da
parent child
Show More
@@ -2249,13 +2249,13 class SpectraReader(JRODataReader):
2249 2249
2250 2250 self.dataOut.flagDeflipData = True #asumo q la data no esta sin flip
2251 2251
2252 if self.processingHeaderObj.code != None:
2252 if self.radarControllerHeaderObj.code != None:
2253 2253
2254 self.dataOut.nCode = self.processingHeaderObj.nCode
2254 self.dataOut.nCode = self.radarControllerHeaderObj.nCode
2255 2255
2256 self.dataOut.nBaud = self.processingHeaderObj.nBaud
2256 self.dataOut.nBaud = self.radarControllerHeaderObj.nBaud
2257 2257
2258 self.dataOut.code = self.processingHeaderObj.code
2258 self.dataOut.code = self.radarControllerHeaderObj.code
2259 2259
2260 2260 self.dataOut.flagDecodeData = True
2261 2261
@@ -369,9 +369,9 class ProcessingHeader(Header):
369 369 self.deltaHeight = 0
370 370 self.samplesWin = 0
371 371 self.spectraComb = 0
372 self.nCode = None
373 self.code = None
374 self.nBaud = None
372 # self.nCode = None
373 # self.code = None
374 # self.nBaud = None
375 375 self.shif_fft = False
376 376 self.flag_dc = False
377 377 self.flag_cspc = False
@@ -654,18 +654,19 class Decoder(Operation):
654 654
655 655 def run(self, dataOut, code=None, nCode=None, nBaud=None, mode = 0):
656 656
657 if not self.__isConfig:
657 if code == None:
658 code = dataOut.code
659 else:
660 code = numpy.array(code).reshape(nCode,nBaud)
661 dataOut.code = code
662 dataOut.nCode = nCode
663 dataOut.nBaud = nBaud
664 dataOut.radarControllerHeaderObj.code = code
665 dataOut.radarControllerHeaderObj.nCode = nCode
666 dataOut.radarControllerHeaderObj.nBaud = nBaud
658 667
659 if code == None:
660 code = dataOut.code
661 else:
662 code = numpy.array(code).reshape(nCode,nBaud)
663 dataOut.code = code
664 dataOut.nCode = nCode
665 dataOut.nBaud = nBaud
666
667 if code == None:
668 return 1
668
669 if not self.__isConfig:
669 670
670 671 self.setup(code, dataOut.data.shape)
671 672 self.__isConfig = True
General Comments 0
You need to be logged in to leave comments. Login now