schain Commit - r125:f2f0f92e6f2a · Jicamarca Repository

avance de Escritura de Pdata, faltan probar con mas experimentos.

Daniel Valdez -

r125:f2f0f92e6f2a

parent child

Context file:

r125:f2f0f92e6f2a

Collapse all files

schainpy2/IO/JROHeader.py +1 -1

                     if self.processFlags & PROCFLAG.DEFINE_PROCESS_CODE == PROCFLAG.DEFINE_PROCESS_CODE:
-                        nCode = self.nCode
+                        nCode = self.nCode #Probar con un dato que almacene codigo, hasta el momento no se hizo la prueba
                         nCode.tofile(fp)
                         nBaud = self.nBaud

schainpy2/IO/SpectraIO.py +37 -10

             #
             #            self.nWrPairs = len(pairList)
-                    self.wrPairList = self.dataOutObj.pairList
+                    self.wrPairList = self.dataOutObj.pairsList
                     self.nWrPairs = self.dataOutObj.nPairs
                                               self.processingHeaderObj.nHeights,
                                               self.processingHeaderObj.profilesPerBlock)
-                    self.shape_dc_Buffer = (self.systemHeaderObj.nChannels,
+                    self.shape_dc_Buffer = (self.dataOutObj.nChannels,
                                             self.processingHeaderObj.nHeights)
                         self.data_dc.fill(0)
                         self.setNextFile()
+                    if self.flagIsNewFile == 0:
+                        self.getBasicHeader()
                     self.data_spc = self.dataOutObj.data_spc
                     self.data_cspc = self.dataOutObj.data_cspc
                     self.data_dc = self.dataOutObj.data_dc
                     # #self.processingHeaderObj.dataBlocksPerFile)
                     if self.hasAllDataInBuffer():
-                        self.getDataHeader()
+            #            self.getDataHeader()
                         self.writeNextBlock()
                     if self.flagNoMoreFiles:
                     """
                     self.systemHeaderObj = self.dataOutObj.systemHeaderObj.copy()
+                    self.systemHeaderObj.nChannels = self.dataOutObj.nChannels
                     self.radarControllerHeaderObj = self.dataOutObj.radarControllerHeaderObj.copy()
                     self.getBasicHeader()
                     processingHeaderSize = 40 # bytes
                     self.processingHeaderObj.dtype = 0 # Voltage
                     self.processingHeaderObj.blockSize = self.__getBlockSize()
-                    self.processingHeaderObj.profilesPerBlock = self.profilesPerBlock
+                    self.processingHeaderObj.profilesPerBlock = self.dataOutObj.nFFTPoints
                     self.processingHeaderObj.dataBlocksPerFile = self.blocksPerFile
                     self.processingHeaderObj.nWindows = 1 #podria ser 1 o self.dataOutObj.processingHeaderObj.nWindows
                     self.processingHeaderObj.processFlags = self.__getProcessFlags()
-                    self.processingHeaderObj.nCohInt = self.dataOutObj.nCohInt
+                    self.processingHeaderObj.nCohInt = 1# Cuando la data de origen es de tipo Spectra
-                    self.processingHeaderObj.nIncohInt = 1 # Cuando la data de origen es de tipo Voltage
+                    self.processingHeaderObj.nIncohInt = self.dataOutObj.nIncohInt
-                    self.processingHeaderObj.totalSpectra = 0 # Cuando la data de origen es de tipo Voltage
+                    self.processingHeaderObj.totalSpectra = self.dataOutObj.nPairs + self.dataOutObj.nChannels
+                    if self.processingHeaderObj.totalSpectra > 0:
+                        channelList = []
+                        for channel in range(self.dataOutObj.nChannels):
+                            channelList.append(channel)
+                            channelList.append(channel)
+                        pairsList = []
+                        for pair in self.dataOutObj.pairsList:
+                            pairsList.append(pair[0])
+                            pairsList.append(pair[1])
+                        spectraComb = channelList + pairsList
+                        spectraComb = numpy.array(spectraComb,dtype="u1")
+                        self.processingHeaderObj.spectraComb = spectraComb
+                        sizeOfSpcComb = len(spectraComb)
+                        processingHeaderSize += sizeOfSpcComb
                     if self.dataOutObj.code != None:
                         self.processingHeaderObj.code = self.dataOutObj.code
                         self.processingHeaderObj.nCode = self.dataOutObj.nCode
                         self.processingHeaderObj.nBaud = self.dataOutObj.nBaud
-                        codesize = int(8 + 4 * self.dataOutObj.nCode * self.dataOutObj.nBaud)
+                        nCodeSize = 4 # bytes
-                        processingHeaderSize += codesize
+                        nBaudSize = 4 # bytes
+                        codeSize = 4 # bytes
+                        sizeOfCode = int(nCodeSize + nBaudSize + codeSize * self.dataOutObj.nCode * self.dataOutObj.nBaud)
+                        processingHeaderSize += sizeOfCode
                     if self.processingHeaderObj.nWindows != 0:
                         self.processingHeaderObj.firstHeight = self.dataOutObj.heightList[0]
                         self.processingHeaderObj.deltaHeight = self.dataOutObj.heightList[1] - self.dataOutObj.heightList[0]
                         self.processingHeaderObj.nHeights = self.dataOutObj.nHeights
                         self.processingHeaderObj.samplesWin = self.dataOutObj.nHeights
-                        processingHeaderSize += 12
+                        sizeOfFirstHeight = 4
+                        sizeOfdeltaHeight = 4
+                        sizeOfnHeights = 4
+                        sizeOfWindows = (sizeOfFirstHeight + sizeOfdeltaHeight + sizeOfnHeights)*self.processingHeaderObj.nWindows
+                        processingHeaderSize += sizeOfWindows
                     self.processingHeaderObj.size = processingHeaderSize

schainpy2/IO/VoltageIO.py +1 0

                     """
                     self.systemHeaderObj = self.dataOutObj.systemHeaderObj.copy()
+                    self.systemHeaderObj.nChannels = self.dataOutObj.nChannels
                     self.radarControllerHeaderObj = self.dataOutObj.radarControllerHeaderObj.copy()
                     self.getBasicHeader()

schainpy2/Processing/SpectraProcessor.py +1 -1

             #        self.getNoise()
                 def addWriter(self, wrpath, profilesPerBlock, blocksPerFile):
-                    objWriter = SpectraWriter(self.dataOutObj, pairList)
+                    objWriter = SpectraWriter(self.dataOutObj)
                     objWriter.setup(wrpath, profilesPerBlock, blocksPerFile)
                     self.writerObjList.append(objWriter)

schainpy2/testSchainSpecExp.py +1 -1

                     # paramatros para Escritura de Pdata
                     self.wrpath = "/Users/danielangelsuarezmunoz/Data/testWR_pdata"
-                    self.profilesPerBlock = 16
+                    self.profilesPerBlock = 8
                     self.blocksPerFile = 5
             #        self.pairList = [(0,1),(0,2)]

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages