schain Commit - r164:219ed6faa79e · Jicamarca Repository

-Actualización del nombre de los objetos SystemHeader y RadarHeader....

Miguel Valdez -

r164:219ed6faa79e

parent child

Context file:

r164:219ed6faa79e

Collapse all files

schainpy/IO/JRODataIO.py +23 -23

                 m_BasicHeader = BasicHeader()
-                m_SystemHeader = SystemHeader()
+                systemHeaderObj = SystemHeader()
-                m_RadarControllerHeader = RadarControllerHeader()
+                radarControllerHeaderObj = RadarControllerHeader()
                 m_ProcessingHeader = ProcessingHeader()
                     if fp == None:
                         fp = self.fp
-                    self.m_SystemHeader.read(fp)
+                    self.systemHeaderObj.read(fp)
                 def __rdRadarControllerHeader(self, fp=None):
                     if fp == None:
                         fp = self.fp
-                    self.m_RadarControllerHeader.read(fp)
+                    self.radarControllerHeaderObj.read(fp)
                 def __rdProcessingHeader(self, fp=None):
                     Affected:
                         self.m_BasicHeader
-                        self.m_SystemHeader
+                        self.systemHeaderObj
-                        self.m_RadarControllerHeader
+                        self.radarControllerHeaderObj
                         self.m_ProcessingHeader
                         self.firstHeaderSize
                         self.dataType
                         raise ValueError, 'Data type was not defined'
                     self.dataType = datatype_str
-                    self.ippSeconds = 2 * 1000 * self.m_RadarControllerHeader.ipp / self.c
+                    self.ippSeconds = 2 * 1000 * self.radarControllerHeaderObj.ipp / self.c
                     self.fileSizeByHeader = self.m_ProcessingHeader.dataBlocksPerFile * self.m_ProcessingHeader.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.m_ProcessingHeader.dataBlocksPerFile - 1)
-                    self.dataOutObj.channelList = numpy.arange(self.m_SystemHeader.numChannels)
+                    self.dataOutObj.channelList = numpy.arange(self.systemHeaderObj.numChannels)
-                    self.dataOutObj.channelIndexList = numpy.arange(self.m_SystemHeader.numChannels)
+                    self.dataOutObj.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
                     self.getBlockDimension()
                     Affected:
                         self.m_BasicHeader
-                        self.m_SystemHeader
+                        self.systemHeaderObj
-                        self.m_RadarControllerHeader
+                        self.radarControllerHeaderObj
                         self.m_ProcessingHeader
                         self.firstHeaderSize
                     if neededSize == 0:
                         m_BasicHeader = BasicHeader()
-                        m_SystemHeader = SystemHeader()
+                        systemHeaderObj = SystemHeader()
-                        m_RadarControllerHeader = RadarControllerHeader()
+                        radarControllerHeaderObj = RadarControllerHeader()
                         m_ProcessingHeader = ProcessingHeader()
                         try:
                             if not( m_BasicHeader.read(fp) ): raise ValueError
-                            if not( m_SystemHeader.read(fp) ): raise ValueError
+                            if not( systemHeaderObj.read(fp) ): raise ValueError
-                            if not( m_RadarControllerHeader.read(fp) ): raise ValueError
+                            if not( radarControllerHeaderObj.read(fp) ): raise ValueError
                             if not( m_ProcessingHeader.read(fp) ): raise ValueError
                             data_type = int(numpy.log2((m_ProcessingHeader.processFlags & PROCFLAG.DATATYPE_MASK))-numpy.log2(PROCFLAG.DATATYPE_CHAR))
                     self.dataOutObj.m_BasicHeader = self.m_BasicHeader.copy()
                     self.dataOutObj.m_ProcessingHeader = self.m_ProcessingHeader.copy()
-                    self.dataOutObj.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
+                    self.dataOutObj.radarControllerHeaderObj = self.radarControllerHeaderObj.copy()
-                    self.dataOutObj.m_SystemHeader = self.m_SystemHeader.copy()
+                    self.dataOutObj.systemHeaderObj = self.systemHeaderObj.copy()
                     self.dataOutObj.dataType = self.dataType
                     self.dataOutObj.updateObjFromHeader()
                     if fp == None:
                         fp = self.fp
-                    self.dataOutObj.m_SystemHeader.write(fp)
+                    self.dataOutObj.systemHeaderObj.write(fp)
                 def __wrRadarControllerHeader(self, fp=None):
                     if fp == None:
                         fp = self.fp
-                    self.dataOutObj.m_RadarControllerHeader.write(fp)
+                    self.dataOutObj.radarControllerHeaderObj.write(fp)
                 def __wrProcessingHeader(self, fp=None):
                     Affected:
                         self.m_BasicHeader
-                        self.m_SystemHeader
+                        self.systemHeaderObj
-                        self.m_RadarControllerHeader
+                        self.radarControllerHeaderObj
                         self.m_ProcessingHeader
                         self.dataType
                     self.dataOutObj.updateHeaderFromObj()
                     self.m_BasicHeader = self.dataOutObj.m_BasicHeader.copy()
-                    self.m_SystemHeader = self.dataOutObj.m_SystemHeader.copy()
+                    self.systemHeaderObj = self.dataOutObj.systemHeaderObj.copy()
-                    self.m_RadarControllerHeader = self.dataOutObj.m_RadarControllerHeader.copy()
+                    self.radarControllerHeaderObj = self.dataOutObj.radarControllerHeaderObj.copy()
                     self.m_ProcessingHeader = self.dataOutObj.m_ProcessingHeader.copy()
                     self.dataType = self.dataOutObj.dataType

schainpy/IO/SpectraIO.py +11 -11

                     self.m_BasicHeader = BasicHeader()
-                    self.m_SystemHeader = SystemHeader()
+                    self.systemHeaderObj = SystemHeader()
-                    self.m_RadarControllerHeader = RadarControllerHeader()
+                    self.radarControllerHeaderObj = RadarControllerHeader()
                     self.m_ProcessingHeader = ProcessingHeader()
                     self.path = None
-                    self.delay  = 3  #seconds
+                    self.delay  = 60  #seconds
                     self.nTries = 3  #quantity tries
                         self.blocksize += self.pts2read_CrossSpectra
                     if self.m_ProcessingHeader.flag_dc:
-                        self.pts2read_DCchannels = int(self.m_SystemHeader.numChannels * self.m_ProcessingHeader.numHeights)
+                        self.pts2read_DCchannels = int(self.systemHeaderObj.numChannels * self.m_ProcessingHeader.numHeights)
                         self.blocksize += self.pts2read_DCchannels
             #        self.blocksize = self.pts2read_SelfSpectra + self.pts2read_CrossSpectra + self.pts2read_DCchannels
                         cspc = cspc.reshape( (self.nPairs, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D
                     if self.m_ProcessingHeader.flag_dc:
-                        dc = numpy.fromfile( self.fp, self.dataType, self.pts2read_DCchannels ) #int(self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels) )
+                        dc = numpy.fromfile( self.fp, self.dataType, self.pts2read_DCchannels ) #int(self.m_ProcessingHeader.numHeights*self.systemHeaderObj.numChannels) )
-                        dc = dc.reshape( (self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D
+                        dc = dc.reshape( (self.systemHeaderObj.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D
                     if not(self.m_ProcessingHeader.shif_fft):
                     Affected:
                         self.dataOutObj
                         self.m_BasicHeader
-                        self.m_SystemHeader
+                        self.systemHeaderObj
-                        self.m_RadarControllerHeader
+                        self.radarControllerHeaderObj
                         self.m_ProcessingHeader
                     Return: None
                     self.m_BasicHeader= BasicHeader()
-                    self.m_SystemHeader = SystemHeader()
+                    self.systemHeaderObj = SystemHeader()
-                    self.m_RadarControllerHeader = RadarControllerHeader()
+                    self.radarControllerHeaderObj = RadarControllerHeader()
                     self.m_ProcessingHeader = ProcessingHeader()
                                               self.m_ProcessingHeader.numHeights,
                                               self.m_ProcessingHeader.profilesPerBlock)
-                    self.shape_dc_Buffer = (self.m_SystemHeader.numChannels,
+                    self.shape_dc_Buffer = (self.systemHeaderObj.numChannels,
                                             self.m_ProcessingHeader.numHeights)

schainpy/IO/VoltageIO.py +7 -7

                     self.m_BasicHeader = BasicHeader()
-                    self.m_SystemHeader = SystemHeader()
+                    self.systemHeaderObj = SystemHeader()
-                    self.m_RadarControllerHeader = RadarControllerHeader()
+                    self.radarControllerHeaderObj = RadarControllerHeader()
                     self.m_ProcessingHeader = ProcessingHeader()
                     self.profileIndex = 9999
-                    self.delay  = 3   #seconds
+                    self.delay  = 60   #seconds
                     self.nTries  = 3  #quantity tries
                     Return:
                         None
                     """
-                    pts2read = self.m_ProcessingHeader.profilesPerBlock * self.m_ProcessingHeader.numHeights * self.m_SystemHeader.numChannels
+                    pts2read = self.m_ProcessingHeader.profilesPerBlock * self.m_ProcessingHeader.numHeights * self.systemHeaderObj.numChannels
                     self.blocksize = pts2read
                     junk = numpy.fromfile( self.fp, self.dataType, self.blocksize )
                     try:
-                        junk = junk.reshape( (self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, self.m_SystemHeader.numChannels) )
+                        junk = junk.reshape( (self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, self.systemHeaderObj.numChannels) )
                     except:
                         print "The read block (%3d) has not enough data" %self.nReadBlocks
                         return 0
                     """
                     self.shapeBuffer = (self.m_ProcessingHeader.profilesPerBlock,
                                         self.m_ProcessingHeader.numHeights,
-                                        self.m_SystemHeader.numChannels )
+                                        self.systemHeaderObj.numChannels )
-                    self.datablock = numpy.zeros((self.m_SystemHeader.numChannels,
+                    self.datablock = numpy.zeros((self.systemHeaderObj.numChannels,
                                                  self.m_ProcessingHeader.profilesPerBlock,
                                                  self.m_ProcessingHeader.numHeights),
                                                  dtype=numpy.dtype('complex'))

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