schain-jc Commit - r979:f421d9b2ac03

writing rf data, falta metadata

Jose Chavez -

r979:f421d9b2ac03

parent child

Context file:

r979:f421d9b2ac03

Collapse all files

schainpy/model/io/jroIO_base.py 0 -4

             #         if self.online:
             #             self.__jumpToLastBlock()
-                    print 'xxxx'
                     if self.flagIsNewFile:
                         self.lastUTTime = self.basicHeaderObj.utc
                             return 0
                         else:
                             return 1
-                    print 'xxxx'
                     #if self.server is None:
                     currentSize = self.fileSize - self.fp.tell()
                     neededSize = self.processingHeaderObj.blockSize + self.basicHeaderSize
                     #Skip block out of startTime and endTime
                     while True:
-                        print 'cxxxx'
                         if not(self.__setNewBlock()):
                             print 'returning'
                             return 0
-                        print 'dxxx'
                         if not(self.readBlock()):
                             return 0

schainpy/model/io/jroIO_digitalRF.py +45 -19

@@ -1,3 +1,4
		1
1	'''	2	'''
2	Created on Jul 3, 2014	3	Created on Jul 3, 2014
3		4
@@ -6,6 +7,7 Created on Jul 3, 2014
6	import os	7	import os
7	import datetime	8	import datetime
8	import numpy	9	import numpy
		10	from fractions import Fraction
9		11
10	try:	12	try:
11	from gevent import sleep	13	from gevent import sleep
@@ -548,7 +550,7 class DigitalRFWriter(Operation):
548	Operation.__init__(self, **kwargs)	550	Operation.__init__(self, **kwargs)
549	self.dataOut = None	551	self.dataOut = None
550		552
551	def setup(self, dataIn, path, ~~blocksPerFile~~, set=0, ext='.h5'):	553	def setup(self, dataIn, path, set=0, ext='.h5'):
552	'''	554	'''
553	In this method we should set all initial parameters.	555	In this method we should set all initial parameters.
554		556
@@ -556,10 +558,36 class DigitalRFWriter(Operation):
556	dataIn : Input data will also be outputa data	558	dataIn : Input data will also be outputa data
557		559
558	'''	560	'''
559	self.dataOut = dataIn
560
561
562		561
		562	self.__ippSeconds = dataIn.ippSeconds
		563	self.__deltaH = dataIn.getDeltaH()
		564	self.__sample_rate = 1e6*0.15/self.__deltaH
		565	self.__dtype = dataIn.dtype
		566	if len(dataIn.dtype) == 2:
		567	self.__dtype = dataIn.dtype[0]
		568	self.__nSamples = dataIn.systemHeaderObj.nSamples
		569	self.__nProfiles = dataIn.nProfiles
		570	self.__blocks_per_file = dataIn.processingHeaderObj.dataBlocksPerFile
		571
		572	file_cadence_millisecs = 1.0 * self.__blocks_per_file * self.__nProfiles * self.__nSamples / self.__sample_rate * 1000
		573	sub_cadence_secs = 10 * file_cadence_millisecs
		574	sample_rate_fraction = Fraction(self.__sample_rate).limit_denominator()
		575	sample_rate_numerator = long(sample_rate_fraction.numerator)
		576	sample_rate_denominator = long(sample_rate_fraction.denominator)
		577	start_global_index = dataIn.utctime * self.__sample_rate
		578	self.arr_data = arr_data = numpy.ones((self.__nSamples, 1), dtype=[('r', self.__dtype), ('i', self.__dtype)])
		579	uuid = 'prueba'
		580	compression_level = 1
		581	checksum = False
		582	is_complex = True
		583	num_subchannels = 1
		584	is_continuous = True
		585	marching_periods = False
		586
		587	self.digitalWriteObj = digital_rf.DigitalRFWriter("/home/jchavez/jicamarca/mocked_data/voltage", self.__dtype, sub_cadence_secs,
		588	file_cadence_millisecs, start_global_index,
		589	sample_rate_numerator, sample_rate_denominator, uuid, compression_level, checksum,
		590	is_complex, num_subchannels, is_continuous, marching_periods)
563		591
564		592
565	self.isConfig = True	593	self.isConfig = True
@@ -575,26 +603,24 class DigitalRFWriter(Operation):
575	dataIn : object with the data	603	dataIn : object with the data
576		604
577	'''	605	'''
578	print dir(dataIn)	606
579	print 'blocksize', dataIn.blocksize	607	self.dataOut = dataIn
580	print 'channelIndexList', dataIn.channelIndexList
581	print 'ippSeconds', dataIn.ippSeconds
582	print 'frequency', dataIn.frequency
583	print 'nProfiles', dataIn.nProfiles
584	print 'deltaH', dataIn.getDeltaH()
585	print 'systemHeaderObj.nSamples', dataIn.systemHeaderObj.nSamples
586	nSamples = dataIn.systemHeaderObj.nSamples
587	ippSeconds = dataIn.ippSeconds
588
589	self.__samplerate = 1.0*nSamples/ippSeconds
590	# ippKm = 1e60.15self.fixed_metadata_dict['ipp']
591	# nSamples = int(ippKm / (1e6*0.15/self.__sample_rate))
592	# ippSeconds = 1.0*self.__nSamples/self.__sample_rate
593		608
594	if not self.isConfig:	609	if not self.isConfig:
595	self.setup(dataIn, path, **kwargs)	610	self.setup(dataIn, path, **kwargs)
596		611
		612	samples = len(self.dataOut.data[0])
		613
		614	for i in range(samples):
		615	self.arr_data[i]['r'] = dataIn.data[0][i].real
		616	self.arr_data[i]['i'] = dataIn.data[0][i].imag
		617
		618	if dataIn.flagNoData:
		619	self.digitalWriteObj.close()
		620
		621	self.digitalWriteObj.rf_write(self.arr_data)
597		622
		623	#raise
598	if __name__ == '__main__':	624	if __name__ == '__main__':
599		625
600	readObj = DigitalRFReader()	626	readObj = DigitalRFReader()

schainpy/model/io/jroIO_voltage.py +2 -2

                         Si un bloque leido no es un bloque valido
                     """
-                    print 'READ BLOCK'
                     # if self.server is not None:
                     #     self.zBlock = self.receiver.recv()
                     #     self.zHeader = self.zBlock[:24]
                     try:
                         junk = junk.reshape( (self.processingHeaderObj.profilesPerBlock, self.processingHeaderObj.nHeights, self.systemHeaderObj.nChannels) )
-                        print'junked'
                     except:
                         #print "The read block (%3d) has not enough data" %self.nReadBlocks
                     self.dataOut.radarControllerHeaderObj = self.radarControllerHeaderObj.copy()
+                    self.dataOut.processingHeaderObj = self.processingHeaderObj.copy()
                     if self.nTxs > 1:
                         self.dataOut.radarControllerHeaderObj.ippSeconds = self.radarControllerHeaderObj.ippSeconds/self.nTxs

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