diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py index dd8e13866d480cd8634418fabea32f14f536605a..9b672df4d95b40abdba97306be47d1f37bdd8d7d 100644 --- a/geomagio/edge/EdgeFactory.py +++ b/geomagio/edge/EdgeFactory.py @@ -51,7 +51,7 @@ class EdgeFactory(TimeseriesFactory): type: str the data type {variation, quasi-definitive, definitive} interval: str - the data interval {daily, hourly, minute, second} + the data interval {day, hour, minute, second} observatoryMetadata: ObservatoryMetadata object an ObservatoryMetadata object used to replace the default ObservatoryMetadata. @@ -115,7 +115,7 @@ class EdgeFactory(TimeseriesFactory): list of channels to load type: {'variation', 'quasi-definitive', 'definitive'} data type. - interval: {'daily', 'hourly', 'minute', 'second'} + interval: {'day', 'hour', 'minute', 'second', 'tenhertz'} data interval. Returns @@ -175,7 +175,7 @@ class EdgeFactory(TimeseriesFactory): list of channels to load type: {'variation', 'quasi-definitive', 'definitive'} data type. - interval: {'daily', 'hourly', 'minute', 'second'} + interval: {'day', 'hour', 'minute', 'second', 'tenhertz'} data interval. Notes @@ -427,9 +427,9 @@ class EdgeFactory(TimeseriesFactory): interval type """ interval_code = None - if interval == 'daily': + if interval == 'day': interval_code = 'D' - elif interval == 'hourly': + elif interval == 'hour': interval_code = 'H' elif interval == 'minute': interval_code = 'M' @@ -530,7 +530,7 @@ class EdgeFactory(TimeseriesFactory): channel to load type: {'variation', 'quasi-definitive', 'definitive'} data type. - interval: {'daily', 'hourly', 'minute', 'second'} + interval: {'day', 'hour', 'minute', 'second', 'tenhertz'} data interval. starttime: obspy.core.UTCDateTime endtime: obspy.core.UTCDateTime diff --git a/test/edge_test/EdgeFactory_test.py b/test/edge_test/EdgeFactory_test.py index e0b14e0e803e52de250db196d9eab653a3ec2080..e7a731d3446c75853f94bcd57ff6fed185f7d470 100644 --- a/test/edge_test/EdgeFactory_test.py +++ b/test/edge_test/EdgeFactory_test.py @@ -58,8 +58,8 @@ def test__get_edge_location(): def test__get_interval_code(): """edge_test.EdgeFactory_test.test__get_interval_code() """ - assert_equals(EdgeFactory()._get_interval_code('daily'), 'D') - assert_equals(EdgeFactory()._get_interval_code('hourly'), 'H') + assert_equals(EdgeFactory()._get_interval_code('day'), 'D') + assert_equals(EdgeFactory()._get_interval_code('hour'), 'H') assert_equals(EdgeFactory()._get_interval_code('minute'), 'M') assert_equals(EdgeFactory()._get_interval_code('second'), 'S')