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

[edit] changed calculation of difference pdf to include large differences also

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2016-06-14 14:28:46 +02:00
parent 4093dd0ce7
commit 073ed658b3
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pylot/core/util/pdf.py
View File

@ -142,7 +142,9 @@ class ProbabilityDensityFunction(object):
x0, incr, npts, pdf_self, pdf_other = self.rearrange(other) x0, incr, npts, pdf_self, pdf_other = self.rearrange(other)
pdf = np.correlate(pdf_self, pdf_other, 'same') * incr pdf = np.correlate(pdf_self, pdf_other, 'full') * incr
npts = len(pdf)
# shift axis values for correct plotting # shift axis values for correct plotting
midpoint = npts / 2 midpoint = npts / 2

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

@ -181,6 +181,9 @@ class ComparisonDialog(QDialog):
if name in self.widgets.keys(): if name in self.widgets.keys():
self._widgets[name] = widget self._widgets[name] = widget
def clf(self):
self.canvas.figure.clf()
def hasvalue(self, sender): def hasvalue(self, sender):
text = sender.currentText() text = sender.currentText()
index = sender.findText(text.upper()) index = sender.findText(text.upper())
@ -204,9 +207,9 @@ class ComparisonDialog(QDialog):
def plotcomparison(self): def plotcomparison(self):
from matplotlib import gridspec from matplotlib import gridspec
_axes = self.canvas.figure.add_subplot(111)
_gs = gridspec.GridSpec(3, 2) _gs = gridspec.GridSpec(3, 2)
self.clf()
_axes = self.canvas.figure.add_subplot(_gs[0:2, :]) _axes = self.canvas.figure.add_subplot(_gs[0:2, :])
_ax1 = self.canvas.figure.add_subplot(_gs[2, 0]) _ax1 = self.canvas.figure.add_subplot(_gs[2, 0])
_ax2 = self.canvas.figure.add_subplot(_gs[2, 1]) _ax2 = self.canvas.figure.add_subplot(_gs[2, 1])
@ -232,6 +235,7 @@ class ComparisonDialog(QDialog):
pdf_a = self.data.get('auto')[station][phase] pdf_a = self.data.get('auto')[station][phase]
pdf_m = self.data.get('manu')[station][phase] pdf_m = self.data.get('manu')[station][phase]
xauto, yauto, stdauto, expauto = pdf_a.axis, pdf_a.data, \ xauto, yauto, stdauto, expauto = pdf_a.axis, pdf_a.data, \
pdf_a.standard_deviation(), \ pdf_a.standard_deviation(), \
pdf_a.expectation() pdf_a.expectation()
@ -240,8 +244,23 @@ class ComparisonDialog(QDialog):
pdf_m.expectation() pdf_m.expectation()
_ax1.plot(xauto, yauto) _ax1.plot(xauto, yauto)
mannotation = "probability density for manual pick\n" \
"expectation: {exp}\n" \
"std: {std}".format(std=stdmanu, exp=expmanu)
_anno = _ax1.annotate(mannotation, xy=(.05, .5), xycoords='axes '
'fraction')
bbox_props = dict(boxstyle='round', facecolor='lightgrey', alpha=.7)
_anno.set_bbox(bbox_props)
_ax2.plot(xmanu, ymanu) _ax2.plot(xmanu, ymanu)
aannotation = "probability density for automatic pick\n" \
"expectation: {exp}\n" \
"std: {std}".format(std=stdauto, exp=expauto)
_anno = _ax2.annotate(aannotation, xy=(.05, .5), xycoords='axes '
'fraction')
bbox_props = dict(boxstyle='round', facecolor='lightgrey', alpha=.7)
_anno.set_bbox(bbox_props)
_gs.update(wspace=0.5, hspace=0.5) _gs.update(wspace=0.5, hspace=0.5)