schain-jc Commit - r1097:fefd86c58472

Add __attrs__ attribute to Process clasess to improve CLI finder

Juan C. Espinoza -

r1097:fefd86c58472

parent child

Context file:

r1097:fefd86c58472

Collapse all files

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

                 __MAXNUMX = 80
                 __missing = 1E30
+                __attrs__ = ['show', 'save', 'xmin', 'xmax', 'ymin', 'ymax', 'zmin', 'zmax',
+                    'zlimits', 'xlabel', 'ylabel', 'cb_label', 'title', 'titles', 'colorbar',
+                    'bgcolor', 'width', 'height', 'localtime', 'oneFigure', 'showprofile']
                 def __init__(self, **kwargs):
                     Operation.__init__(self, plot=True, **kwargs)
                                 [tick.set_visible(False)
                                  for tick in self.pf_axes[n].get_yticklabels()]
                             if self.colorbar:
-                                ax.cbar = plt.colorbar(ax.plt, ax=ax, fraction=0.1, pad=0.02, aspect=10)
+                                ax.cbar = plt.colorbar(ax.plt, ax=ax, fraction=0.05, pad=0.02, aspect=10)
                                 ax.cbar.ax.tick_params(labelsize=8)
                                 ax.cbar.ax.press = None
                                 if self.cb_label:

schainpy/model/io/jroIO_base.py +4 -1

                     return dtype_width
                 def getAllowedArgs(self):
-                    return inspect.getargspec(self.run).args
+                    if hasattr(self, '__attrs__'):
+                        return self.__attrs__
+                    else:
+                        return inspect.getargspec(self.run).args
             class JRODataReader(JRODataIO):

schainpy/model/io/jroIO_bltr.py +2 -4

                     self.dataOut = Spectra()
                     self.profileIndex = 1  # Always
                     self.dataOut.flagNoData = False
                     self.dataOut.nRdPairs = 0
-                    self.dataOut.pairsList = []
+                    self.dataOut.data_spc = None
-                    self.dataOut.data_spc = None
-                    self.dataOut.noise = []
                     self.dataOut.velocityX = []
                     self.dataOut.velocityY = []
                     self.dataOut.velocityV = []

schainpy/model/io/jroIO_mira35c.py +4 -6

                     self.dataOut = Spectra()
                     self.profileIndex = 1  # Always
                     self.dataOut.flagNoData = False
                     self.dataOut.nRdPairs = 0
-                    self.dataOut.pairsList = []
+                    self.dataOut.data_spc = None
-                    self.dataOut.data_spc = None
-                    self.dataOut.normFactor = 1
                     self.nextfileflag = True
                     self.dataOut.RadarConst = 0
                     self.dataOut.HSDV = []
                     self.dataOut.NPW = []
                     self.dataOut.COFA = []
-                    self.dataOut.noise = 0
+                    # self.dataOut.noise = 0
                 def Files2Read(self, fp):
                     '''
                     self.dataOut.noise = self.dataOut.getNoise()
                     # print 'ACAAAAAA', self.dataOut.noise
                     self.dataOut.data_spc = self.dataOut.data_spc + self.dataOut.noise
+                    self.dataOut.normFactor = 1
                     # print 'self.dataOut.noise',self.dataOut.noise
                     return self.dataOut.data_spc

schainpy/model/proc/jroproc_base.py +8 -2

                     checkKwargs(self.run, kwargs)
                 def getAllowedArgs(self):
-                    return inspect.getargspec(self.run).args
+                    if hasattr(self, '__attrs__'):
+                        return self.__attrs__
+                    else:
+                        return inspect.getargspec(self.run).args
                 def addOperationKwargs(self, objId, **kwargs):
                     '''
                     checkKwargs(self.run, kwargs)
                 def getAllowedArgs(self):
-                    return inspect.getargspec(self.run).args
+                    if hasattr(self, '__attrs__'):
+                        return self.__attrs__
+                    else:
+                        return inspect.getargspec(self.run).args
                 def setup(self):

schainpy/model/utils/jroutils_publish.py +5 0

                 Operation to send data over zmq.
                 '''
+                __attrs__ = ['host', 'port', 'delay', 'zeromq', 'mqtt', 'verbose']
                 def __init__(self, **kwargs):
                     """Inicio."""
                     Operation.__init__(self, **kwargs)
             class ReceiverData(ProcessingUnit):
+                __attrs__ = ['server']
                 def __init__(self, **kwargs):
                     ProcessingUnit.__init__(self, **kwargs)
             class PlotterReceiver(ProcessingUnit, Process):
                 throttle_value = 5
+                __attrs__ = ['server', 'plottypes', 'realtime', 'localtime', 'throttle']
                 def __init__(self, **kwargs):

schainpy/utils/paramsFinder.py +5 -6

             import schainpy
             from schainpy.model import Operation, ProcessingUnit
-            from importlib import import_module
             from pydoc import locate
             def clean_modules(module):
             def check_module(possible, instance):
                 def check(x):
                     try:
                         instancia = locate('schainpy.model.{}'.format(x))
                         return isinstance(instancia(), instance)
                     except Exception as e:
                         return False
                 clean = clean_modules(possible)
                 return [x for x in clean if check(x)]
             def getProcs():
-                module = dir(import_module('schainpy.model'))
+                module = dir(schainpy.model)
                 procs = check_module(module, ProcessingUnit)
                 try:
                     procs.remove('ProcessingUnit')
                 return procs
             def getOperations():
-                module = dir(import_module('schainpy.model'))
+                module = dir(schainpy.model)
                 noProcs = [x for x in module if not x.endswith('Proc')]
                 operations = check_module(noProcs, Operation)
                 try:
                 return args
             def getAll():
-                allModules = dir(import_module('schainpy.model'))
+                allModules = dir(schainpy.model)
                 modules = check_module(allModules, Operation)
                 modules.extend(check_module(allModules, ProcessingUnit))
                 return modules

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