From 9cd224bda0fd142f21c8b2bff0bb781a055659a8 Mon Sep 17 00:00:00 2001 From: Jeremy Fee <jmfee@usgs.gov> Date: Thu, 5 Dec 2019 16:02:07 -0700 Subject: [PATCH] Support tenhertz, update interval names --- geomagio/TimeseriesUtility.py | 8 +++++--- geomagio/edge/MiniSeedFactory.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py index 7a316ae24..046c10d3f 100644 --- a/geomagio/TimeseriesUtility.py +++ b/geomagio/TimeseriesUtility.py @@ -35,13 +35,15 @@ def create_empty_trace(starttime, endtime, observatory, obspy.core.Trace trace for the requested channel """ - if interval == 'second': + if interval == 'tenhertz': + delta = 0.1 + elif interval == 'second': delta = 1. elif interval == 'minute': delta = 60. - elif interval == 'hourly': + elif interval == 'hour': delta = 3600. - elif interval == 'daily': + elif interval == 'day': delta = 86400. stats = obspy.core.Stats() stats.network = network diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py index e9e4367af..a6ce76c98 100644 --- a/geomagio/edge/MiniSeedFactory.py +++ b/geomagio/edge/MiniSeedFactory.py @@ -387,7 +387,7 @@ class MiniSeedFactory(TimeseriesFactory): location_suffix = 'Q' elif suffix == 'SV': location_suffix = 'V' - else: + elif suffix not in ('Bin', 'Volt'): raise TimeseriesFactoryException( 'bad channel suffix "%s", wanted "Dist", "SQ", or "SV"' % suffix) -- GitLab