diff --git a/geomagio/processing/obsrio.py b/geomagio/processing/obsrio.py index 880a77beceff1898ccdef3bb00940af14ef58e32..3a6182037bb2fef08dcda3a60edc3541df96827b 100644 --- a/geomagio/processing/obsrio.py +++ b/geomagio/processing/obsrio.py @@ -3,7 +3,6 @@ from typing import Optional import typer from ..algorithm import Algorithm, FilterAlgorithm -from ..edge import EdgeFactory, MiniSeedFactory from ..Controller import ( Controller, get_realtime_interval, @@ -45,8 +44,8 @@ def obsrio_filter( update_limit=update_limit, ) elif interval in ["hour", "day"]: - input_factory = EdgeFactory(host=host, port=port) - output_factory = MiniSeedFactory( + input_factory = get_edge_factory(host=host, port=port) + output_factory = get_miniseed_factory( host=host, port=output_read_port, write_port=output_port ) if interval == "hour": @@ -87,15 +86,15 @@ def filter_realtime( """Filter 10Hz miniseed, 1 second, one minute, and temperature data. Defaults set for realtime processing; can also be implemented to update legacy data""" if input_factory == "miniseed": - input_factory = MiniSeedFactory(host=host, port=port) + input_factory = get_miniseed_factory(host=host, port=port) elif input_factory == "edge": - input_factory = EdgeFactory(host=host, port=port) + input_factory = get_edge_factory(host=host, port=port) if output_factory == "miniseed": - output_factory = MiniSeedFactory( + output_factory = get_miniseed_factory( host=host, port=output_read_port, write_port=output_port ) elif output_factory == "edge": - output_factory = EdgeFactory( + output_factory = get_edge_factory( host=host, port=output_read_port, write_port=output_port ) @@ -173,7 +172,7 @@ def obsrio_hour( realtime_interval: int = 600, update_limit: int = 10, ): - """Filter 1 second edge H,E,Z,F to 1 hour miniseed U,V,W,F.""" + """Filter 1 minute edge H,E,Z,F to 1 hour miniseed U,V,W,F.""" starttime, endtime = get_realtime_interval(realtime_interval) controller = Controller( inputFactory=input_factory or get_edge_factory(),