From 4ad4f359e3edbc89f623b3c7b65d4eb448935c04 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Mon, 6 Jun 2016 16:15:14 -0600
Subject: [PATCH] Update EdgeFactory to obspy 1.x api
---
geomagio/edge/EdgeFactory.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py
index e9e43c274..beda595df 100644
--- a/geomagio/edge/EdgeFactory.py
+++ b/geomagio/edge/EdgeFactory.py
@@ -15,7 +15,7 @@ import numpy
import numpy.ma
import obspy.core
from datetime import datetime
-from obspy import earthworm
+from obspy.clients import earthworm
from obspy.core import UTCDateTime
from .. import ChannelConverter, TimeseriesUtility
from ..TimeseriesFactory import TimeseriesFactory
@@ -530,7 +530,7 @@ class EdgeFactory(TimeseriesFactory):
type, interval)
edge_channel = self._get_edge_channel(observatory, channel,
type, interval)
- data = self.client.getWaveform(network, station, location,
+ data = self.client.get_waveforms(network, station, location,
edge_channel, starttime, endtime)
data.merge()
if data.count() == 0:
@@ -575,7 +575,7 @@ class EdgeFactory(TimeseriesFactory):
Parameters
----------
timeseries: obspy.core.stream
- The timeseries stream as returned by the call to getWaveform
+ The timeseries stream as returned by the call to get_waveforms
starttime: obspy.core.UTCDateTime
the starttime of the requested data
endtime: obspy.core.UTCDateTime
--
GitLab