schain-jc Commit - r23:7fedb37b4f03 · Jicamarca Repository

Optimización del modulo de escritura de voltajes.

Miguel Valdez -

r23:7fedb37b4f03

parent child

Context file:

r23:7fedb37b4f03

Collapse all files

schainpy/IO/VoltageIO.py +58 -42

                     self.idProfile = 0
-                    self.__buffer = 0
+                    self.__buffer = None
                     self.__buffer_id = 9999
                     self.filenameList = filenameList
                     self.online = online
+                    return 1
                 def readNextBlock(self):
                     """
                     readNextBlock establece un nuevo bloque de datos a leer y los lee, si es que no existiese
                     self.flagResetProcessing = 0
                     self.flagIsNewBlock = 0
                     if self.__hasNotDataInBuffer():
                         self.readNextBlock()
+                        self.m_Voltage.m_BasicHeader = self.m_BasicHeader.copy()
+                        self.m_Voltage.m_ProcessingHeader = self.m_ProcessingHeader.copy()
+                        self.m_Voltage.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
+                        self.m_Voltage.m_SystemHeader = self.m_SystemHeader.copy()
+                        self.m_Voltage.heights = self.__heights
+                        self.m_Voltage.dataType = self.__dataType
                     if self.noMoreFiles == 1:
                         print 'Process finished'
                         return None
                     #data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
-                    data = self.__buffer[self.__buffer_id,:,:]
                     time = self.m_BasicHeader.utc + self.__buffer_id*self.__ippSeconds
+                    self.m_Voltage.m_BasicHeader.utc = time
-                    self.m_Voltage.m_BasicHeader = self.m_BasicHeader.copy()
+                    self.m_Voltage.data = self.__buffer[self.__buffer_id,:,:]
-                    self.m_Voltage.m_ProcessingHeader = self.m_ProcessingHeader.copy()
-                    self.m_Voltage.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
-                    self.m_Voltage.m_SystemHeader = self.m_SystemHeader.copy()
-                    self.m_Voltage.m_BasicHeader.utc = time
-                    self.m_Voltage.data = data
                     self.m_Voltage.flagNoData = False
                     self.m_Voltage.flagResetProcessing = self.flagResetProcessing
-                    self.m_Voltage.heights = self.__heights
                     self.m_Voltage.idProfile = self.idProfile
-                    self.m_Voltage.dataType = self.__dataType
                     self.__buffer_id += 1
                     self.idProfile += 1
                     #call setData - to Data Object
-                    return data
+                    return 1
             class VoltageWriter(DataWriter):
                 __configHeaderFile = 'wrSetHeadet.txt'
                     self.__flagIsNewFile = 1
-                    self.__buffer = 0
+                    self.__buffer = None
                     self.__buffer_id = 0
                     self.__ext = None
+                    self.__shapeBuffer = None
                     self.nWriteBlocks = 0
                     self.flagIsNewBlock = 0
                     return 1
                 def __setNewBlock(self):
                     if self.__fp == None:
-                        return 0
+                        self.__setNextFile()
                     if self.__flagIsNewFile:
                         return 1
                     return 1
                 def __writeBlock(self):
-                    self.__buffer.tofile(self.__fp)
-                    self.__buffer = numpy.array([],self.__dataType)
+                    data = numpy.zeros(self.__shapeBuffer, self.__dataType)
+                    data['real'] = self.__buffer.real
+                    data['imag'] = self.__buffer.imag
+                    data = data.reshape((-1))
+                    data.tofile(self.__fp)
+                    self.__buffer.fill(0)
                     self.__buffer_id = 0
                     return 0
                 def putData(self):
                     self.flagIsNewBlock = 0
                     if self.m_Voltage.flagNoData:
-                        return None
+                        return 0
                     if self.m_Voltage.flagResetProcessing:
-                        self.__buffer = numpy.array([],self.__dataType)
+                        self.__buffer.fill(0)
                         self.__buffer_id = 0
                         self.__setNextFile()
-                    self.__setHeaderByObj()
+                    self.__buffer[self.__buffer_id,:,:] = self.m_Voltage.data
-                    shape =  self.m_Voltage.data.shape
-                    data = numpy.zeros(shape,self.__dataType)
-                    data['real'] = self.m_Voltage.data.real
-                    data['imag'] = self.m_Voltage.data.imag
-                    data = data.reshape((-1))
-                    self.__buffer = numpy.hstack((self.__buffer,data))
                     self.__buffer_id += 1
                     if self.__hasAllDataInBuffer():
+                        self.__getHeader()
                         self.writeNextBlock()
                     if self.noMoreFiles:
-                        print 'Process finished'
+                        #print 'Process finished'
-                        return None
+                        return 0
                     return 1
-                def __setHeaderByObj(self):
+                def __getHeader(self):
                     self.m_BasicHeader = self.m_Voltage.m_BasicHeader.copy()
                     self.m_SystemHeader = self.m_Voltage.m_SystemHeader.copy()
                     self.m_RadarControllerHeader = self.m_Voltage.m_RadarControllerHeader.copy()
                         print "file access denied:%s"%fileTable
                         sys.exit(0)
-                def setup(self,path,set=0,format='rawdata'):
+                def setup(self, path, set=0, format='rawdata'):
                     if format == 'hdf5':
                     #call to config_headers
                     #self.__setHeaderByFile()
-                    self.__setHeaderByObj()
                     self.__path = path
                     self.__setFile = set - 1
                     self.__ext = ext
                     self.__format = format
-                    self.__buffer = numpy.array([],self.__dataType)
-                    if not(self.__setNextFile()):
+                    self.__getHeader()
-                        return 0
+                    self.__shapeBuffer =  (self.m_ProcessingHeader.profilesPerBlock,
+                                           self.m_ProcessingHeader.numHeights,
+                                           self.m_SystemHeader.numChannels )
+                    self.__buffer = numpy.zeros(self.__shapeBuffer, numpy.dtype('complex'))
+            #        if not(self.__setNextFile()):
+            #            return 0
+                    return 1
   No newline at end of file

schainpy/TestSChain.py +26 -11

             import time, datetime
             from Model.Voltage import Voltage
-            from IO.VoltageIO import VoltageReader
+            from IO.VoltageIO import *
             from Graphics.VoltagePlot import Osciloscope
             class TestSChain():
                     self.path = '/home/roj-idl71/Data/RAWDATA/DP_Faraday/'
                     self.path = '/Users/danielangelsuarezmunoz/Documents/Projects/testWR'
+                    self.path = '/home/roj-idl71/Data/RAWDATA/IMAGING'
+                    self.path = '/home/roj-idl71/tmp/data'
                     #self.path = '/remote/puma/2004_11/DVD/'
+                    self.ppath = "/home/roj-idl71/tmp/data"
                     self.startDateTime = datetime.datetime(2004,5,1,17,49,0)
                     self.endDateTime = datetime.datetime(2012,5,1,18,10,0)
                     self.voltageObj = Voltage()
                     self.readerObj = VoltageReader(self.voltageObj)
                     self.plotObj = Osciloscope(self.voltageObj)
+                    self.writerObj = VoltageWriter(self.voltageObj)
-                    self.readerObj.setup(self.path, self.startDateTime, self.endDateTime)
+                    if not(self.readerObj.setup(self.path, self.startDateTime, self.endDateTime)):
+                        sys.exit(0)
+                    if not(self.writerObj.setup(self.ppath)):
+                        sys.exit(0)
                 def testSChain(self):
+                    ini = time.time()
                     while(True):
                         self.readerObj.getData()
                         self.plotObj.plotData(idProfile = 1, type='iq', ymin = -100, ymax = 100)
-                        if self.readerObj.flagResetProcessing:
+            #            self.writerObj.putData()
-                            print 'jump'
-            #            if self.readerObj.flagIsNewBlock:
-            #                print 'Block No %04d, Time: %s'%(self.readerObj.nReadBlocks,
-            #                                                 datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc))
                         if self.readerObj.noMoreFiles:
                             break
+                        if self.readerObj.flagIsNewBlock:
+                            print 'Block No %04d, Time: %s' %(self.readerObj.nReadBlocks,
+                                                              datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc),)
+                            fin = time.time()
+                            print 'Tiempo de un bloque leido y escrito: [%6.5f]' %(fin - ini)
+                            ini = time.time()
                     self.plotObj.end()
             if __name__ == '__main__':

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