schain-jc Commit - r963:4617926e8b88

pruebas jrovoltage

José Chávez -

r963:4617926e8b88

parent child

Context file:

r963:4617926e8b88

Collapse all files

schainpy/controller.py +8 -5

                     self.id = str(new_id)
                 def setup(self, id, name, value, format='str'):
                     self.id = str(id)
                     self.name = name
                     if format == 'obj':
                     return self.ELEMENTNAME
-                def setup(self, id, name, datatype, path, startDate="", endDate="", startTime="", endTime="", parentId=None, queue=None, **kwargs):
+                def setup(self, id, name, datatype, path='', startDate="", endDate="", startTime="",
+                          endTime="", parentId=None, queue=None, server=None, **kwargs):
                     #Compatible with old signal chain version
                     if datatype==None and name==None:
                             name = datatype
                         else:
                             name = '%sReader' %(datatype)
                     if datatype==None:
                         datatype = name.replace('Reader','')
                     self.id = id
                     self.name = name
                     self.datatype = datatype
+                    if path != '':
                         self.path = os.path.abspath(path)
                     self.startDate = startDate
                     self.endDate = endDate
                     self.inputId = '0'
                     self.parentId = parentId
                     self.queue = queue
+                    self.server = server
                     self.addRunOperation(**kwargs)
                 def update(self, datatype, path, startDate, endDate, startTime, endTime, parentId=None, name=None, **kwargs):
                     opObj = self.addOperation(name = 'run', optype = 'self')
+                    if self.server is None:
                         opObj.addParameter(name='datatype' , value=self.datatype, format='str')
                         opObj.addParameter(name='path'     , value=self.path, format='str')
                         opObj.addParameter(name='startDate' , value=self.startDate, format='date')
                         opObj.addParameter(name='startTime' , value=self.startTime, format='time')
                         opObj.addParameter(name='endTime'   , value=self.endTime, format='time')
                         opObj.addParameter(name='queue'   , value=self.queue, format='obj')
                         for key, value in kwargs.items():
                             opObj.addParameter(name=key, value=value, format=type(value).__name__)
+                    else:
+                        opObj.addParameter(name='server' , value=self.server, format='str')
                     return opObj

schainpy/model/data/jroheaderIO.py +5 -2

                 dstFlag = None
                 errorCount = None
                 datatime = None
                 __LOCALTIME = None
                 def __init__(self, useLocalTime=True):
                 def read(self, fp):
                     try:
+                        if hasattr(fp, 'read'):
+                            print 'fromfile'
                             header = numpy.fromfile(fp, BASIC_STRUCTURE,1)
+                        else:
+                            print 'fromstring'
+                            header = numpy.fromstring(fp, BASIC_STRUCTURE,1)
                     except Exception, e:
                         print "BasicHeader: "
                         print e

schainpy/model/io/jroIO_base.py +19 -15

             import inspect
             import time, datetime
             import traceback
+            import zmq
             try:
                 from gevent import sleep
                     self.__isFirstTimeOnline = 0
                 def __setNewBlock(self):
+                    if self.server is None:
                         if self.fp == None:
                             return 0
             #         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
                         if (currentSize >= neededSize):
                             self.basicHeaderObj.read(self.fp)
                             self.lastUTTime = self.basicHeaderObj.utc
                             return 1
+                    else:
+                        self.basicHeaderObj.read(self.zHeader)
+                        self.lastUTTime = self.basicHeaderObj.utc
+                        return 1
                     if self.__waitNewBlock():
                         self.lastUTTime = self.basicHeaderObj.utc
                         return 1
+                    if self.server is None:
                         if not(self.setNextFile()):
                             return 0
                     #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
                             warnings=True,
                             verbose=True,
                             server=None):
                     if server is not None:
-                        server = kwargs.get('server', 'zmq.pipe')
                         if 'tcp://' in server:
                             address = server
                         else:
                             address = 'ipc:///tmp/%s' % server
-                        self.address = address
+                        self.server = address
                         self.context = zmq.Context()
                         self.receiver = self.context.socket(zmq.PULL)
-                        self.receiver.bind(self.address)
+                        self.receiver.bind(self.server)
                         time.sleep(0.5)
-                        print '[Starting] ReceiverData from {}'.format(self.address)
+                        print '[Starting] ReceiverData from {}'.format(self.server)
                     else:
+                        self.server = None
                         if path == None:
                             raise ValueError, "[Reading] The path is not valid"
                                     skip=skip,
                                     cursor=cursor,
                                     warnings=warnings,
-                                    server=None,
+                                    server=server,
                                     verbose=verbose)
                         self.isConfig = True
-                    if self.server is None:
+                    print 'hola'
                     self.getData()
-                    else:
-                        self.getFromZMQ()
             class JRODataWriter(JRODataIO):

schainpy/model/io/jroIO_voltage.py +17 -10

                     self.blocksize = pts2read
                 def readBlock(self):
                     """
                     readBlock lee el bloque de datos desde la posicion actual del puntero del archivo
                     Exceptions:
                         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]
+                        self.zDataBlock = self.zBlock[24:]
+                        junk = numpy.fromstring(self.zDataBlock, numpy.dtype([('real','<i4'),('imag','<i4')]))
+                        self.processingHeaderObj.profilesPerBlock = 240
+                        self.processingHeaderObj.nHeights = 248
+                        self.systemHeaderObj.nChannels
+                    else:
                         current_pointer_location = self.fp.tell()
                         junk = numpy.fromfile( self.fp, self.dtype, self.blocksize )
                     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
                     return
-                def getFromZMQ(self):
-                    self.dataOut = self.receiver.recv_pyobj()
-                    print '[Receiving] {} - {}'.format(self.dataOut.type,
-                                                       self.dataOut.datatime.ctime())
                 def getData(self):
                     """
                     getData obtiene una unidad de datos del buffer de lectura, un perfil,  y la copia al objeto self.dataOut
                         self.flagDiscontinuousBlock
                         self.flagIsNewBlock
                     """
+                    print 1
                     if self.flagNoMoreFiles:
                         self.dataOut.flagNoData = True
                         print 'Process finished'
                         return 0
+                    print 2
                     self.flagDiscontinuousBlock = 0
                     self.flagIsNewBlock = 0
+                    print 3
                     if self.__hasNotDataInBuffer():
                         if not( self.readNextBlock() ):
                         self.getFirstHeader()
                         self.reshapeData()
+                    print 4
                     if self.datablock is None:
                         self.dataOut.flagNoData = True
                         return 0

schainpy/scripts/schain.xml +1 -1

	@@ -1,1 +1,1
	1	<Project description="HF_EXAMPLE" id="191" name="test01"><ReadUnit datatype="Spectra" id="1911" inputId="0" name="SpectraReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="SpectraReader" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/data/sp1_f0" /><Parameter format="date" id="191113" name="startDate" value="2017/01/28" /><Parameter format="date" id="191114" name="endDate" value="2017/01/28" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="cursor" value="5" /><Parameter format="int" id="191119" name="skip" value="177" /><Parameter format="int" id="191120" name="walk" value="1" /><Parameter format="int" id="191121" name="verbose" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="Parameters" id="1913" inputId="1911" name="ParametersProc"><Operation id="19131" name="run" priority="1" type="self" /><Operation id="19132" name="SpectralMoments" priority="2" type="other" /><Operation id="19133" name="PublishData" priority="3" type="other"><Parameter format="int" id="191331" name="zeromq" value="1" /><Parameter format="bool" id="191332" name="verbose" value="0" /><Parameter format="int" id="191333" name="delay" value="0" /></Operation></ProcUnit><ProcUnit datatype="Spectra" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self" /></ProcUnit></Project>		1	<Project description="test" id="191" name="john"><ReadUnit datatype="VoltageReader" id="1911" inputId="0" name="VoltageReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="server" value="john" /></Operation></ReadUnit><ProcUnit datatype="SpectraProc" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self"><Parameter format="int" id="191211" name="nFFTPoints" value="64" /></Operation><Operation id="19122" name="SpectraPlot" priority="2" type="other"><Parameter format="int" id="191221" name="id" value="500" /><Parameter format="str" id="191222" name="wintitle" value="Jicamarca Radio Observatory" /><Parameter format="int" id="191223" name="showprofile" value="0" /></Operation></ProcUnit></Project> No newline at end of file

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