From 879282657abc94621eac2680f8a4e89d97a02ddd Mon Sep 17 00:00:00 2001 From: marcel Date: Wed, 16 Aug 2017 15:13:55 +0200 Subject: [PATCH] [change] get comparison working with alparray/py3 --- pylot/core/pick/compare.py | 3 ++- pylot/core/util/pdf.py | 2 +- pylot/core/util/widgets.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pylot/core/pick/compare.py b/pylot/core/pick/compare.py index 9d382254..3dbd8541 100644 --- a/pylot/core/pick/compare.py +++ b/pylot/core/pick/compare.py @@ -8,6 +8,7 @@ import os import matplotlib.pyplot as plt import numpy as np from obspy import read_events +from obspy.core import AttribDict from pylot.core.io.phases import picksdict_from_picks from pylot.core.util.pdf import ProbabilityDensityFunction from pylot.core.util.utils import find_in_list @@ -31,7 +32,7 @@ class Comparison(object): for name, fn in kwargs.items(): if isinstance(fn, PDFDictionary): self._pdfs[name] = fn - elif isinstance(fn, dict): + elif isinstance(fn, dict) or isinstance(fn, AttribDict): self._pdfs[name] = PDFDictionary(fn) else: self._pdfs[name] = PDFDictionary.from_quakeml(fn) diff --git a/pylot/core/util/pdf.py b/pylot/core/util/pdf.py index 0ca37c65..de05727d 100644 --- a/pylot/core/util/pdf.py +++ b/pylot/core/util/pdf.py @@ -248,7 +248,7 @@ class ProbabilityDensityFunction(object): self._x = np.array(x) @classmethod - def from_pick(self, lbound, barycentre, rbound, incr=0.001, decfact=0.01, + def from_pick(self, lbound, barycentre, rbound, incr=0.1, decfact=0.01, type='exp'): ''' Initialize a new ProbabilityDensityFunction object. diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index b03002a9..77347459 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -127,7 +127,7 @@ class ComparisonDialog(QDialog): phasesComboBox=None, histCheckBox=None) self._phases = 'PS' - self._plotprops = dict(station=self.stations[0], phase=self.phases[0]) + self._plotprops = dict(station=list(self.stations)[0], phase=list(self.phases)[0]) super(ComparisonDialog, self).__init__(parent) self.setupUI() self.plotcomparison()