From 219ed6faa79e61e5add19feeeef3d37361f7a10a 2012-11-19 20:47:26 From: Miguel Valdez Date: 2012-11-19 20:47:26 Subject: [PATCH] -Actualización del nombre de los objetos SystemHeader y RadarHeader. -Adicion del modo de lectura en linea --- diff --git a/schainpy/IO/JRODataIO.py b/schainpy/IO/JRODataIO.py index 2af18d8..0b09f69 100644 --- a/schainpy/IO/JRODataIO.py +++ b/schainpy/IO/JRODataIO.py @@ -173,9 +173,9 @@ class JRODataIO: m_BasicHeader = BasicHeader() - m_SystemHeader = SystemHeader() + systemHeaderObj = SystemHeader() - m_RadarControllerHeader = RadarControllerHeader() + radarControllerHeaderObj = RadarControllerHeader() m_ProcessingHeader = ProcessingHeader() @@ -602,14 +602,14 @@ class JRODataReader(JRODataIO): 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): @@ -632,8 +632,8 @@ class JRODataReader(JRODataIO): Affected: self.m_BasicHeader - self.m_SystemHeader - self.m_RadarControllerHeader + self.systemHeaderObj + self.radarControllerHeaderObj self.m_ProcessingHeader self.firstHeaderSize self.dataType @@ -672,11 +672,11 @@ class JRODataReader(JRODataIO): 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.channelIndexList = numpy.arange(self.m_SystemHeader.numChannels) + self.dataOutObj.channelList = numpy.arange(self.systemHeaderObj.numChannels) + self.dataOutObj.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels) self.getBlockDimension() @@ -904,8 +904,8 @@ class JRODataReader(JRODataIO): Affected: self.m_BasicHeader - self.m_SystemHeader - self.m_RadarControllerHeader + self.systemHeaderObj + self.radarControllerHeaderObj self.m_ProcessingHeader self.firstHeaderSize @@ -951,14 +951,14 @@ class JRODataReader(JRODataIO): if neededSize == 0: m_BasicHeader = BasicHeader() - m_SystemHeader = SystemHeader() - m_RadarControllerHeader = RadarControllerHeader() + systemHeaderObj = SystemHeader() + radarControllerHeaderObj = RadarControllerHeader() m_ProcessingHeader = ProcessingHeader() try: if not( m_BasicHeader.read(fp) ): raise ValueError - if not( m_SystemHeader.read(fp) ): raise ValueError - if not( m_RadarControllerHeader.read(fp) ): raise ValueError + if not( systemHeaderObj.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)) @@ -989,8 +989,8 @@ class JRODataReader(JRODataIO): 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.m_SystemHeader = self.m_SystemHeader.copy() + self.dataOutObj.radarControllerHeaderObj = self.radarControllerHeaderObj.copy() + self.dataOutObj.systemHeaderObj = self.systemHeaderObj.copy() self.dataOutObj.dataType = self.dataType self.dataOutObj.updateObjFromHeader() @@ -1068,7 +1068,7 @@ class JRODataWriter(JRODataIO): if fp == None: fp = self.fp - self.dataOutObj.m_SystemHeader.write(fp) + self.dataOutObj.systemHeaderObj.write(fp) def __wrRadarControllerHeader(self, fp=None): @@ -1081,7 +1081,7 @@ class JRODataWriter(JRODataIO): if fp == None: fp = self.fp - self.dataOutObj.m_RadarControllerHeader.write(fp) + self.dataOutObj.radarControllerHeaderObj.write(fp) def __wrProcessingHeader(self, fp=None): @@ -1215,8 +1215,8 @@ class JRODataWriter(JRODataIO): Affected: self.m_BasicHeader - self.m_SystemHeader - self.m_RadarControllerHeader + self.systemHeaderObj + self.radarControllerHeaderObj self.m_ProcessingHeader self.dataType @@ -1226,8 +1226,8 @@ class JRODataWriter(JRODataIO): self.dataOutObj.updateHeaderFromObj() self.m_BasicHeader = self.dataOutObj.m_BasicHeader.copy() - self.m_SystemHeader = self.dataOutObj.m_SystemHeader.copy() - self.m_RadarControllerHeader = self.dataOutObj.m_RadarControllerHeader.copy() + self.systemHeaderObj = self.dataOutObj.systemHeaderObj.copy() + self.radarControllerHeaderObj = self.dataOutObj.radarControllerHeaderObj.copy() self.m_ProcessingHeader = self.dataOutObj.m_ProcessingHeader.copy() self.dataType = self.dataOutObj.dataType diff --git a/schainpy/IO/SpectraIO.py b/schainpy/IO/SpectraIO.py index a1826b3..2c257f8 100644 --- a/schainpy/IO/SpectraIO.py +++ b/schainpy/IO/SpectraIO.py @@ -112,9 +112,9 @@ class SpectraReader(JRODataReader): self.m_BasicHeader = BasicHeader() - self.m_SystemHeader = SystemHeader() + self.systemHeaderObj = SystemHeader() - self.m_RadarControllerHeader = RadarControllerHeader() + self.radarControllerHeaderObj = RadarControllerHeader() self.m_ProcessingHeader = ProcessingHeader() @@ -144,7 +144,7 @@ class SpectraReader(JRODataReader): self.path = None - self.delay = 3 #seconds + self.delay = 60 #seconds self.nTries = 3 #quantity tries @@ -212,7 +212,7 @@ class SpectraReader(JRODataReader): 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 @@ -250,8 +250,8 @@ class SpectraReader(JRODataReader): 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 = dc.reshape( (self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D + dc = numpy.fromfile( self.fp, self.dataType, self.pts2read_DCchannels ) #int(self.m_ProcessingHeader.numHeights*self.systemHeaderObj.numChannels) ) + dc = dc.reshape( (self.systemHeaderObj.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D if not(self.m_ProcessingHeader.shif_fft): @@ -359,8 +359,8 @@ class SpectraWriter(JRODataWriter): Affected: self.dataOutObj self.m_BasicHeader - self.m_SystemHeader - self.m_RadarControllerHeader + self.systemHeaderObj + self.radarControllerHeaderObj self.m_ProcessingHeader Return: None @@ -411,9 +411,9 @@ class SpectraWriter(JRODataWriter): self.m_BasicHeader= BasicHeader() - self.m_SystemHeader = SystemHeader() + self.systemHeaderObj = SystemHeader() - self.m_RadarControllerHeader = RadarControllerHeader() + self.radarControllerHeaderObj = RadarControllerHeader() self.m_ProcessingHeader = ProcessingHeader() @@ -441,7 +441,7 @@ class SpectraWriter(JRODataWriter): 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) diff --git a/schainpy/IO/VoltageIO.py b/schainpy/IO/VoltageIO.py index e06d049..040b483 100644 --- a/schainpy/IO/VoltageIO.py +++ b/schainpy/IO/VoltageIO.py @@ -99,9 +99,9 @@ class VoltageReader(JRODataReader): self.m_BasicHeader = BasicHeader() - self.m_SystemHeader = SystemHeader() + self.systemHeaderObj = SystemHeader() - self.m_RadarControllerHeader = RadarControllerHeader() + self.radarControllerHeaderObj = RadarControllerHeader() self.m_ProcessingHeader = ProcessingHeader() @@ -145,7 +145,7 @@ class VoltageReader(JRODataReader): self.profileIndex = 9999 - self.delay = 3 #seconds + self.delay = 60 #seconds self.nTries = 3 #quantity tries @@ -187,7 +187,7 @@ class VoltageReader(JRODataReader): 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 @@ -218,7 +218,7 @@ class VoltageReader(JRODataReader): 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 @@ -353,9 +353,9 @@ class VoltageWriter(JRODataWriter): """ 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'))