diff --git a/schainpy/scripts/PPD2.py b/schainpy/scripts/PPD2.py index f5cb05e..f67252c 100644 --- a/schainpy/scripts/PPD2.py +++ b/schainpy/scripts/PPD2.py @@ -23,7 +23,7 @@ readUnitConfObj = controllerObj.addReadUnit(datatype='SpectraReader', # #opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock') # -procUnitConfObj2 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId()) +# procUnitConfObj2 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId()) # procUnitConfObj2.addParameter(name='nipp', value='5', format='int') procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId()) diff --git a/schainpy/scripts/julia_mp.py b/schainpy/scripts/julia_mp.py index d812999..932bd25 100644 --- a/schainpy/scripts/julia_mp.py +++ b/schainpy/scripts/julia_mp.py @@ -35,14 +35,11 @@ def fiber(cursor, skip, q, dt): # opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other') # - # opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other') - # opObj11.addParameter(name='id', value='1000', format='int') - # opObj11.addParameter(name='wintitle', value='HF_Jicamarca_Spc', format='str') - # opObj11.addParameter(name='channelList', value='0', format='intlist') - # opObj11.addParameter(name='zmin', value='-120', format='float') - # opObj11.addParameter(name='zmax', value='-70', format='float') - # opObj11.addParameter(name='save', value='1', format='int') - # opObj11.addParameter(name='figpath', value=figpath, format='str') + opObj11 = procUnitConfObj2.addOperation(name='RTIPlot', optype='other') + opObj11.addParameter(name='id', value='1000', format='int') + opObj11.addParameter(name='wintitle', value='HF_Jicamarca_Spc', format='str') + opObj11.addParameter(name='xmin', value='0', format='int') + opObj11.addParameter(name='xmax', value='24', format='int') # opObj11 = procUnitConfObj3.addOperation(name='Parameters1Plot', optype='other') # opObj11.addParameter(name='channelList', value='0', format='intList') @@ -67,8 +64,8 @@ def fiber(cursor, skip, q, dt): # opObj11.addParameter(name='save', value='0', format='int') # # opObj11.addParameter(name='figpath', value='/tmp/', format='str') # - opObj12 = procUnitConfObj2.addOperation(name='PublishData', optype='other') - opObj12.addParameter(name='zeromq', value=1, format='int') + # opObj12 = procUnitConfObj2.addOperation(name='PublishData', optype='other') + # opObj12.addParameter(name='zeromq', value=1, format='int') # opObj12.addParameter(name='server', value='tcp://10.10.10.82:7000', format='str') diff --git a/schainpy/scripts/receiver.py b/schainpy/scripts/receiver.py index d1497e4..c06b1ce 100644 --- a/schainpy/scripts/receiver.py +++ b/schainpy/scripts/receiver.py @@ -16,8 +16,8 @@ if __name__ == '__main__': proc1 = controllerObj.addProcUnit(name='ReceiverData') proc1.addParameter(name='realtime', value='0', format='bool') - proc1.addParameter(name='plottypes', value='rti,coh,phase,snr,dop', format='str') - proc1.addParameter(name='throttle', value='10', format='int') + proc1.addParameter(name='plottypes', value='snr', format='str') + proc1.addParameter(name='throttle', value='5', format='int') proc1.addParameter(name='interactive', value='0', format='bool') # proc1.addParameter(name='server', value='tcp://10.10.10.82:7000', format='str') ## TODO Agregar direccion de server de publicacion a graficos como variable @@ -28,28 +28,28 @@ if __name__ == '__main__': op3.addParameter(name='save', value='/home/nanosat/Pictures', format='str') op3.addParameter(name='show', value='0', format='bool') # # - op4 = proc1.addOperation(name='PlotDOPData', optype='other') - op4.addParameter(name='wintitle', value='Julia 150Km', format='str') - op4.addParameter(name='save', value='/home/nanosat/Pictures', format='str') - op4.addParameter(name='show', value='0', format='bool') - op4.addParameter(name='colormap', value='jet', format='str') - - op1 = proc1.addOperation(name='PlotRTIData', optype='other') - op1.addParameter(name='wintitle', value='Julia 150Km', format='str') - op1.addParameter(name='save', value='/home/nanosat/Pictures', format='str') - op1.addParameter(name='show', value='0', format='bool') - op1.addParameter(name='colormap', value='jet', format='str') - # - op2 = proc1.addOperation(name='PlotCOHData', optype='other') - op2.addParameter(name='wintitle', value='Julia 150Km', format='str') - op2.addParameter(name='save', value='/home/nanosat/Pictures', format='str') - op2.addParameter(name='colormap', value='jet', format='str') - op2.addParameter(name='show', value='0', format='bool') - # # # - op6 = proc1.addOperation(name='PlotPHASEData', optype='other') - op6.addParameter(name='wintitle', value='Julia 150Km', format='str') - op6.addParameter(name='save', value='/home/nanosat/Pictures', format='str') - op6.addParameter(name='show', value='1', format='bool') + # op4 = proc1.addOperation(name='PlotDOPData', optype='other') + # op4.addParameter(name='wintitle', value='Julia 150Km', format='str') + # op4.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + # op4.addParameter(name='show', value='0', format='bool') + # op4.addParameter(name='colormap', value='jet', format='str') + + # op1 = proc1.addOperation(name='PlotRTIData', optype='other') + # op1.addParameter(name='wintitle', value='Julia 150Km', format='str') + # op1.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + # op1.addParameter(name='show', value='0', format='bool') + # op1.addParameter(name='colormap', value='jet', format='str') + # # + # op2 = proc1.addOperation(name='PlotCOHData', optype='other') + # op2.addParameter(name='wintitle', value='Julia 150Km', format='str') + # op2.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + # op2.addParameter(name='colormap', value='jet', format='str') + # op2.addParameter(name='show', value='0', format='bool') + # # # # + # op6 = proc1.addOperation(name='PlotPHASEData', optype='other') + # op6.addParameter(name='wintitle', value='Julia 150Km', format='str') + # op6.addParameter(name='save', value='/home/nanosat/Pictures', format='str') + # op6.addParameter(name='show', value='1', format='bool') # # # # proc2 = controllerObj.addProcUnit(name='ReceiverData') # # proc2.addParameter(name='server', value='juanca', format='str') diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index 7f41b08..dd04f77 100644 --- a/schainpy/scripts/schain.xml +++ b/schainpy/scripts/schain.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/setup.py b/setup.py index 3fe773f..25fe1ee 100644 --- a/setup.py +++ b/setup.py @@ -8,42 +8,42 @@ from schainpy import __version__ from setuptools import setup, Extension setup(name="schainpy", - version=__version__, - description="Python tools to read, write and process Jicamarca data", - author="Miguel Urco", - author_email="miguel.urco@jro.igp.gob.pe", - url="http://jro.igp.gob.pe", - packages = {'schainpy', - 'schainpy.model', - 'schainpy.model.data', - 'schainpy.model.graphics', - 'schainpy.model.io', - 'schainpy.model.proc', - 'schainpy.model.serializer', - 'schainpy.model.utils', - 'schainpy.gui', - 'schainpy.gui.figures', - 'schainpy.gui.viewcontroller', - 'schainpy.gui.viewer', - 'schainpy.gui.viewer.windows'}, - ext_package='schainpy', - py_modules=[''], - package_data={'': ['schain.conf.template'], - 'schainpy.gui.figures': ['*.png','*.jpg'], - }, - include_package_data=False, - scripts =['schainpy/gui/schainGUI', - 'schainpy/scripts/schain'], - ext_modules=[Extension("cSchain", ["schainpy/model/proc/extensions.c"])], - install_requires=[ - "scipy >= 0.14.0", - "h5py >= 2.2.1", - "matplotlib >= 1.4.2", - "pyfits >= 3.4", - "numpy >= 1.11.2", - "paramiko >= 2.1.2", - "paho-mqtt >= 1.2", - "zmq", - "fuzzywuzzy" - ], - ) + version=__version__, + description="Python tools to read, write and process Jicamarca data", + author="Miguel Urco", + author_email="miguel.urco@jro.igp.gob.pe", + url="http://jro.igp.gob.pe", + packages={'schainpy', + 'schainpy.model', + 'schainpy.model.data', + 'schainpy.model.graphics', + 'schainpy.model.io', + 'schainpy.model.proc', + 'schainpy.model.serializer', + 'schainpy.model.utils', + 'schainpy.gui', + 'schainpy.gui.figures', + 'schainpy.gui.viewcontroller', + 'schainpy.gui.viewer', + 'schainpy.gui.viewer.windows'}, + ext_package='schainpy', + py_modules=[''], + package_data={'': ['schain.conf.template'], + 'schainpy.gui.figures': ['*.png', '*.jpg'], + }, + include_package_data=False, + scripts=['schainpy/gui/schainGUI', + 'schainpy/scripts/schain'], + ext_modules=[Extension("cSchain", ["schainpy/model/proc/extensions.c"])], + install_requires=[ + "scipy >= 0.14.0", + "h5py >= 2.2.1", + "matplotlib >= 1.4.2", + "pyfits >= 3.4", + "numpy >= 1.11.2", + "paramiko >= 2.1.2", + "paho-mqtt >= 1.2", + "zmq", + "fuzzywuzzy" + ], +) diff --git a/trash b/trash new file mode 100644 index 0000000..384299d --- /dev/null +++ b/trash @@ -0,0 +1 @@ +You should install "digital_rf_hdf5" module if you want to read USRP data