schain Commit - r1359:7cde62c34a28 · Jicamarca Repository

Fix bugs in SpectraCutPlot, GenericRTIPlot and saving when using throttle

jespinoza -

r1359:7cde62c34a28

parent child

Context file:

r1359:7cde62c34a28

schainpy/model/graphics/jroplot_base.py +22 -19

                     self.attr_time = kwargs.get('attr_time', 'utctime')
                     self.attr_data = kwargs.get('attr_data', 'data_param')
                     self.decimation = kwargs.get('decimation', None)
-                    self.showSNR = kwargs.get('showSNR', False)
                     self.oneFigure = kwargs.get('oneFigure', True)
                     self.width = kwargs.get('width', None)
                     self.height = kwargs.get('height', None)
                             self.name
                         )
+                    if isinstance(self.attr_data, str):
+                        self.attr_data = [self.attr_data]
                 def __setup_plot(self):
                     '''
                     Common setup for all figures, here figures and axes are created
                                 self.pf_axes.append(cax)
                     for n in range(self.nrows):
+                        print(self.nrows)
                         if self.colormaps is not None:
                             cmap = plt.get_cmap(self.colormaps[n])
                         else:
                     fig = self.figures[n]
-                    figname = os.path.join(
-                        self.save,
-                        self.save_code,
-                        '{}_{}.png'.format(
-                            self.save_code,
-                            self.getDateTime(self.data.max_time).strftime(
-                                '%Y%m%d_%H%M%S'
-                                ),
-                    log.log('Saving figure: {}'.format(figname), self.name)
-                    if not os.path.isdir(os.path.dirname(figname)):
-                        os.makedirs(os.path.dirname(figname))
-                    fig.savefig(figname)
                     if self.throttle == 0:
                         figname = os.path.join(
                             self.save,
-                            '{}_{}.png'.format(
+                            self.save_code,
+                            '{}_{}.png'.format(
                                 self.save_code,
-                                self.getDateTime(self.data.min_time).strftime(
+                                self.getDateTime(self.data.max_time).strftime(
-                                    '%Y%m%d'
+                                    '%Y%m%d_%H%M%S'
                                     ),
                                 )
                             )
+                        log.log('Saving figure: {}'.format(figname), self.name)
+                        if not os.path.isdir(os.path.dirname(figname)):
+                            os.makedirs(os.path.dirname(figname))
                         fig.savefig(figname)
+                    figname = os.path.join(
+                        self.save,
+                        '{}_{}.png'.format(
+                            self.save_code,
+                            self.getDateTime(self.data.min_time).strftime(
+                                '%Y%m%d'
+                                ),
+                            )
+                        )
+                    fig.savefig(figname)
                 def send_to_server(self):
                     '''
                     '''

schainpy/model/graphics/jroplot_parameters.py +3 -3

                 def setup(self):
                     self.xaxis = 'time'
                     self.ncols = 1
-                    self.nrows = self.data.shape(self.attr_data)[0]
+                    self.nrows = self.data.shape('param')[0]
                     self.nplots = self.nrows
                     self.plots_adjust.update({'hspace':0.8, 'left': 0.1, 'bottom': 0.08, 'right':0.95, 'top': 0.95})
                 def update(self, dataOut):
                     data = {
-                        self.attr_data : getattr(dataOut, self.attr_data)
+                        'param' : numpy.concatenate([getattr(dataOut, attr) for attr in self.attr_data], axis=0)
                     }
                     meta = {}
                     # self.data.normalize_heights()
                     self.x = self.data.times
                     self.y = self.data.yrange
-                    self.z = self.data[self.attr_data]
+                    self.z = self.data['param']
                     self.z = numpy.ma.masked_invalid(self.z)

schainpy/model/graphics/jroplot_spectra.py +2 -2

                     for n, ax in enumerate(self.axes):
                         noise = data['noise'][n]
                         if self.CODE == 'spc_moments':
-                            mean = data['moments'][n, 2]
+                            mean = data['moments'][n, 1]
                         if ax.firsttime:
                             self.xmax = self.xmax if self.xmax else numpy.nanmax(x)
                             self.xmin = self.xmin if self.xmin else -self.xmax
                             self.figures[0].legend(ax.plt, labels, loc='center right')
                         else:
                             for i, line in enumerate(ax.plt):
-                                line.set_data(x, z[n, :, i])
+                                line.set_data(x, z[n, :, index[i]])
                         self.titles.append('CH {}'.format(n))

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