diff --git a/schaincli/templates.py b/schaincli/templates.py index ce08f4c..47d6d4f 100644 --- a/schaincli/templates.py +++ b/schaincli/templates.py @@ -1,11 +1,10 @@ basic = '''from schainpy.controller import Project desc = "{desc}" +project = Project() +project.setup(id='200', name="{name}", description=desc) -controller = Project() -controller.setup(id='191', name="{name}", description=desc) - -readUnitConf = controller.addReadUnit(datatype='VoltageReader', +voltage_reader = project.addReadUnit(datatype='VoltageReader', path="{path}", startDate="{startDate}", endDate="{endDate}", @@ -16,60 +15,72 @@ readUnitConf = controller.addReadUnit(datatype='VoltageReader', walk=1, ) -procUnitConf1 = controller.addProcUnit(datatype='VoltageProc', inputId=readUnitConf.getId()) +voltage_proc = project.addProcUnit(datatype='VoltageProc', inputId=voltage_reader.getId()) -opObj11 = procUnitConf1.addOperation(name='ProfileSelector', optype='other') -opObj11.addParameter(name='profileRangeList', value='120,183', format='intlist') +profile = voltage_proc.addOperation(name='ProfileSelector', optype='other') +profile.addParameter(name='profileRangeList', value='120,183', format='intlist') -opObj11 = procUnitConf1.addOperation(name='RTIPlot', optype='other') -opObj11.addParameter(name='wintitle', value='Jicamarca Radio Observatory', format='str') -opObj11.addParameter(name='showprofile', value='0', format='int') -opObj11.addParameter(name='xmin', value='0', format='int') -opObj11.addParameter(name='xmax', value='24', format='int') -opObj11.addParameter(name='figpath', value="{figpath}", format='str') -opObj11.addParameter(name='wr_period', value='5', format='int') -opObj11.addParameter(name='exp_code', value='22', format='int') +rti = voltage_proc.addOperation(name='RTIPlot', optype='other') +rti.addParameter(name='wintitle', value='Jicamarca Radio Observatory', format='str') +rti.addParameter(name='showprofile', value='0', format='int') +rti.addParameter(name='xmin', value='0', format='int') +rti.addParameter(name='xmax', value='24', format='int') +rti.addParameter(name='figpath', value="{figpath}", format='str') +rti.addParameter(name='wr_period', value='5', format='int') +rti.addParameter(name='exp_code', value='22', format='int') controller.start() ''' -multiprocess = '''from schainpy.controller import Project, multiSchain +multiprocess = '''from schainpy.controller import Project, MPProject desc = "{desc}" -def fiber(cursor, skip, q, day): - controller = Project() - controller.setup(id='191', name="{name}", description=desc) - - readUnitConf = controller.addReadUnit(datatype='SpectraReader', - path="{path}", - startDate=day, - endDate=day, - startTime="{startHour}", - endTime="{endHour}", - online=0, - queue=q, - cursor=cursor, - skip=skip, - verbose=1, - walk=1, - ) - - procUnitConf1 = controller.addProcUnit(datatype='Spectra', inputId=readUnitConf.getId()) - - procUnitConf2 = controller.addProcUnit(datatype='ParametersProc', inputId=readUnitConf.getId()) - opObj11 = procUnitConf2.addOperation(name='SpectralMoments', optype='other') - - opObj12 = procUnitConf2.addOperation(name='PublishData', optype='other') - opObj12.addParameter(name='zeromq', value=1, format='int') - opObj12.addParameter(name='verbose', value=0, format='bool') - - controller.start() - - -if __name__ == '__main__': - multiSchain(fiber, nProcess={nProcess}, startDate="{startDate}", endDate="{endDate}") +#################### +# PLOTTER RECEIVER # +#################### +plotter = Project() +plotter.setup(id='100', name='receiver', description=desc) + +receiver_proc = plotter.addProcUnit(name='PlotterReceiver') +receiver_proc.addParameter(name='throttle', value=20, format='int') + +rti = receiver_proc.addOperation(name='PlotRTIData', optype='other') +rti.addParameter(name='zmin', value='-40.0', format='float') +rti.addParameter(name='zmax', value='100.0', format='float') +rti.addParameter(name='xmin', value='0.0', format='int') +rti.addParameter(name='colormap', value='jet', format='str') + +plotter.start() + +################ +# DATA EMITTER # +################ +project = Project() +project.setup(id='200', name="{name}", description=desc) + +spectra_reader = project.addReadUnit(datatype='SpectraReader', + path="{path}", + startDate={startDate}, + endDate={endDate}, + startTime="{startHour}", + endTime="{endHour}", + online=0, + verbose=1, + walk=1, + ) + +spectra_proc = project.addProcUnit(datatype='Spectra', inputId=spectra_reader.getId()) + +parameters_proc = project.addProcUnit(datatype='ParametersProc', inputId=spectra_proc.getId()) +moments = parameters_proc.addOperation(name='SpectralMoments', optype='other') + +publish = parameters_proc.addOperation(name='PublishData', optype='other') +publish.addParameter(name='zeromq', value=1, format='int') +publish.addParameter(name='verbose', value=0, format='bool') + +MPProject(project, 16) ''' diff --git a/setup.py b/setup.py index 814cf80..2384c56 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,7 @@ from setuptools import setup, Extension from setuptools.command.build_ext import build_ext as _build_ext from schainpy import __version__ + class build_ext(_build_ext): def finalize_options(self): _build_ext.finalize_options(self) @@ -16,13 +17,14 @@ class build_ext(_build_ext): import numpy self.include_dirs.append(numpy.get_include()) + 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', + packages={'schainpy', 'schainpy.model', 'schainpy.model.data', 'schainpy.model.graphics', @@ -38,31 +40,30 @@ setup(name="schainpy", ext_package='schainpy', py_modules=[''], package_data={'': ['schain.conf.template'], - 'schainpy.gui.figures': ['*.png','*.jpg'], + 'schainpy.gui.figures': ['*.png', '*.jpg'], }, include_package_data=False, - scripts =['schainpy/gui/schainGUI'], + scripts=['schainpy/gui/schainGUI'], ext_modules=[ - Extension("cSchain", ["schainpy/model/proc/extensions.c"] - )], + Extension("cSchain", ["schainpy/model/proc/extensions.c"] + )], entry_points={ - 'console_scripts': [ - 'schain = schaincli.cli:main', - ], + 'console_scripts': [ + 'schain = schaincli.cli:main', + ], }, - cmdclass={'build_ext':build_ext}, + cmdclass={'build_ext': build_ext}, setup_requires=["numpy >= 1.11.2"], install_requires=[ - "scipy >= 0.14.0", - "h5py >= 2.2.1", - "matplotlib >= 1.4.2", - "pyfits >= 3.4", - "paramiko >= 2.1.2", - "paho-mqtt >= 1.2", - "zmq", - "fuzzywuzzy", - "click", - "colorama", - "python-Levenshtein" - ], - ) + "scipy >= 0.14.0", + "h5py >= 2.2.1", + "matplotlib >= 1.4.2", + "pyfits >= 3.4", + "paramiko >= 2.1.2", + "paho-mqtt >= 1.2", + "zmq", + "fuzzywuzzy", + "click", + "python-Levenshtein" + ], + )