marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[new] HUGE rearrangement of initial pick behavior (untested)

Browse Source 
- zooms on selected channels after initial pick
- ylims not relying on noiselevel anymore (better overview and not possible with more than one phase),
xlims now based on mean snr of all selected channels for initial pick instead of snr of one 'random' channel
This commit is contained in:
Marcel Paffrath 2018-01-16 16:06:24 +01:00
parent ec394d447d
commit c520c7c212
2 changed files with 77 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
a22e-dirty ec39-dirty

129
pylot/core/util/widgets.py
View File

@ -899,6 +899,22 @@ class PylotCanvas(FigureCanvas):
def clearPlotDict(self): def clearPlotDict(self):
self.plotdict = dict() self.plotdict = dict()
def calcPlotPositions(self, wfdata, compclass):
possible_plot_pos = list(range(len(wfdata)))
plot_positions = {}
for trace in wfdata:
comp = trace.stats.channel[-1]
plot_positions[trace.stats.channel] = compclass.getPlotPosition(str(comp))
for channel, plot_pos in plot_positions.items():
while not plot_pos in possible_plot_pos or not plot_pos - 1 in plot_positions.values():
if plot_pos == 0:
break
plot_pos -= 1
if plot_pos < 0:
raise Exception('Plot position lower zero. This should not happen.')
plot_positions[channel] = plot_pos
return plot_positions
def plotWFData(self, wfdata, title=None, zoomx=None, zoomy=None, def plotWFData(self, wfdata, title=None, zoomx=None, zoomy=None,
noiselevel=None, scaleddata=False, mapping=True, noiselevel=None, scaleddata=False, mapping=True,
component='*', nth_sample=1, iniPick=None, verbosity=0, component='*', nth_sample=1, iniPick=None, verbosity=0,
@ -925,9 +941,12 @@ class PylotCanvas(FigureCanvas):
else: else:
st_select = wfdata st_select = wfdata
# list containing tuples of network, station, channel (for sorting) if mapping:
plot_positions = self.calcPlotPositions(st_select, compclass)
# list containing tuples of network, station, channel and plot position (for sorting)
nsc = [] nsc = []
for trace in st_select: for plot_pos, trace in enumerate(st_select):
if not trace.stats.channel[-1] in ['Z', 'N', 'E', '1', '2', '3']: if not trace.stats.channel[-1] in ['Z', 'N', 'E', '1', '2', '3']:
print('Warning: Unrecognized channel {}'.format(trace.stats.channel)) print('Warning: Unrecognized channel {}'.format(trace.stats.channel))
continue continue
@ -942,9 +961,7 @@ class PylotCanvas(FigureCanvas):
st = st_select.select(network=network, station=station, channel=channel) st = st_select.select(network=network, station=station, channel=channel)
trace = st[0].copy() trace = st[0].copy()
if mapping: if mapping:
comp = channel[-1] n = plot_positions[trace.stats.channel]
n = compclass.getPlotPosition(str(comp))
# n = n[0]
if n > nmax: if n > nmax:
nmax = n nmax = n
if verbosity: if verbosity:
@ -968,9 +985,9 @@ class PylotCanvas(FigureCanvas):
data = [datum + n for index, datum in enumerate(trace.data) if not index % nth_sample] data = [datum + n for index, datum in enumerate(trace.data) if not index % nth_sample]
ax.plot(times, data, color=linecolor, linewidth=0.7) ax.plot(times, data, color=linecolor, linewidth=0.7)
if noiselevel is not None: if noiselevel is not None:
for level in noiselevel: for level in [-noiselevel[channel], noiselevel[channel]]:
ax.plot([time_ax[0], time_ax[-1]], ax.plot([time_ax[0], time_ax[-1]],
[level, level], [n+level, n+level],
color = linecolor, color = linecolor,
linestyle = 'dashed') linestyle = 'dashed')
self.setPlotDict(n, (station, channel, network)) self.setPlotDict(n, (station, channel, network))
@ -1945,6 +1962,7 @@ class PickDlg(QDialog):
# copy data for plotting # copy data for plotting
data = self.getWFData().copy() data = self.getWFData().copy()
data = self.getPickPhases(data, 'P') data = self.getPickPhases(data, 'P')
data.normalize(global_max=True)
if not data: if not data:
QtGui.QMessageBox.warning(self, 'No channel to plot', QtGui.QMessageBox.warning(self, 'No channel to plot',
'No channel to plot for phase: {}.'.format('P')) 'No channel to plot for phase: {}.'.format('P'))
@ -1963,36 +1981,41 @@ class PickDlg(QDialog):
'Denied', 'setIniPickP: Could not filter waveform: {}'.format(e)) 'Denied', 'setIniPickP: Could not filter waveform: {}'.format(e))
self.qmb.show() self.qmb.show()
result = getSNR(data, (noise_win, gap_win, signal_win), ini_pick - stime_diff, itrace)
snr = result[0] snr = []
noiselevel = result[2] noiselevels = {}
if noiselevel: # determine SNR and noiselevel
noiselevel *= nfac for trace in data.traces:
else: st = data.select(channel=trace.stats.channel)
noiselevel = nfac result = getSNR(st, (noise_win, gap_win, signal_win), ini_pick - stime_diff)
snr.append(result[0])
noiselevel = result[2]
if noiselevel:
noiselevel *= nfac
else:
noiselevel = nfac
noiselevels[trace.stats.channel] = noiselevel
x_res = getResolutionWindow(snr, parameter.get('extent')) # prepare plotting of data
# remove mean noise level from waveforms
for trace in data: for trace in data:
t = prepTimeAxis(trace.stats.starttime - stime, trace) t = prepTimeAxis(trace.stats.starttime - stime, trace)
inoise = getnoisewin(t, ini_pick, noise_win, gap_win) inoise = getnoisewin(t, ini_pick, noise_win, gap_win)
trace = demeanTrace(trace=trace, window=inoise) trace = demeanTrace(trace, inoise)
x_res = getResolutionWindow(np.mean(snr), parameter.get('extent'))
xlims = [ini_pick - x_res, ini_pick + x_res]
ylims = list(np.array([-.5, .5]) + [0, len(data)-1])
self.setXLims([ini_pick - x_res, ini_pick + x_res])
self.setYLims(np.array([-noiselevel * 3.5, noiselevel * 3.5]) +
trace_number)
plot_additional = bool(self.compareChannel.currentText()) plot_additional = bool(self.compareChannel.currentText())
additional_channel = self.compareChannel.currentText() additional_channel = self.compareChannel.currentText()
scale_channel = self.scaleChannel.currentText() scale_channel = self.scaleChannel.currentText()
self.multicompfig.plotWFData(wfdata=data, self.multicompfig.plotWFData(wfdata=data,
title=self.getStation() + title=self.getStation() +
' picking mode', ' picking mode',
zoomx=self.getXLims(), zoomx=xlims,
zoomy=self.getYLims(), zoomy=ylims,
noiselevel=(trace_number + noiselevel, noiselevel=noiselevels,
trace_number - noiselevel),
scaleddata=True, scaleddata=True,
iniPick=ini_pick, iniPick=ini_pick,
plot_additional=plot_additional, plot_additional=plot_additional,
@ -2016,6 +2039,7 @@ class PickDlg(QDialog):
# copy data for plotting # copy data for plotting
data = self.getWFData().copy() data = self.getWFData().copy()
data = self.getPickPhases(data, 'S') data = self.getPickPhases(data, 'S')
data.normalize(global_max=True)
if not data: if not data:
QtGui.QMessageBox.warning(self, 'No channel to plot', QtGui.QMessageBox.warning(self, 'No channel to plot',
'No channel to plot for phase: {}.'.format('S')) 'No channel to plot for phase: {}.'.format('S'))
@ -2034,43 +2058,42 @@ class PickDlg(QDialog):
'Denied', 'setIniPickS: Could not filter waveform: {}'.format(e)) 'Denied', 'setIniPickS: Could not filter waveform: {}'.format(e))
self.qmb.show() self.qmb.show()
# determine SNR and noiselevel snr = []
result = getSNR(wfdata, (noise_win, gap_win, signal_win), ini_pick - stime_diff) noiselevels = {}
snr = result[0] # determine SNR and noiselevel
noiselevel = result[2] for trace in data.traces:
st = data.select(channel=trace.stats.channel)
result = getSNR(st, (noise_win, gap_win, signal_win), ini_pick - stime_diff)
snr.append(result[0])
noiselevel = result[2]
if noiselevel:
noiselevel *= nfac
else:
noiselevel = nfac
noiselevels[trace.stats.channel] = noiselevel
if noiselevel: # prepare plotting of data
noiselevel *= nfac for trace in data:
else: t = prepTimeAxis(trace.stats.starttime - stime, trace)
noiselevel = nfac inoise = getnoisewin(t, ini_pick, noise_win, gap_win)
trace = demeanTrace(trace, inoise)
# prepare plotting of data
for trace in data:
t = prepTimeAxis(trace.stats.starttime - stime, trace)
inoise = getnoisewin(t, ini_pick, noise_win, gap_win)
trace = demeanTrace(trace, inoise)
# scale waveform for plotting # scale waveform for plotting
horiz_comp = find_horizontals(data) #horiz_comp = find_horizontals(data)
data = scaleWFData(data, noiselevel * 2.5, horiz_comp) #data = scaleWFData(data, noiselevel * 2.5, horiz_comp)
x_res = getResolutionWindow(snr, parameter.get('extent')) x_res = getResolutionWindow(np.mean(snr), parameter.get('extent'))
self.setXLims(tuple([ini_pick - x_res, ini_pick + x_res])) xlims = [ini_pick - x_res, ini_pick + x_res]
traces = self.getTraceID(horiz_comp) ylims = list(np.array([-.5, .5]) + [0, len(data) - 1])
traces.sort()
self.setYLims(tuple(np.array([-1.0, +1.0]) +
np.array(traces)))
noiselevels = [trace + 1 / (2.5 * 2) for trace in traces] + \
[trace - 1 / (2.5 * 2) for trace in traces]
plot_additional = bool(self.compareChannel.currentText()) plot_additional = bool(self.compareChannel.currentText())
additional_channel = self.compareChannel.currentText() additional_channel = self.compareChannel.currentText()
self.multicompfig.plotWFData(wfdata=data, self.multicompfig.plotWFData(wfdata=data,
title=self.getStation() + title=self.getStation() +
' picking mode', ' picking mode',
zoomx=self.getXLims(), zoomx=xlims,
zoomy=self.getYLims(), zoomy=ylims,
noiselevel=noiselevels, noiselevel=noiselevels,
scaleddata=True, scaleddata=True,
iniPick=ini_pick, iniPick=ini_pick,
@ -2535,8 +2558,8 @@ class PickDlg(QDialog):
# set channel labels # set channel labels
self.multicompfig.setYTickLabels(pos, labels) self.multicompfig.setYTickLabels(pos, labels)
self.multicompfig.setXLims(ax, self.getXLims()) #self.multicompfig.setXLims(ax, self.getXLims())
self.multicompfig.setYLims(ax, self.getYLims()) #self.multicompfig.setYLims(ax, self.getYLims())
def zoom(self): def zoom(self):
if self.zoomAction.isChecked() and self.pick_block: if self.zoomAction.isChecked() and self.pick_block: