schain-jc Commit - r908:2205da7ed447

Merging remote and local

jespinoza -

r908:2205da7ed447

parent child

Context file:

r908:2205da7ed447

Collapse all files

.gitignore +4 0

@@ -96,3 +96,7 ENV/
96		96
97	# mkdocs documentation	97	# mkdocs documentation
98	/site	98	/site
		99
		100	# eclipse
		101	.project
		102	.pydevproject

schainpy/__init__.py +1 -1

             @author $Author$
             @version $Id$
             '''
-            __version__ = "2.2.5"
  No newline at end of file
+            __version__ = "2.3"
  No newline at end of file

schainpy/controller.py +11 -6

                 def createObject(self, plotter_queue=None):
-                    if self.type == 'self':
+                    if self.type == 'self':
                         raise ValueError, "This operation type cannot be created"
                     if self.type == 'plotter':
                         opObj = Plotter(self.name, plotter_queue)
                     if self.type == 'external' or self.type == 'other':
-                        print self.name
                         className = eval(self.name)
                         kwargs = self.getKwargs()
-                        print kwargs
                         opObj = className(**kwargs)
                     return opObj
                     kwargs = self.getKwargs()
                     procUnitObj = className(**kwargs)
                     for opConfObj in self.opConfObjList:
-                        if opConfObj.type == 'self':
+                        if opConfObj.type=='self' and self.name=='run':
+                            continue
+                        elif opConfObj.type=='self':
+                            procUnitObj.addOperationKwargs(opConfObj.id, **opConfObj.getKwargs())
                             continue
                         opObj = opConfObj.createObject(plotter_queue)
                         self.opObjDict[opConfObj.id] = opObj
                         procUnitObj.addOperation(opObj, opConfObj.id)
                     self.procUnitObj = procUnitObj

schainpy/model/graphics/jroplot_data.py +2 -1

                 def __init__(self, **kwargs):
-                    Operation.__init__(self, **kwargs)
+                    Operation.__init__(self, plot=True, **kwargs)
                     Process.__init__(self)
+                    self.kwargs['code'] = self.CODE
                     self.mp = False
                     self.dataOut = None
                     self.isConfig = False

schainpy/model/proc/jroproc_base.py +23 -7

                     self.dataOut = None
                     self.operations2RunDict = {}
+                    self.operationKwargs = {}
                     self.isConfig = False
                     self.args = args
                     self.kwargs = kwargs
+                def addOperationKwargs(self, objId, **kwargs):
+                    '''
+                    '''
+                    self.operationKwargs[objId] = kwargs
                 def addOperation(self, opObj, objId):
                     """
                     raise NotImplementedError
-                def callMethod(self, name, **kwargs):
+                def callMethod(self, name, opId):
                     """
                     Ejecuta el metodo con el nombre "name" y con argumentos **kwargs de la propia clase.
                             return False
                     else:
                         #Si no es un metodo RUN la entrada es la misma dataOut (interna)
-                        if self.dataOut.isEmpty():
+                        if self.dataOut is not None and self.dataOut.isEmpty():
                             return False
                     #Getting the pointer to method
                     #Executing the self method
                     if hasattr(self, 'mp'):
-                        if self.mp is False:
+                        if name=='run':
-                            self.mp = True
+                            if self.mp is False:
-                            self.start()
+                                self.mp = True
+                                self.start()
+                        else:
+                            methodToCall(**self.operationKwargs[opId])
                     else:
-                        methodToCall(**kwargs)
+                        if name=='run':
+                            methodToCall(**self.kwargs)
+                        else:
+                            methodToCall(**self.operationKwargs[opId])
                     if self.dataOut is None:
                         return False
                     if hasattr(externalProcObj, 'mp'):
                         if externalProcObj.mp is False:
+                            self.operationKwargs[objId] = externalProcObj.kwargs
                             externalProcObj.mp = True
                             externalProcObj.start()
                     else:
                         externalProcObj.run(self.dataOut, **externalProcObj.kwargs)
+                        self.operationKwargs[objId] = externalProcObj.kwargs
                     return True
                         if not opName:
                             raise ValueError, "opName parameter should be defined"
-                        sts = self.callMethod(opName, **self.kwargs)
+                        sts = self.callMethod(opName, opId)
                     elif opType == 'other' or opType == 'external' or opType == 'plotter':

schainpy/model/proc/jroproc_parameters.py +1 -6

                 n = None
-                def __init__(self):
-                    Operation.__init__(self)
                 def __calculateCosDir(self, elev, azim):
                     zen = (90 - elev)*numpy.pi/180
                     azim = azim*numpy.pi/180
             class EWDriftsEstimation(Operation):
-                def __init__(self):
-                    Operation.__init__(self)
                 def __correctValues(self, heiRang, phi, velRadial, SNR):
                     listPhi = phi.tolist()
                         timeLag = 45*10**-3
                     else:
                         timeLag = 15*10**-3
-                    lag = numpy.ceil(timeLag/timeInterval)
+                    lag = int(numpy.ceil(timeLag/timeInterval))
                     listMeteors1 = []

schainpy/model/utils/jroutils_publish.py +41 -4

                 elif isinstance(obj, float):
                     return round(obj, 2)
+            def decimate(z):
+                # dx = int(len(self.x)/self.__MAXNUMX) + 1
+                dy = int(len(z[0])/MAXNUMY) + 1
+                return z[::, ::dy]
             class throttle(object):
                 """Decorator that prevents a function from being called more than once every
                     Process.__init__(self)
                     self.mp = False
                     self.isConfig = False
+                    self.isWebConfig = False
                     self.plottypes =[]
                     self.connections = 0
                     server = kwargs.get('server', 'zmq.pipe')
+                    plot_server = kwargs.get('plot_server', 'zmq.web')
                     if 'tcp://' in server:
                         address = server
                     else:
                         address = 'ipc:///tmp/%s' % server
+                    if 'tcp://' in plot_server:
+                        plot_address = plot_server
+                    else:
+                        plot_address = 'ipc:///tmp/%s' % plot_server
                     self.address = address
+                    self.plot_address = plot_address
                     self.plottypes = [s.strip() for s in kwargs.get('plottypes', 'rti').split(',')]
                     self.realtime = kwargs.get('realtime', False)
                     self.throttle_value = kwargs.get('throttle', 10)
                     self.data['throttle'] = self.throttle_value
                     self.data['ENDED'] = False
                     self.isConfig = True
+                    self.data_web = {}
                 def event_monitor(self, monitor):
                     return sendDataThrottled
                 def send(self, data):
-                    print '[sending] data=%s size=%s' % (data.keys(), len(data['times']))
+                    # print '[sending] data=%s size=%s' % (data.keys(), len(data['times']))
                     self.sender.send_pyobj(data)
                 def update(self):
                     self.data['times'].append(t)
                     self.data['dataOut'] = self.dataOut
                     for plottype in self.plottypes:
                         if plottype == 'spc':
                             z = self.dataOut.data_spc/self.dataOut.normFactor
                             self.data[plottype] = 10*numpy.log10(z)
                             self.data[plottype][t] = self.dataOut.getCoherence()
                         if plottype == 'phase':
                             self.data[plottype][t] = self.dataOut.getCoherence(phase=True)
+                        if self.realtime:
+                            self.data_web[plottype] = roundFloats(decimate(self.data[plottype][t]).tolist())
+                            self.data_web['time'] = t
                 def run(self):
                     print '[Starting] {} from {}'.format(self.name, self.address)
                     self.receiver.bind(self.address)
                     monitor = self.receiver.get_monitor_socket()
                     self.sender = self.context.socket(zmq.PUB)
+                    if self.realtime:
+                        self.sender_web = self.context.socket(zmq.PUB)
+                        self.sender_web.bind(self.plot_address)
                     self.sender.bind("ipc:///tmp/zmq.plots")
                     t = Thread(target=self.event_monitor, args=(monitor,))
                         else:
                             if self.realtime:
                                 self.send(self.data)
+                                self.sender_web.send_string(json.dumps(self.data_web))
                             else:
                                 self.sendData(self.send, self.data)
                             self.started = True
                     return
+                def sendToWeb(self):
+                    if not self.isWebConfig:
+                        context = zmq.Context()
+                        sender_web_config = context.socket(zmq.PUB)
+                        if 'tcp://' in self.plot_address:
+                            print self.plot_address
+                            dum, address, port = self.plot_address.split(':')
+                            conf_address = '{}:{}:{}'.format(dum, address, int(port)+1)
+                        else:
+                            conf_address = self.plot_address + '.config'
+                        sender_web_config.bind(conf_address)
+                        for kwargs in self.operationKwargs.values():
+                            if 'plot' in kwargs:
+                                sender_web_config.send_string(json.dumps(kwargs))
+                                print kwargs
+                        self.isWebConfig = True

schainpy/scripts/PPD.py +2 -2

                 # opObj13.addParameter(name='zeromq', value=1, format='int')
                 # opObj13.addParameter(name='server', value="juanca", format='str')
-                # opObj12.addParameter(name='delay', value=1, format='int')
+                opObj12.addParameter(name='delay', value=1, format='int')
                 # print "Escribiendo el archivo XML"
             if __name__ == '__main__':
                 parser = argparse.ArgumentParser(description='Set number of parallel processes')
-                parser.add_argument('--nProcess', default=2, type=int)
+                parser.add_argument('--nProcess', default=1, type=int)
                 args = parser.parse_args()
                 multiSchain(fiber, nProcess=args.nProcess, startDate='2015/09/26', endDate='2015/09/26')

schainpy/scripts/receiver.py +13 -12

@@ -15,21 +15,22 if __name__ == '__main__':
15	controllerObj.setup(id='191', name='test01', description=desc)	15	controllerObj.setup(id='191', name='test01', description=desc)
16		16
17	proc1 = controllerObj.addProcUnit(name='ReceiverData')	17	proc1 = controllerObj.addProcUnit(name='ReceiverData')
18	proc1.addParameter(name='realtime', value='0', format='bool')	18	proc1.addParameter(name='realtime', value='1', format='bool')
19	proc1.addParameter(name='plottypes', value='rti~~,coh,phase~~', format='str')	19	proc1.addParameter(name='plottypes', value='rti', format='str')
20	proc1.addParameter(name='throttle', value='10', format='int')	20	proc1.addParameter(name='throttle', value='10', format='int')
		21	## TODO Agregar direccion de server de publicacion a graficos como variable
21		22
22	op1 = proc1.addOperation(name='PlotRTIData', optype='other')	23	# op1 = proc1.addOperation(name='PlotRTIData', optype='other')
23	op1.addParameter(name='wintitle', value='Julia 150Km', format='str')	24	# op1.addParameter(name='wintitle', value='Julia 150Km', format='str')
24	op1.addParameter(name='save', value='/home/nanosat/Pictures', format='str')	25	# op1.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
25
26	op2 = proc1.addOperation(name='PlotCOHData', optype='other')
27	op2.addParameter(name='wintitle', value='Julia 150Km', format='str')
28	op2.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
29	#	26	#
30	~~op6~~ = proc1.addOperation(name='Plot~~PHASE~~Data', optype='other')	27	# op2 = proc1.addOperation(name='PlotCOHData', optype='other')
31	~~op6~~.addParameter(name='wintitle', value='Julia 150Km', format='str')	28	# op2.addParameter(name='wintitle', value='Julia 150Km', format='str')
32	~~op6~~.addParameter(name='save', value='/home/nanosat/Pictures', format='str')	29	# op2.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
		30	# #
		31	# op6 = proc1.addOperation(name='PlotPHASEData', optype='other')
		32	# op6.addParameter(name='wintitle', value='Julia 150Km', format='str')
		33	# op6.addParameter(name='save', value='/home/nanosat/Pictures', format='str')
33	#	34	#
34	# proc2 = controllerObj.addProcUnit(name='ReceiverData')	35	# proc2 = controllerObj.addProcUnit(name='ReceiverData')
35	# proc2.addParameter(name='server', value='juanca', format='str')	36	# proc2.addParameter(name='server', value='juanca', format='str')

schainpy/scripts/schain.xml +1 -1

	@@ -1,1 +1,1
	1	<Project description="HF_EXAMPLE" id="191" name="test01"><ReadUnit datatype="SpectraReader" 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/hysell_data20/pdata" /><Parameter format="date" id="191113" name="startDate" value="2015/09/26" /><Parameter format="date" id="191114" name="endDate" value="2015/09/26" /><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="3" /><Parameter format="int" id="191119" name="skip" value="360" /><Parameter format="int" id="191120" name="delay" value="10" /><Parameter format="int" id="191121" name="walk" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="Spectra" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self" /><Operation id="19122" name="PublishData" priority="2" type="other"><Parameter format="int" id="191221" name="zeromq" value="1" /></Operation></ProcUnit></Project> No newline at end of file		1	<Project description="HF_EXAMPLE" id="191" name="test01"><ReadUnit datatype="SpectraReader" 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/hysell_data20/pdata" /><Parameter format="date" id="191113" name="startDate" value="2015/09/26" /><Parameter format="date" id="191114" name="endDate" value="2015/09/26" /><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="2" /><Parameter format="int" id="191119" name="skip" value="720" /><Parameter format="int" id="191120" name="delay" value="10" /><Parameter format="int" id="191121" name="walk" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="Spectra" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self" /><Operation id="19122" name="PublishData" priority="2" type="other"><Parameter format="int" id="191221" name="zeromq" value="1" /><Parameter format="int" id="191222" name="delay" value="1" /></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