schain-jc Commit - r1080:af3edc5dd0e9

kwargs restantes. Templates y changelog actualizado

José Chávez -

r1080:af3edc5dd0e9

parent child

Context file:

r1080:af3edc5dd0e9

Collapse all files

schaincli/templates.py +5 -3

             plotter = Project()
             plotter.setup(id='100', name='receiver', description=desc)
-            receiver_proc = plotter.addProcUnit(name='PlotterReceiver')
+            receiver_plot = plotter.addProcUnit(name='PlotterReceiver')
-            receiver_proc.addParameter(name='throttle', value=20, format='int')
+            receiver_plot.addParameter(name='throttle', value=20, format='int')
+            receiver_plot.addParameter(name='plottypes', value='rti', format='str')
-            rti = receiver_proc.addOperation(name='PlotRTIData', optype='other')
+            rti = receiver_plot.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='decimation', value='200', format='int')
             rti.addParameter(name='xmin', value='0.0', format='int')
             rti.addParameter(name='colormap', value='jet', format='str')

schainpy/CHANGELOG.md +1 -1

             ## CHANGELOG:
             ### 2.3
-            * Added high order function `multiSchain` for multiprocessing scripts.
+            * Added high order function `MPProject` for multiprocessing scripts.
             * Added two new Processing Units `PublishData` and `ReceiverData` for receiving and sending dataOut through multiple ways (tcp, ipc, inproc).
             * Added a new graphics Processing Unit `PlotterReceiver`. It is decoupled from normal processing sequence with support for data generated by multiprocessing scripts.
             * Added support for sending realtime graphic to web server.

schainpy/model/graphics/jroplot_data.py +46 -22

             from schainpy.utils import log
             jet_values = matplotlib.pyplot.get_cmap("jet", 100)(numpy.arange(100))[10:90]
-            blu_values = matplotlib.pyplot.get_cmap("seismic_r", 20)(numpy.arange(20))[10:15]
+            blu_values = matplotlib.pyplot.get_cmap(
-            ncmap = matplotlib.colors.LinearSegmentedColormap.from_list("jro", numpy.vstack((blu_values, jet_values)))
+                "seismic_r", 20)(numpy.arange(20))[10:15]
+            ncmap = matplotlib.colors.LinearSegmentedColormap.from_list(
+                "jro", numpy.vstack((blu_values, jet_values)))
             matplotlib.pyplot.register_cmap(cmap=ncmap)
-            func = lambda x, pos: '{}'.format(datetime.datetime.fromtimestamp(x).strftime('%H:%M'))
-            UT1970 = datetime.datetime(1970, 1, 1) - datetime.timedelta(seconds=time.timezone)
+            def func(x, pos): return '{}'.format(
+                datetime.datetime.fromtimestamp(x).strftime('%H:%M'))
+            UT1970 = datetime.datetime(1970, 1, 1) - \
+                datetime.timedelta(seconds=time.timezone)
             CMAPS = [plt.get_cmap(s) for s in ('jro', 'jet', 'RdBu_r', 'seismic')]
             class PlotData(Operation, Process):
                 '''
                 Base class for Schain plotting operations
                                 self.pf_axes[n].set_xlim(self.zmin, self.zmax)
                                 self.pf_axes[n].set_xlabel('dB')
                                 self.pf_axes[n].grid(b=True, axis='x')
-                                [tick.set_visible(False) for tick in self.pf_axes[n].get_yticklabels()]
+                                [tick.set_visible(False)
+                                 for tick in self.pf_axes[n].get_yticklabels()]
                             if self.colorbar:
                                 ax.cbar = plt.colorbar(ax.plt, ax=ax, pad=0.02, aspect=10)
                                 ax.cbar.ax.tick_params(labelsize=8)
                         ax.set_title('{} - {} {}'.format(
                             self.titles[n],
-                                datetime.datetime.fromtimestamp(self.max_time).strftime('%H:%M:%S'),
+                            datetime.datetime.fromtimestamp(
+                                self.max_time).strftime('%H:%M:%S'),
                             self.time_label),
                             size=8)
                         ax.set_xlim(xmin, xmax)
                                 '{}{}_{}.png'.format(
                                     self.CODE,
                                     label,
-                                    datetime.datetime.fromtimestamp(self.saveTime).strftime('%y%m%d_%H%M%S')
+                                    datetime.datetime.fromtimestamp(
+                                        self.saveTime).strftime('%y%m%d_%H%M%S')
                                 )
                             )
                             print 'Saving figure: {}'.format(figname)
                     receiver.setsockopt(zmq.CONFLATE, self.CONFLATE)
                     if 'server' in self.kwargs['parent']:
-                        receiver.connect('ipc:///tmp/{}.plots'.format(self.kwargs['parent']['server']))
+                        receiver.connect(
+                            'ipc:///tmp/{}.plots'.format(self.kwargs['parent']['server']))
                     else:
                         receiver.connect("ipc:///tmp/zmq.plots")
                     if self.data:
                         self.__plot()
             class PlotSpectraData(PlotData):
                 '''
                 Plot for Spectra data
                                                    )
                             if self.showprofile:
-                                ax.plt_profile= self.pf_axes[n].plot(self.data['rti'][n][-1], y)[0]
+                                ax.plt_profile = self.pf_axes[n].plot(
+                                    self.data['rti'][n][-1], y)[0]
                                 ax.plt_noise = self.pf_axes[n].plot(numpy.repeat(noise, len(y)), y,
                                                                     color="k", linestyle="dashed", lw=1)[0]
                             if self.CODE == 'spc_mean':
                                                    )
                         else:
                             ax.plt.set_array(coh.T.ravel())
-                        self.titles.append('Coherence Ch{} * Ch{}'.format(pair[0], pair[1]))
+                        self.titles.append(
+                            'Coherence Ch{} * Ch{}'.format(pair[0], pair[1]))
                         ax = self.axes[4 * n + 3]
                         if ax.firsttime:
                     self.nplots = len(self.data.channels)
                     self.ylabel = 'Range [Km]'
                     self.cb_label = 'dB'
-                    self.titles = ['{} Channel {}'.format(self.CODE.upper(), x) for x in range(self.nrows)]
+                    self.titles = ['{} Channel {}'.format(
+                        self.CODE.upper(), x) for x in range(self.nrows)]
                 def plot(self):
                     self.x = self.times
                                                    cmap=plt.get_cmap(self.colormap)
                                                    )
                             if self.showprofile:
-                                ax.plot_profile= self.pf_axes[n].plot(self.data['rti'][n][-1], self.y)[0]
+                                ax.plot_profile = self.pf_axes[n].plot(
+                                    self.data['rti'][n][-1], self.y)[0]
                                 ax.plot_noise = self.pf_axes[n].plot(numpy.repeat(self.data['noise'][n][-1], len(self.y)), self.y,
                                                                      color="k", linestyle="dashed", lw=1)[0]
                         else:
                                                    )
                             if self.showprofile:
                                 ax.plot_profile.set_data(self.data['rti'][n][-1], self.y)
-                                ax.plot_noise.set_data(numpy.repeat(self.data['noise'][n][-1], len(self.y)), self.y)
+                                ax.plot_noise.set_data(numpy.repeat(
+                                    self.data['noise'][n][-1], len(self.y)), self.y)
                     self.saveTime = self.min_time
                     self.ylabel = 'Range [Km]'
                     if self.CODE == 'coh':
                         self.cb_label = ''
-                        self.titles = ['Coherence Map Ch{} * Ch{}'.format(x[0], x[1]) for x in self.data.pairs]
+                        self.titles = [
+                            'Coherence Map Ch{} * Ch{}'.format(x[0], x[1]) for x in self.data.pairs]
                     else:
                         self.cb_label = 'Degrees'
-                        self.titles = ['Phase Map Ch{} * Ch{}'.format(x[0], x[1]) for x in self.data.pairs]
+                        self.titles = [
+                            'Phase Map Ch{} * Ch{}'.format(x[0], x[1]) for x in self.data.pairs]
             class PlotPHASEData(PlotCOHData):
                     else:
                         self.figure.clf()
-                    self.ax = plt.subplot2grid((self.nrows, self.ncols), (0, 0), 1, 1, polar=True)
+                    self.ax = plt.subplot2grid(
+                        (self.nrows, self.ncols), (0, 0), 1, 1, polar=True)
                     self.ax.firsttime = True
                 def plot(self):
-                    arrayParameters = numpy.concatenate([self.data['param'][t] for t in self.times])
+                    arrayParameters = numpy.concatenate(
+                        [self.data['param'][t] for t in self.times])
                     error = arrayParameters[:, -1]
                     indValid = numpy.where(error == 0)[0]
                     finalMeteor = arrayParameters[indValid, :]
                     else:
                         self.ax.plot.set_data(x, y)
+                    dt1 = datetime.datetime.fromtimestamp(
-                    dt1 = datetime.datetime.fromtimestamp(self.min_time).strftime('%y/%m/%d %H:%M:%S')
+                        self.min_time).strftime('%y/%m/%d %H:%M:%S')
-                    dt2 = datetime.datetime.fromtimestamp(self.max_time).strftime('%y/%m/%d %H:%M:%S')
+                    dt2 = datetime.datetime.fromtimestamp(
+                        self.max_time).strftime('%y/%m/%d %H:%M:%S')
                     title = 'Meteor Detection Sky Map\n %s - %s \n Number of events: %5.0f\n' % (dt1,
                                                                                                  dt2,
                                                                                                  len(x))
                     self.saveTime = self.max_time
             class PlotParamData(PlotRTIData):
                 '''
                 Plot for data_param object
                         if ax.firsttime:
                             if self.zlimits is not None:
                                 self.zmin, self.zmax = self.zlimits[n]
-                            self.zmax = self.zmax if self.zmax is not None else numpy.nanmax(abs(self.z[:-1, :]))
+                            self.zmax = self.zmax if self.zmax is not None else numpy.nanmax(
+                                abs(self.z[:-1, :]))
                             self.zmin = self.zmin if self.zmin is not None else -self.zmax
                             ax.plt = ax.pcolormesh(x, y, z[n, :, :].T * self.factors[n],
                                                    vmin=self.zmin,
                     self.saveTime = self.min_time
             class PlotOuputData(PlotParamData):
                 '''
                 Plot data_output object

schainpy/model/proc/jroproc_amisr.py +8 -6

             from schainpy.model.data.jroamisr import AMISR
             class AMISRProc(ProcessingUnit):
-                def __init__(self):
+                def __init__(self, **kwargs):
-                    ProcessingUnit.__init__(self)
+                    ProcessingUnit.__init__(self, **kwargs)
                     self.objectDict = {}
                     self.dataOut = AMISR()
             class PrintInfo(Operation):
-                def __init__(self):
+                def __init__(self, **kwargs):
+                    Operation.__init__(self, **kwargs)
                     self.__isPrinted = False
                 def run(self, dataOut):
                 profileIndex = None
                 nProfiles = None
-                def __init__(self):
+                def __init__(self, **kwargs):
+                    Operation.__init__(self, **kwargs)
                     self.profileIndex = 0
                     self.__isConfig = False
             class ProfileToChannels(Operation):
-                def __init__(self):
+                def __init__(self, **kwargs):
+                    Operation.__init__(self, **kwargs)
                     self.__isConfig = False
                     self.__counter_chan = 0
                     self.buffer = None

schainpy/model/proc/jroproc_parameters.py +4 -4

                 n = None
-                def __init__(self):
+                def __init__(self, **kwargs):
-                    Operation.__init__(self)
+                    Operation.__init__(self, **kwargs)
                 def __calculateCosDir(self, elev, azim):
                     zen = (90 - elev)*numpy.pi/180
             class EWDriftsEstimation(Operation):
-                def __init__(self):
+                def __init__(self, **kwargs):
-                    Operation.__init__(self)
+                    Operation.__init__(self, **kwargs)
                 def __correctValues(self, heiRang, phi, velRadial, SNR):
                     listPhi = phi.tolist()

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