schain-jc Commit - r220:a4afebb9fb40

Prueba de lectura de Voltajes y obtencion de Espectros.

Miguel Valdez -

r220:a4afebb9fb40

parent child

Context file:

r220:a4afebb9fb40

Collapse all files

schainpy/model/jrodata.py +1 -1

                     datatime = []
                     datatime.append(self.utctime)
-                    datatime.append(self.utctime + 2*self.timeInterval)
+                    datatime.append(self.utctime + self.timeInterval)
                     datatime = numpy.array(datatime)

schainpy/model/jrodataIO.py +42 -39

@@ -825,7 +825,15 class JRODataReader(JRODataIO, ProcessingUnit):
825	def printTotalBlocks(self):	825	def printTotalBlocks(self):
826		826
827	print "Number of read blocks %04d" %self.nTotalBlocks	827	print "Number of read blocks %04d" %self.nTotalBlocks
828		828
		829	def printInfo(self):
		830
		831	print self.basicHeaderObj.printInfo()
		832	print self.systemHeaderObj.printInfo()
		833	print self.radarControllerHeaderObj.printInfo()
		834	print self.processingHeaderObj.printInfo()
		835
		836
829	def run(self, **kwargs):	837	def run(self, **kwargs):
830		838
831	if not(self.isConfig):	839	if not(self.isConfig):
@@ -1338,7 +1346,38 class VoltageReader(JRODataReader):
1338		1346
1339	if not( self.readNextBlock() ):	1347	if not( self.readNextBlock() ):
1340	return 0	1348	return 0
		1349
		1350	self.dataOut.dtype = self.dtype
		1351
		1352	self.dataOut.nProfiles = self.processingHeaderObj.profilesPerBlock
		1353
		1354	xf = self.processingHeaderObj.firstHeight + self.processingHeaderObj.nHeights*self.processingHeaderObj.deltaHeight
		1355
		1356	self.dataOut.heightList = numpy.arange(self.processingHeaderObj.firstHeight, xf, self.processingHeaderObj.deltaHeight)
		1357
		1358	self.dataOut.channelList = range(self.systemHeaderObj.nChannels)
		1359
		1360	self.dataOut.flagTimeBlock = self.flagTimeBlock
		1361
		1362	self.dataOut.ippSeconds = self.ippSeconds
		1363
		1364	self.dataOut.timeInterval = self.ippSeconds * self.processingHeaderObj.nCohInt
		1365
		1366	self.dataOut.nCohInt = self.processingHeaderObj.nCohInt
1341		1367
		1368	self.dataOut.flagShiftFFT = False
		1369
		1370	if self.processingHeaderObj.code != None:
		1371	self.dataOut.nCode = self.processingHeaderObj.nCode
		1372
		1373	self.dataOut.nBaud = self.processingHeaderObj.nBaud
		1374
		1375	self.dataOut.code = self.processingHeaderObj.code
		1376
		1377	self.dataOut.systemHeaderObj = self.systemHeaderObj.copy()
		1378
		1379	self.dataOut.radarControllerHeaderObj = self.radarControllerHeaderObj.copy()
		1380
1342	# self.updateDataHeader()	1381	# self.updateDataHeader()
1343		1382
1344	#data es un numpy array de 3 dmensiones (perfiles, alturas y canales)	1383	#data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
@@ -1349,53 +1388,17 class VoltageReader(JRODataReader):
1349		1388
1350	self.dataOut.data = self.datablock[:,self.profileIndex,:]	1389	self.dataOut.data = self.datablock[:,self.profileIndex,:]
1351		1390
1352	self.dataOut.dtype = self.dtype
1353
1354	# self.dataOut.nChannels = self.systemHeaderObj.nChannels
1355
1356	# self.dataOut.nHeights = self.processingHeaderObj.nHeights
1357
1358	self.dataOut.nProfiles = self.processingHeaderObj.profilesPerBlock
1359
1360	xf = self.processingHeaderObj.firstHeight + self.processingHeaderObj.nHeights*self.processingHeaderObj.deltaHeight
1361
1362	self.dataOut.heightList = numpy.arange(self.processingHeaderObj.firstHeight, xf, self.processingHeaderObj.deltaHeight)
1363
1364	self.dataOut.channelList = range(self.systemHeaderObj.nChannels)
1365
1366	# self.dataOut.channelIndexList = range(self.systemHeaderObj.nChannels)
1367
1368	self.dataOut.flagTimeBlock = self.flagTimeBlock
1369
1370	self.dataOut.utctime = self.basicHeaderObj.utc + self.basicHeaderObj.miliSecond/1000. + self.profileIndex * self.ippSeconds	1391	self.dataOut.utctime = self.basicHeaderObj.utc + self.basicHeaderObj.miliSecond/1000. + self.profileIndex * self.ippSeconds
1371		1392
1372	self.dataOut.ippSeconds = self.ippSeconds
1373
1374	self.dataOut.timeInterval = self.ippSeconds * self.processingHeaderObj.nCohInt
1375
1376	self.dataOut.nCohInt = self.processingHeaderObj.nCohInt
1377
1378	self.dataOut.flagShiftFFT = False
1379
1380	if self.processingHeaderObj.code != None:
1381	self.dataOut.nCode = self.processingHeaderObj.nCode
1382
1383	self.dataOut.nBaud = self.processingHeaderObj.nBaud
1384
1385	self.dataOut.code = self.processingHeaderObj.code
1386
1387	self.profileIndex += 1	1393	self.profileIndex += 1
1388		1394
1389	self.dataOut.systemHeaderObj = self.systemHeaderObj.copy()
1390
1391	self.dataOut.radarControllerHeaderObj = self.radarControllerHeaderObj.copy()
1392
1393	self.dataOut.flagNoData = False	1395	self.dataOut.flagNoData = False
1394		1396
1395	# print self.profileIndex, self.dataOut.utctime	1397	# print self.profileIndex, self.dataOut.utctime
1396	# if self.profileIndex == 800:	1398	# if self.profileIndex == 800:
1397	# a=1	1399	# a=1
1398		1400
		1401
1399	return self.dataOut.data	1402	return self.dataOut.data
1400		1403
1401		1404

schainpy/model/jroheaderIO.py +5 0

                 def write():
                     pass
+                def printInfo(self):
+                    for key in self.__dict__.keys():
+                        print "%s = %s" %(key, self.__dict__[key])
             class BasicHeader(Header):

schainpy/model/jroprocessing.py +1 -15

                     self.dataOut.nIncohInt = 1
                     self.dataOut.ippSeconds = self.dataIn.ippSeconds
-                    self.dataOut.timeInterval = self.dataIn.timeInterval*self.dataOut.nFFTPoints*self.dataOut.nCohInt*self.dataOut.nIncohInt
+                    self.dataOut.timeInterval = self.dataIn.timeInterval*self.dataOut.nFFTPoints*self.dataOut.nIncohInt
                 def __getFft(self):
                     """
                         self.dataOut.data_cspc
                         self.dataOut.data_dc
                         self.dataOut.heightList
-                        self.dataOut.m_BasicHeader
-                        self.dataOut.m_ProcessingHeader
-                        self.dataOut.radarControllerHeaderObj
-                        self.dataOut.systemHeaderObj
                         self.profIndex
                         self.buffer
                         self.dataOut.flagNoData
-                        self.dataOut.dtype
-                        self.dataOut.nPairs
-                        self.dataOut.nChannels
-                        self.dataOut.nProfiles
-                        self.dataOut.systemHeaderObj.numChannels
-                        self.dataOut.m_ProcessingHeader.totalSpectra
-                        self.dataOut.m_ProcessingHeader.profilesPerBlock
-                        self.dataOut.m_ProcessingHeader.numHeights
-                        self.dataOut.m_ProcessingHeader.spectraComb
-                        self.dataOut.m_ProcessingHeader.shif_fft
                     """
                     fft_volt = numpy.fft.fft(self.buffer,axis=1)
                     dc = fft_volt[:,0,:]

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