From 99678d91f38e4dccece978bada8ab4a57bc83180 2013-02-07 13:33:29 From: Miguel Valdez Date: 2013-02-07 13:33:29 Subject: [PATCH] Se esta obviando el guardado del codigo en el header de procesamiento Bug: Se cambio el tipo de datatype = 0, a datatype=1 para datos del tipo Spectra --- diff --git a/schainpy/model/jrodataIO.py b/schainpy/model/jrodataIO.py index 22d7776..ae1c6bb 100644 --- a/schainpy/model/jrodataIO.py +++ b/schainpy/model/jrodataIO.py @@ -2483,7 +2483,7 @@ class SpectraWriter(JRODataWriter): self.getBasicHeader() processingHeaderSize = 40 # bytes - self.processingHeaderObj.dtype = 0 # Voltage + self.processingHeaderObj.dtype = 1 # Spectra self.processingHeaderObj.blockSize = self.__getBlockSize() self.processingHeaderObj.profilesPerBlock = self.dataOut.nFFTPoints self.processingHeaderObj.dataBlocksPerFile = self.blocksPerFile @@ -2508,16 +2508,17 @@ class SpectraWriter(JRODataWriter): self.processingHeaderObj.spectraComb = spectraComb sizeOfSpcComb = len(spectraComb) processingHeaderSize += sizeOfSpcComb - - if self.dataOut.code != None: - self.processingHeaderObj.code = self.dataOut.code - self.processingHeaderObj.nCode = self.dataOut.nCode - self.processingHeaderObj.nBaud = self.dataOut.nBaud - nCodeSize = 4 # bytes - nBaudSize = 4 # bytes - codeSize = 4 # bytes - sizeOfCode = int(nCodeSize + nBaudSize + codeSize * self.dataOut.nCode * self.dataOut.nBaud) - processingHeaderSize += sizeOfCode + +# The processing header should not have information about code +# if self.dataOut.code != None: +# self.processingHeaderObj.code = self.dataOut.code +# self.processingHeaderObj.nCode = self.dataOut.nCode +# self.processingHeaderObj.nBaud = self.dataOut.nBaud +# nCodeSize = 4 # bytes +# nBaudSize = 4 # bytes +# codeSize = 4 # bytes +# sizeOfCode = int(nCodeSize + nBaudSize + codeSize * self.dataOut.nCode * self.dataOut.nBaud) +# processingHeaderSize += sizeOfCode if self.processingHeaderObj.nWindows != 0: self.processingHeaderObj.firstHeight = self.dataOut.heightList[0] diff --git a/schainpy/model/jroheaderIO.py b/schainpy/model/jroheaderIO.py index 462dca6..16d8d12 100644 --- a/schainpy/model/jroheaderIO.py +++ b/schainpy/model/jroheaderIO.py @@ -450,18 +450,17 @@ class ProcessingHeader(Header): spectraComb = numpy.array([],numpy.dtype('u1')) spectraComb = self.spectraComb spectraComb.tofile(fp) - - - if self.processFlags & PROCFLAG.DEFINE_PROCESS_CODE == PROCFLAG.DEFINE_PROCESS_CODE: - nCode = numpy.array([self.nCode], numpy.dtype('u4')) #Probar con un dato que almacene codigo, hasta el momento no se hizo la prueba - nCode.tofile(fp) - - nBaud = numpy.array([self.nBaud], numpy.dtype('u4')) - nBaud.tofile(fp) - - code = self.code.reshape(self.nCode*self.nBaud) - code = code.astype(numpy.dtype('