From 786af505563b07cc4298aff1eba2ae8d11ca0b48 Mon Sep 17 00:00:00 2001
From: Hal Simpson <hasimpson@usgs.gov>
Date: Wed, 29 Apr 2015 10:31:32 -0600
Subject: [PATCH] misc changes
---
geomagio/WaveserverFactory.py | 5 +++--
geomagio/__init__.py | 1 +
geomagio/edge/__init__.py | 5 ++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/geomagio/WaveserverFactory.py b/geomagio/WaveserverFactory.py
index d088376c2..6951b45c6 100644
--- a/geomagio/WaveserverFactory.py
+++ b/geomagio/WaveserverFactory.py
@@ -14,7 +14,7 @@ class WaveserverFactory(object):
def __init__(self, host, port):
self.client = earthworm.Client(host, port)
- def getTimeseries(
+ def get_timeseries(
self, observatory, starttime, endtime,
channels=('MVH', 'MVE', 'MVZ'), location='R0', network='NT'):
"""
@@ -40,7 +40,8 @@ def main():
factory = WaveserverFactory('136.177.50.84', 2060)
starttime = UTCDateTime(2014, 6, 12, 5, 0, 0)
endtime = UTCDateTime(2014, 6, 12, 5, 30, 0)
- result = factory.getTimeseries('BOU', starttime, endtime, 'R0')
+ result = factory.get_timeseries('BOU', starttime=starttime,
+ endtime=endtime, location='R0')
# result += f.getTimeseries('BOU', starttime, endtime, 'R1')
result.plot()
diff --git a/geomagio/__init__.py b/geomagio/__init__.py
index 1f6c5db88..f33101557 100644
--- a/geomagio/__init__.py
+++ b/geomagio/__init__.py
@@ -6,6 +6,7 @@ import ChannelConverter
import StreamConverter
from TimeseriesFactory import TimeseriesFactory
from TimeseriesFactoryException import TimeseriesFactoryException
+from WaveserverFactory import WaveserverFactory
__all__ = [
'Algorithm',
diff --git a/geomagio/edge/__init__.py b/geomagio/edge/__init__.py
index bbb1d3c10..193d0192a 100644
--- a/geomagio/edge/__init__.py
+++ b/geomagio/edge/__init__.py
@@ -3,8 +3,11 @@
from EdgeFactory import EdgeFactory
from ObservatoryMetadata import ObservatoryMetadata
+from RawInputClient import RawInputClient
__all__ = [
'EdgeFactory',
- 'ObservatoryMetadata'
+
+ 'ObservatoryMetadata',
+ 'RawInputClient'
]
--
GitLab