From 52a465866cb024a1a7a580007db2c3a801ed405a Mon Sep 17 00:00:00 2001 From: root <pcain@usgs.gov> Date: Wed, 18 Aug 2021 21:19:05 +0000 Subject: [PATCH] configure host in fatory module --- geomagio/processing/factory.py | 25 ++++++++++--------------- geomagio/processing/obsrio.py | 3 ++- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/geomagio/processing/factory.py b/geomagio/processing/factory.py index d9a065497..6e741d469 100644 --- a/geomagio/processing/factory.py +++ b/geomagio/processing/factory.py @@ -5,23 +5,18 @@ from ..edge import EdgeFactory, MiniSeedFactory def get_edge_factory( - data_type="variation", interval="second", **kwargs + data_type="variation", + host=os.getenv("EDGE_HOST", "127.0.0.1"), + interval="second", + **kwargs ) -> TimeseriesFactory: - return EdgeFactory( - host=os.getenv("EDGE_HOST", "127.0.0.1"), - interval=interval, - type=data_type, - **kwargs - ) + return EdgeFactory(host=host, interval=interval, type=data_type, **kwargs) def get_miniseed_factory( - data_type="variation", interval="second", **kwargs + data_type="variation", + host=os.getenv("EDGE_HOST", "127.0.0.1"), + interval="second", + **kwargs ) -> TimeseriesFactory: - return MiniSeedFactory( - convert_channels=("U", "V", "W"), - host=os.getenv("EDGE_HOST", "127.0.0.1"), - interval=interval, - type=data_type, - **kwargs - ) + return MiniSeedFactory(host=host, interval=interval, type=data_type, **kwargs) diff --git a/geomagio/processing/obsrio.py b/geomagio/processing/obsrio.py index bf0acf2b8..880a77bec 100644 --- a/geomagio/processing/obsrio.py +++ b/geomagio/processing/obsrio.py @@ -314,7 +314,8 @@ def obsrio_tenhertz( """Filter 10Hz miniseed U,V,W to 1Hz legacy H,E,Z.""" starttime, endtime = get_realtime_interval(realtime_interval) controller = Controller( - inputFactory=input_factory or get_miniseed_factory(), + inputFactory=input_factory + or get_miniseed_factory(convert_channels=("U", "V", "W")), inputInterval="tenhertz", outputFactory=output_factory or get_edge_factory(), outputInterval="second", -- GitLab