From 494a83e05e5793749b59f9a65abc93cb2bb556cb Mon Sep 17 00:00:00 2001
From: pcain <pcain@usgs.gov>
Date: Thu, 2 Sep 2021 10:34:13 -0600
Subject: [PATCH 1/2] use factory module for hour/day factories
---
geomagio/processing/obsrio.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/geomagio/processing/obsrio.py b/geomagio/processing/obsrio.py
index 880a77bec..bba6234f6 100644
--- a/geomagio/processing/obsrio.py
+++ b/geomagio/processing/obsrio.py
@@ -45,8 +45,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":
@@ -173,7 +173,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(),
--
GitLab
From f8cda2b6b1f0d75282ceb19186347957b6f684a9 Mon Sep 17 00:00:00 2001
From: pcain <pcain@usgs.gov>
Date: Thu, 2 Sep 2021 11:17:13 -0600
Subject: [PATCH 2/2] update realtime_filter factories
---
geomagio/processing/obsrio.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/geomagio/processing/obsrio.py b/geomagio/processing/obsrio.py
index bba6234f6..3a6182037 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,
@@ -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
)
--
GitLab