diff --git a/geomagio/Controller.py b/geomagio/Controller.py index b37031a18b7febf164ffe47a7814a00479e670f7..26e5d331f526fc550ad921350e7ab1cc5f820810 100644 --- a/geomagio/Controller.py +++ b/geomagio/Controller.py @@ -1,8 +1,6 @@ """Controller class for geomag algorithms""" import TimeseriesUtilities as TUtils -import numpy -import obspy class Controller(object): diff --git a/geomagio/TimeseriesFactory.py b/geomagio/TimeseriesFactory.py index 57a1423076fe1a61b457f9108190e00570002d17..22bd77cf1bf19f7b41db854191453d0ce026200e 100644 --- a/geomagio/TimeseriesFactory.py +++ b/geomagio/TimeseriesFactory.py @@ -1,7 +1,5 @@ """Abstract Timeseries Factory Interface.""" -import numpy.ma as ma -import obspy -import numpy + class TimeseriesFactory(object): """Base class for timeseries factories. diff --git a/geomagio/TimeseriesUtilities.py b/geomagio/TimeseriesUtilities.py index 744e5e710a745de6351955fd4ca078723c5ab8e7..2ea33df0ad69464c85f99db97f284be659bcbe42 100644 --- a/geomagio/TimeseriesUtilities.py +++ b/geomagio/TimeseriesUtilities.py @@ -1,8 +1,7 @@ """Timeseries Utilities""" -import numpy.ma as ma -import obspy import numpy + def get_timeseries_gaps(timeseries, channels, starttime, endtime): """Get gaps in a given timeseries Parameters @@ -68,6 +67,7 @@ def get_stream_gaps(stream, starttime, endtime): return gaps + def get_merged_gaps(gaps, channels): """Get gaps merged across channels/streams Parameters @@ -87,7 +87,6 @@ def get_merged_gaps(gaps, channels): Takes an dictionary of gaps, and merges those gaps across channels, returning an array of the merged gaps. """ - all_gaps = [] gap_stream = [] for channel in channels: gap_stream.extend(gaps[channel]) @@ -99,7 +98,7 @@ def get_merged_gaps(gaps, channels): merged_gaps = [] gap = sorted_gaps[0] - for i in range(1,len(sorted_gaps)): + for i in range(1, len(sorted_gaps)): nxtgap = sorted_gaps[i] if nxtgap[0] >= gap[0] and nxtgap[0] <= gap[1]: if nxtgap[1] > gap[1]: @@ -111,6 +110,7 @@ def get_merged_gaps(gaps, channels): return merged_gaps + def is_new_data(input_gaps, output_gaps): """Is new data available in gaps Parameters @@ -132,8 +132,9 @@ def is_new_data(input_gaps, output_gaps): return False return True + def gap_is_new_data(input_gaps, output_gap): - """Is new data available for a single gap + """Is new data available for a single gap Parameters ---------- input_gaps: array_like @@ -152,6 +153,7 @@ def gap_is_new_data(input_gaps, output_gap): return False return True + def get_seconds_of_interval(interval): """Gets number of seconds for a given interval string Parameters