schain-jc Commit - r1207:15feaa6e0b57

Fix SpectralMoments Plot

Juan C. Espinoza -

r1207:15feaa6e0b57

parent child

Context file:

r1207:15feaa6e0b57

Collapse all files

schainpy/model/data/jrodata.py +8 -3

                     for plot in self.plottypes:
                         if 'snr' in plot:
                             plot = 'snr'
+                        elif 'spc_moments' == plot:
+                            plot = 'moments'
                         self.data[plot] = {}
-                    if 'spc' in self.data or 'rti' in self.data or 'cspc' in self.data:
+                    if 'spc' in self.data or 'rti' in self.data or 'cspc' in self.data or 'moments' in self.data:
                         self.data['noise'] = {}
                         if 'noise' not in self.plottypes:
                             self.plottypes.append('noise')
                     self.channels = dataOut.channelList
                     self.interval = dataOut.getTimeInterval()
                     self.localtime = dataOut.useLocalTime
-                    if 'spc' in self.plottypes or 'cspc' in self.plottypes:
+                    if 'spc' in self.plottypes or 'cspc' in self.plottypes or 'spc_moments' in self.plottypes:
                         self.xrange = (dataOut.getFreqRange(1)/1000.,
                                        dataOut.getAcfRange(1), dataOut.getVelRange(1))
                         self.factor = dataOut.normFactor
                     self.__times.append(tm)
                     for plot in self.plottypes:
-                        if plot == 'spc':
+                        if plot in ('spc', 'spc_moments'):
                             z = dataOut.data_spc/dataOut.normFactor
                             buffer = 10*numpy.log10(z)
                         if plot == 'cspc':
                         elif plot == 'cspc':
                             self.data['spc'] = buffer[0]
                             self.data['cspc'] = buffer[1]
+                        elif plot == 'spc_moments':
+                            self.data['spc'] = buffer
+                            self.data['moments'][tm] = dataOut.moments
                         else:
                             if self.buffering:
                                 self.data[plot][tm] = buffer

schainpy/model/graphics/jroplot_data.py +8 -9

                         x = self.data.xrange[2]
                         self.xlabel = "Velocity (m/s)"
-                    if self.CODE == 'spc_mean':
+                    if self.CODE == 'spc_moments':
                         x = self.data.xrange[2]
                         self.xlabel = "Velocity (m/s)"
                     for n, ax in enumerate(self.axes):
                         noise = self.data['noise'][n][-1]
-                        if self.CODE == 'spc_mean':
+                        if self.CODE == 'spc_moments':
-                            mean = self.data['mean'][n][-1]
+                            mean = self.data['moments'][n, :, 1, :][-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.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':
+                            if self.CODE == 'spc_moments':
                                 ax.plt_mean = ax.plot(mean, y, color='k')[0]
                         else:
                             ax.plt.set_array(z[n].T.ravel())
                             if self.showprofile:
                                 ax.plt_profile.set_data(self.data['rti'][n][-1], y)
                                 ax.plt_noise.set_data(numpy.repeat(noise, len(y)), y)
-                            if self.CODE == 'spc_mean':
+                            if self.CODE == 'spc_moments':
                                 ax.plt_mean.set_data(mean, y)
                         self.titles.append('CH {}: {:3.2f}dB'.format(n, noise))
                         self.titles.append('Phase CH{} * CH{}'.format(pair[0], pair[1]))
-            class SpectraMeanPlot(SpectraPlot):
+            class SpectralMomentsPlot(SpectraPlot):
                 '''
-                Plot for Spectra and Mean
+                Plot for Spectral Moments
                 '''
-                CODE = 'spc_mean'
+                CODE = 'spc_moments'
                 colormap = 'jro'

schainpy/model/graphics/jroplot_parameters.py 0 0

NO CONTENT: modified file

schainpy/model/graphics/jroplot_spectra.py +1 0

                     return dataOut
             @MPDecorator
             class CrossSpectraPlot_(Figure):

schainpy/model/graphics/mpldriver.py +1 -31

@@ -2,37 +2,7 import os
2	import sys	2	import sys
3	import datetime	3	import datetime
4	import numpy	4	import numpy
5	import matplotlib	5	from .jroplot_base import matplotlib, make_axes_locatable, FuncFormatter, LinearLocator
6
7	if 'BACKEND' in os.environ:
8	matplotlib.use(os.environ['BACKEND'])
9	elif 'linux' in sys.platform:
10	matplotlib.use("TkAgg")
11	elif 'darwin' in sys.platform:
12	matplotlib.use('TkAgg')
13	else:
14	from schainpy.utils import log
15	log.warning('Using default Backend="Agg"', 'INFO')
16	matplotlib.use('Agg')
17	# Qt4Agg', 'GTK', 'GTKAgg', 'ps', 'agg', 'cairo', 'MacOSX', 'GTKCairo', 'WXAgg', 'template', 'TkAgg', 'GTK3Cairo', 'GTK3Agg', 'svg', 'WebAgg', 'CocoaAgg', 'emf', 'gdk', 'WX'
18	import matplotlib.pyplot
19
20	from mpl_toolkits.axes_grid1 import make_axes_locatable
21	from matplotlib.ticker import FuncFormatter, LinearLocator
22
23	###########################################
24	# Actualizacion de las funciones del driver
25	###########################################
26
27	# create jro colormap
28
29	jet_values = matplotlib.pyplot.get_cmap("jet", 100)(numpy.arange(100))[10:90]
30	blu_values = matplotlib.pyplot.get_cmap(
31	"seismic_r", 20)(numpy.arange(20))[10:15]
32	ncmap = matplotlib.colors.LinearSegmentedColormap.from_list(
33	"jro", numpy.vstack((blu_values, jet_values)))
34	matplotlib.pyplot.register_cmap(cmap=ncmap)
35
36		6
37	def createFigure(id, wintitle, width, height, facecolor="w", show=True, dpi=80):	7	def createFigure(id, wintitle, width, height, facecolor="w", show=True, dpi=80):
38		8

schainpy/model/proc/jroproc_parameters.py 0 0

NO CONTENT: modified file

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