| @@ -2483,7 +2483,7 class SpectraWriter(JRODataWriter): | |||
|
|
2483 | 2483 | self.getBasicHeader() |
|
|
2484 | 2484 | |
|
|
2485 | 2485 | processingHeaderSize = 40 # bytes |
|
|
2486 |
self.processingHeaderObj.dtype = |
|
|
|
2486 | self.processingHeaderObj.dtype = 1 # Spectra | |
|
|
2487 | 2487 | self.processingHeaderObj.blockSize = self.__getBlockSize() |
|
|
2488 | 2488 | self.processingHeaderObj.profilesPerBlock = self.dataOut.nFFTPoints |
|
|
2489 | 2489 | self.processingHeaderObj.dataBlocksPerFile = self.blocksPerFile |
| @@ -2509,15 +2509,16 class SpectraWriter(JRODataWriter): | |||
|
|
2509 | 2509 | sizeOfSpcComb = len(spectraComb) |
|
|
2510 | 2510 | processingHeaderSize += sizeOfSpcComb |
|
|
2511 | 2511 | |
|
|
2512 | if self.dataOut.code != None: | |
|
|
2513 | self.processingHeaderObj.code = self.dataOut.code | |
|
|
2514 |
self.processingHeaderObj. |
|
|
|
2515 |
self.processingHeaderObj.n |
|
|
|
2516 | nCodeSize = 4 # bytes | |
|
|
2517 |
n |
|
|
|
2518 |
|
|
|
|
2519 | sizeOfCode = int(nCodeSize + nBaudSize + codeSize * self.dataOut.nCode * self.dataOut.nBaud) | |
|
|
2520 | processingHeaderSize += sizeOfCode | |
|
|
2512 | # The processing header should not have information about code | |
|
|
2513 | # if self.dataOut.code != None: | |
|
|
2514 | # self.processingHeaderObj.code = self.dataOut.code | |
|
|
2515 | # self.processingHeaderObj.nCode = self.dataOut.nCode | |
|
|
2516 | # self.processingHeaderObj.nBaud = self.dataOut.nBaud | |
|
|
2517 | # nCodeSize = 4 # bytes | |
|
|
2518 | # nBaudSize = 4 # bytes | |
|
|
2519 | # codeSize = 4 # bytes | |
|
|
2520 | # sizeOfCode = int(nCodeSize + nBaudSize + codeSize * self.dataOut.nCode * self.dataOut.nBaud) | |
|
|
2521 | # processingHeaderSize += sizeOfCode | |
|
|
2521 | 2522 | |
|
|
2522 | 2523 | if self.processingHeaderObj.nWindows != 0: |
|
|
2523 | 2524 | self.processingHeaderObj.firstHeight = self.dataOut.heightList[0] |
| @@ -451,17 +451,16 class ProcessingHeader(Header): | |||
|
|
451 | 451 | spectraComb = self.spectraComb |
|
|
452 | 452 | spectraComb.tofile(fp) |
|
|
453 | 453 | |
|
|
454 | ||
|
|
455 | if self.processFlags & PROCFLAG.DEFINE_PROCESS_CODE == PROCFLAG.DEFINE_PROCESS_CODE: | |
|
|
456 | nCode = numpy.array([self.nCode], numpy.dtype('u4')) #Probar con un dato que almacene codigo, hasta el momento no se hizo la prueba | |
|
|
457 | nCode.tofile(fp) | |
|
|
458 | ||
|
|
459 | nBaud = numpy.array([self.nBaud], numpy.dtype('u4')) | |
|
|
460 | nBaud.tofile(fp) | |
|
|
461 | ||
|
|
462 | code = self.code.reshape(self.nCode*self.nBaud) | |
|
|
463 | code = code.astype(numpy.dtype('<f4')) | |
|
|
464 | code.tofile(fp) | |
|
|
454 | # if self.processFlags & PROCFLAG.DEFINE_PROCESS_CODE == PROCFLAG.DEFINE_PROCESS_CODE: | |
|
|
455 | # nCode = numpy.array([self.nCode], numpy.dtype('u4')) #Probar con un dato que almacene codigo, hasta el momento no se hizo la prueba | |
|
|
456 | # nCode.tofile(fp) | |
|
|
457 | # | |
|
|
458 | # nBaud = numpy.array([self.nBaud], numpy.dtype('u4')) | |
|
|
459 | # nBaud.tofile(fp) | |
|
|
460 | # | |
|
|
461 | # code = self.code.reshape(self.nCode*self.nBaud) | |
|
|
462 | # code = code.astype(numpy.dtype('<f4')) | |
|
|
463 | # code.tofile(fp) | |
|
|
465 | 464 | |
|
|
466 | 465 | return 1 |
|
|
467 | 466 | |
General Comments 0
You need to be logged in to leave comments.
Login now