##// END OF EJS Templates
schain
RSS
-Actualización del nombre de los objetos SystemHeader y RadarHeader....
Miguel Valdez -
r164:219ed6faa79e
parent child
Show More
Show file before | Show file after | Hide comments
@@ -173,9 +173,9 class JRODataIO:
173 173
174 174 m_BasicHeader = BasicHeader()
175 175
176 m_SystemHeader = SystemHeader()
176 systemHeaderObj = SystemHeader()
177 177
178 m_RadarControllerHeader = RadarControllerHeader()
178 radarControllerHeaderObj = RadarControllerHeader()
179 179
180 180 m_ProcessingHeader = ProcessingHeader()
181 181
@@ -602,14 +602,14 class JRODataReader(JRODataIO):
602 602 if fp == None:
603 603 fp = self.fp
604 604
605 self.m_SystemHeader.read(fp)
605 self.systemHeaderObj.read(fp)
606 606
607 607
608 608 def __rdRadarControllerHeader(self, fp=None):
609 609 if fp == None:
610 610 fp = self.fp
611 611
612 self.m_RadarControllerHeader.read(fp)
612 self.radarControllerHeaderObj.read(fp)
613 613
614 614
615 615 def __rdProcessingHeader(self, fp=None):
@@ -632,8 +632,8 class JRODataReader(JRODataIO):
632 632
633 633 Affected:
634 634 self.m_BasicHeader
635 self.m_SystemHeader
636 self.m_RadarControllerHeader
635 self.systemHeaderObj
636 self.radarControllerHeaderObj
637 637 self.m_ProcessingHeader
638 638 self.firstHeaderSize
639 639 self.dataType
@@ -672,11 +672,11 class JRODataReader(JRODataIO):
672 672 raise ValueError, 'Data type was not defined'
673 673
674 674 self.dataType = datatype_str
675 self.ippSeconds = 2 * 1000 * self.m_RadarControllerHeader.ipp / self.c
675 self.ippSeconds = 2 * 1000 * self.radarControllerHeaderObj.ipp / self.c
676 676
677 677 self.fileSizeByHeader = self.m_ProcessingHeader.dataBlocksPerFile * self.m_ProcessingHeader.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.m_ProcessingHeader.dataBlocksPerFile - 1)
678 self.dataOutObj.channelList = numpy.arange(self.m_SystemHeader.numChannels)
679 self.dataOutObj.channelIndexList = numpy.arange(self.m_SystemHeader.numChannels)
678 self.dataOutObj.channelList = numpy.arange(self.systemHeaderObj.numChannels)
679 self.dataOutObj.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
680 680
681 681 self.getBlockDimension()
682 682
@@ -904,8 +904,8 class JRODataReader(JRODataIO):
904 904
905 905 Affected:
906 906 self.m_BasicHeader
907 self.m_SystemHeader
908 self.m_RadarControllerHeader
907 self.systemHeaderObj
908 self.radarControllerHeaderObj
909 909 self.m_ProcessingHeader
910 910 self.firstHeaderSize
911 911
@@ -951,14 +951,14 class JRODataReader(JRODataIO):
951 951 if neededSize == 0:
952 952
953 953 m_BasicHeader = BasicHeader()
954 m_SystemHeader = SystemHeader()
955 m_RadarControllerHeader = RadarControllerHeader()
954 systemHeaderObj = SystemHeader()
955 radarControllerHeaderObj = RadarControllerHeader()
956 956 m_ProcessingHeader = ProcessingHeader()
957 957
958 958 try:
959 959 if not( m_BasicHeader.read(fp) ): raise ValueError
960 if not( m_SystemHeader.read(fp) ): raise ValueError
961 if not( m_RadarControllerHeader.read(fp) ): raise ValueError
960 if not( systemHeaderObj.read(fp) ): raise ValueError
961 if not( radarControllerHeaderObj.read(fp) ): raise ValueError
962 962 if not( m_ProcessingHeader.read(fp) ): raise ValueError
963 963 data_type = int(numpy.log2((m_ProcessingHeader.processFlags & PROCFLAG.DATATYPE_MASK))-numpy.log2(PROCFLAG.DATATYPE_CHAR))
964 964
@@ -989,8 +989,8 class JRODataReader(JRODataIO):
989 989
990 990 self.dataOutObj.m_BasicHeader = self.m_BasicHeader.copy()
991 991 self.dataOutObj.m_ProcessingHeader = self.m_ProcessingHeader.copy()
992 self.dataOutObj.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
993 self.dataOutObj.m_SystemHeader = self.m_SystemHeader.copy()
992 self.dataOutObj.radarControllerHeaderObj = self.radarControllerHeaderObj.copy()
993 self.dataOutObj.systemHeaderObj = self.systemHeaderObj.copy()
994 994
995 995 self.dataOutObj.dataType = self.dataType
996 996 self.dataOutObj.updateObjFromHeader()
@@ -1068,7 +1068,7 class JRODataWriter(JRODataIO):
1068 1068 if fp == None:
1069 1069 fp = self.fp
1070 1070
1071 self.dataOutObj.m_SystemHeader.write(fp)
1071 self.dataOutObj.systemHeaderObj.write(fp)
1072 1072
1073 1073
1074 1074 def __wrRadarControllerHeader(self, fp=None):
@@ -1081,7 +1081,7 class JRODataWriter(JRODataIO):
1081 1081 if fp == None:
1082 1082 fp = self.fp
1083 1083
1084 self.dataOutObj.m_RadarControllerHeader.write(fp)
1084 self.dataOutObj.radarControllerHeaderObj.write(fp)
1085 1085
1086 1086
1087 1087 def __wrProcessingHeader(self, fp=None):
@@ -1215,8 +1215,8 class JRODataWriter(JRODataIO):
1215 1215
1216 1216 Affected:
1217 1217 self.m_BasicHeader
1218 self.m_SystemHeader
1219 self.m_RadarControllerHeader
1218 self.systemHeaderObj
1219 self.radarControllerHeaderObj
1220 1220 self.m_ProcessingHeader
1221 1221 self.dataType
1222 1222
@@ -1226,8 +1226,8 class JRODataWriter(JRODataIO):
1226 1226 self.dataOutObj.updateHeaderFromObj()
1227 1227
1228 1228 self.m_BasicHeader = self.dataOutObj.m_BasicHeader.copy()
1229 self.m_SystemHeader = self.dataOutObj.m_SystemHeader.copy()
1230 self.m_RadarControllerHeader = self.dataOutObj.m_RadarControllerHeader.copy()
1229 self.systemHeaderObj = self.dataOutObj.systemHeaderObj.copy()
1230 self.radarControllerHeaderObj = self.dataOutObj.radarControllerHeaderObj.copy()
1231 1231 self.m_ProcessingHeader = self.dataOutObj.m_ProcessingHeader.copy()
1232 1232
1233 1233 self.dataType = self.dataOutObj.dataType
Show file before | Show file after | Hide comments
@@ -112,9 +112,9 class SpectraReader(JRODataReader):
112 112
113 113 self.m_BasicHeader = BasicHeader()
114 114
115 self.m_SystemHeader = SystemHeader()
115 self.systemHeaderObj = SystemHeader()
116 116
117 self.m_RadarControllerHeader = RadarControllerHeader()
117 self.radarControllerHeaderObj = RadarControllerHeader()
118 118
119 119 self.m_ProcessingHeader = ProcessingHeader()
120 120
@@ -144,7 +144,7 class SpectraReader(JRODataReader):
144 144
145 145 self.path = None
146 146
147 self.delay = 3 #seconds
147 self.delay = 60 #seconds
148 148
149 149 self.nTries = 3 #quantity tries
150 150
@@ -212,7 +212,7 class SpectraReader(JRODataReader):
212 212 self.blocksize += self.pts2read_CrossSpectra
213 213
214 214 if self.m_ProcessingHeader.flag_dc:
215 self.pts2read_DCchannels = int(self.m_SystemHeader.numChannels * self.m_ProcessingHeader.numHeights)
215 self.pts2read_DCchannels = int(self.systemHeaderObj.numChannels * self.m_ProcessingHeader.numHeights)
216 216 self.blocksize += self.pts2read_DCchannels
217 217
218 218 # self.blocksize = self.pts2read_SelfSpectra + self.pts2read_CrossSpectra + self.pts2read_DCchannels
@@ -250,8 +250,8 class SpectraReader(JRODataReader):
250 250 cspc = cspc.reshape( (self.nPairs, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D
251 251
252 252 if self.m_ProcessingHeader.flag_dc:
253 dc = numpy.fromfile( self.fp, self.dataType, self.pts2read_DCchannels ) #int(self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels) )
254 dc = dc.reshape( (self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D
253 dc = numpy.fromfile( self.fp, self.dataType, self.pts2read_DCchannels ) #int(self.m_ProcessingHeader.numHeights*self.systemHeaderObj.numChannels) )
254 dc = dc.reshape( (self.systemHeaderObj.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D
255 255
256 256
257 257 if not(self.m_ProcessingHeader.shif_fft):
@@ -359,8 +359,8 class SpectraWriter(JRODataWriter):
359 359 Affected:
360 360 self.dataOutObj
361 361 self.m_BasicHeader
362 self.m_SystemHeader
363 self.m_RadarControllerHeader
362 self.systemHeaderObj
363 self.radarControllerHeaderObj
364 364 self.m_ProcessingHeader
365 365
366 366 Return: None
@@ -411,9 +411,9 class SpectraWriter(JRODataWriter):
411 411
412 412 self.m_BasicHeader= BasicHeader()
413 413
414 self.m_SystemHeader = SystemHeader()
414 self.systemHeaderObj = SystemHeader()
415 415
416 self.m_RadarControllerHeader = RadarControllerHeader()
416 self.radarControllerHeaderObj = RadarControllerHeader()
417 417
418 418 self.m_ProcessingHeader = ProcessingHeader()
419 419
@@ -441,7 +441,7 class SpectraWriter(JRODataWriter):
441 441 self.m_ProcessingHeader.numHeights,
442 442 self.m_ProcessingHeader.profilesPerBlock)
443 443
444 self.shape_dc_Buffer = (self.m_SystemHeader.numChannels,
444 self.shape_dc_Buffer = (self.systemHeaderObj.numChannels,
445 445 self.m_ProcessingHeader.numHeights)
446 446
447 447
Show file before | Show file after | Hide comments
@@ -99,9 +99,9 class VoltageReader(JRODataReader):
99 99
100 100 self.m_BasicHeader = BasicHeader()
101 101
102 self.m_SystemHeader = SystemHeader()
102 self.systemHeaderObj = SystemHeader()
103 103
104 self.m_RadarControllerHeader = RadarControllerHeader()
104 self.radarControllerHeaderObj = RadarControllerHeader()
105 105
106 106 self.m_ProcessingHeader = ProcessingHeader()
107 107
@@ -145,7 +145,7 class VoltageReader(JRODataReader):
145 145
146 146 self.profileIndex = 9999
147 147
148 self.delay = 3 #seconds
148 self.delay = 60 #seconds
149 149
150 150 self.nTries = 3 #quantity tries
151 151
@@ -187,7 +187,7 class VoltageReader(JRODataReader):
187 187 Return:
188 188 None
189 189 """
190 pts2read = self.m_ProcessingHeader.profilesPerBlock * self.m_ProcessingHeader.numHeights * self.m_SystemHeader.numChannels
190 pts2read = self.m_ProcessingHeader.profilesPerBlock * self.m_ProcessingHeader.numHeights * self.systemHeaderObj.numChannels
191 191 self.blocksize = pts2read
192 192
193 193
@@ -218,7 +218,7 class VoltageReader(JRODataReader):
218 218 junk = numpy.fromfile( self.fp, self.dataType, self.blocksize )
219 219
220 220 try:
221 junk = junk.reshape( (self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, self.m_SystemHeader.numChannels) )
221 junk = junk.reshape( (self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, self.systemHeaderObj.numChannels) )
222 222 except:
223 223 print "The read block (%3d) has not enough data" %self.nReadBlocks
224 224 return 0
@@ -353,9 +353,9 class VoltageWriter(JRODataWriter):
353 353 """
354 354 self.shapeBuffer = (self.m_ProcessingHeader.profilesPerBlock,
355 355 self.m_ProcessingHeader.numHeights,
356 self.m_SystemHeader.numChannels )
356 self.systemHeaderObj.numChannels )
357 357
358 self.datablock = numpy.zeros((self.m_SystemHeader.numChannels,
358 self.datablock = numpy.zeros((self.systemHeaderObj.numChannels,
359 359 self.m_ProcessingHeader.profilesPerBlock,
360 360 self.m_ProcessingHeader.numHeights),
361 361 dtype=numpy.dtype('complex'))
General Comments 0
You need to be logged in to leave comments. Login now