From aeee2006ef4b00d024377b2cfcc5a262dafa046e Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Wed, 16 Sep 2020 13:49:49 -0600
Subject: [PATCH 1/3] Match interval names between algorithms and
RawInputClient
---
geomagio/edge/RawInputClient.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/geomagio/edge/RawInputClient.py b/geomagio/edge/RawInputClient.py
index 20c29acfd..be41d03ca 100644
--- a/geomagio/edge/RawInputClient.py
+++ b/geomagio/edge/RawInputClient.py
@@ -181,11 +181,11 @@ class RawInputClient:
nsamp = DAYMINUTES
timeoffset = 60
samplerate = 1.0 / 60
- elif interval == "hourly":
+ elif interval == "hour":
nsamp = MAXINPUTSIZE
timeoffset = 3600
samplerate = 1.0 / 3600
- elif interval == "daily":
+ elif interval == "day":
nsamp = MAXINPUTSIZE
timeoffset = 86400
samplerate = 1.0 / 86400
--
GitLab
From 0ae6401d9594a711ea0ecdc9350dd75383a5eafb Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Wed, 16 Sep 2020 13:58:32 -0600
Subject: [PATCH 2/3] Change comments
---
geomagio/edge/RawInputClient.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geomagio/edge/RawInputClient.py b/geomagio/edge/RawInputClient.py
index be41d03ca..f50a93cd2 100644
--- a/geomagio/edge/RawInputClient.py
+++ b/geomagio/edge/RawInputClient.py
@@ -160,7 +160,7 @@ class RawInputClient:
PARAMETERS
----------
- interval: {'daily', 'hourly', 'minute', 'second'}
+ interval: {'day', 'hour', 'minute', 'second'}
data interval.
trace: obspy.core.trace
--
GitLab
From 64a8f613a66f2c077f49e542252e7a633e01ea70 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Fri, 18 Sep 2020 11:45:14 -0600
Subject: [PATCH 3/3] Update interval names in Timeseries Factory
---
geomagio/ObservatoryMetadata.py | 2 +-
geomagio/PlotTimeseriesFactory.py | 2 +-
geomagio/TimeseriesFactory.py | 19 ++++++++++---------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/geomagio/ObservatoryMetadata.py b/geomagio/ObservatoryMetadata.py
index deac24f23..add0c6355 100644
--- a/geomagio/ObservatoryMetadata.py
+++ b/geomagio/ObservatoryMetadata.py
@@ -619,7 +619,7 @@ DEFAULT_METADATA = {
"data_interval_type": "1-minute calculated",
"filter_comments": [],
},
- "hourly": {"data_interval_type": "1-hour calculated"},
+ "hour": {"data_interval_type": "1-hour calculated"},
},
},
"BLC": {
diff --git a/geomagio/PlotTimeseriesFactory.py b/geomagio/PlotTimeseriesFactory.py
index a892b5e03..7cfa3677b 100644
--- a/geomagio/PlotTimeseriesFactory.py
+++ b/geomagio/PlotTimeseriesFactory.py
@@ -50,7 +50,7 @@ class PlotTimeseriesFactory(TimeseriesFactory):
type : {'definitive', 'provisional', 'quasi-definitive', 'variation'}
data type, optional.
uses default if unspecified.
- interval : {'daily', 'hourly', 'minute', 'monthly', 'second'}
+ interval : {'day', 'hour', 'minute', 'month', 'second'}
data interval, optional.
uses default if unspecified.
Raises
diff --git a/geomagio/TimeseriesFactory.py b/geomagio/TimeseriesFactory.py
index 99af57bac..7446f81ee 100644
--- a/geomagio/TimeseriesFactory.py
+++ b/geomagio/TimeseriesFactory.py
@@ -31,7 +31,7 @@ class TimeseriesFactory(object):
type : {'definitive', 'provisional', 'quasi-definitive', 'variation'}
default data type, optional.
default 'variation'.
- interval : {'daily', 'hourly', 'minute', 'monthly', 'second'}
+ interval : {'day', 'hour', 'minute', 'month, 'second'}
data interval, optional.
default 'minute'.
urlTemplate : str
@@ -90,7 +90,7 @@ class TimeseriesFactory(object):
type : {'definitive', 'provisional', 'quasi-definitive', 'variation'}
data type, optional.
uses default if unspecified.
- interval : {'daily', 'hourly', 'minute', 'monthly', 'second'}
+ interval : {'day', 'hour', 'minute', 'month', 'second'}
data interval, optional.
uses default if unspecified.
@@ -196,7 +196,7 @@ class TimeseriesFactory(object):
type : {'definitive', 'provisional', 'quasi-definitive', 'variation'}
data type, optional.
uses default if unspecified.
- interval : {'daily', 'hourly', 'minute', 'monthly', 'second'}
+ interval : {'day', 'hour', 'minute', 'month', 'second'}
data interval, optional.
uses default if unspecified.
Raises
@@ -339,7 +339,7 @@ class TimeseriesFactory(object):
type : {'variation', 'reported', 'provisional', 'adjusted',
'quasi-definitive', 'definitive'}
data type.
- interval : {'minute', 'second', 'hourly', 'daily'}
+ interval : {'minute', 'second', 'hour', 'day'}
data interval.
channels : list
list of data channels being requested
@@ -384,7 +384,7 @@ class TimeseriesFactory(object):
Parameters
----------
- interval : {'daily', 'hourly', 'minute', 'monthly', 'second'}
+ interval : {'day', 'hour', 'minute', 'month', 'second'}
Returns
-------
@@ -395,14 +395,15 @@ class TimeseriesFactory(object):
TimeseriesFactoryException
if ``interval`` is not supported.
"""
+
interval_abbr = None
- if interval == "daily":
+ if interval == "day":
interval_abbr = "day"
- elif interval == "hourly":
+ elif interval == "hour":
interval_abbr = "hor"
elif interval == "minute":
interval_abbr = "min"
- elif interval == "monthly":
+ elif interval == "month":
interval_abbr = "mon"
elif interval == "second":
interval_abbr = "sec"
@@ -433,7 +434,7 @@ class TimeseriesFactory(object):
interval_name = "OneMinute"
elif interval == "second":
interval_name = "OneSecond"
- elif interval == "hourly":
+ elif interval == "hour":
interval_name = "OneHour"
else:
raise TimeseriesFactoryException('Unsupported interval "%s"' % interval)
--
GitLab