From 2e7a766f478802593c5906e135a7d55ca894bcda Mon Sep 17 00:00:00 2001
From: "E. Joshua Rigler" <erigler@usgs.gov>
Date: Tue, 4 Feb 2025 15:36:32 -0700
Subject: [PATCH] Use EdgeFactory for all but tenhertz data: - assumes updates
to filters.py, EdgeFactory, and MiniSeedFactory included in this feature
branch - removes default ports in favor of factory defaults - tenhertz data
will still use MiniSeedFactory, and if channels "U", "V", or "W" are
requested, the raw voltage and bin data will be used to calculate nT outputs
---
geomagio/api/ws/data.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/geomagio/api/ws/data.py b/geomagio/api/ws/data.py
index c2bc9227..47971b27 100644
--- a/geomagio/api/ws/data.py
+++ b/geomagio/api/ws/data.py
@@ -40,16 +40,17 @@ def get_data_factory(
factory = FDSNFactory(network=observatory.network, locationCode="40")
elif sampling_period in [
SamplingPeriod.TEN_HERTZ,
- SamplingPeriod.HOUR,
- SamplingPeriod.DAY,
]:
+ # MiniSeedFactory required for floating point data;
+ # MiniSeedFactory advised for 10 Hz sampling in general
factory = MiniSeedFactory(
- host=host, port=int(os.getenv("DATA_MINISEED_PORT", "2061"))
- )
- elif sampling_period in [SamplingPeriod.SECOND, SamplingPeriod.MINUTE]:
- factory = EdgeFactory(
- host=host, port=int(os.getenv("DATA_EARTHWORM_PORT", "2060"))
+ host=host,
+ port=os.getenv("DATA_MINISEED_PORT", None),
+ convert_channels=["U", "V", "W"], # no channel mapping (e.g., "H"->"U")
)
+ elif sampling_period in list(SamplingPeriod):
+ # EdgeFactory required for real time data with long sample periods
+ factory = EdgeFactory(host=host, port=os.getenv("DATA_EARTHWORM_PORT", None))
else:
return None
return DerivedTimeseriesFactory(factory)
--
GitLab