From 15655dd787bd54e10c1663e3883457790e05b6a4 Mon Sep 17 00:00:00 2001
From: pcain <pcain@usgs.gov>
Date: Wed, 18 Aug 2021 21:56:31 +0000
Subject: [PATCH] removed unused methods from derived module
---
geomagio/processing/__init__.py | 4 +-
.../processing/{observatory.py => derived.py} | 84 -------------------
2 files changed, 1 insertion(+), 87 deletions(-)
rename geomagio/processing/{observatory.py => derived.py} (66%)
diff --git a/geomagio/processing/__init__.py b/geomagio/processing/__init__.py
index be97cfbd5..77f23254b 100644
--- a/geomagio/processing/__init__.py
+++ b/geomagio/processing/__init__.py
@@ -4,20 +4,18 @@ Note that these implementations are subject to change,
and should be considered less stable than other packages in the library.
"""
from .factory import get_edge_factory, get_miniseed_factory
-from .observatory import adjusted, average, deltaf, rotate, sqdist_minute
+from .derived import adjusted, average, sqdist_minute
from .obsrio import obsrio_minute, obsrio_second, obsrio_temperatures, obsrio_tenhertz
__all__ = [
"adjusted",
"average",
- "deltaf",
"get_edge_factory",
"get_miniseed_factory",
"obsrio_minute",
"obsrio_second",
"obsrio_temperatures",
"obsrio_tenhertz",
- "rotate",
"sqdist_minute",
]
diff --git a/geomagio/processing/observatory.py b/geomagio/processing/derived.py
similarity index 66%
rename from geomagio/processing/observatory.py
rename to geomagio/processing/derived.py
index 85a9cfd7f..04161aaad 100644
--- a/geomagio/processing/observatory.py
+++ b/geomagio/processing/derived.py
@@ -5,9 +5,7 @@ import numpy
from ..algorithm import (
AdjustedAlgorithm,
AverageAlgorithm,
- DeltaFAlgorithm,
SqDistAlgorithm,
- XYZAlgorithm,
)
from ..Controller import Controller, get_realtime_interval
from ..TimeseriesFactory import TimeseriesFactory
@@ -111,88 +109,6 @@ def average(
)
-def deltaf(
- observatory: str,
- input_factory: Optional[TimeseriesFactory] = None,
- interval: str = "second",
- output_factory: Optional[TimeseriesFactory] = None,
- deltaf_from="obs",
- realtime_interval: int = 600,
-):
- """Run Delta-F algorithm.
-
- Parameters
- ----------
- observatory: observatory to calculate
- input_factory: where to read, should be configured with data_type and interval
- output_factory: where to write, should be configured with data_type and interval
- deltaf_from: one of {"obs", "mag", "geo"}
- realtime_interval: window in seconds
-
- Uses update_limit=10.
- """
- starttime, endtime = get_realtime_interval(realtime_interval)
- controller = Controller(
- algorithm=DeltaFAlgorithm(informat=deltaf_from),
- inputFactory=input_factory or get_edge_factory(),
- inputInterval=interval,
- outputFactory=output_factory or get_edge_factory(),
- outputInterval=interval,
- )
- controller.run_as_update(
- observatory=(observatory,),
- output_observatory=(observatory,),
- starttime=starttime,
- endtime=endtime,
- output_channels=("G",),
- realtime=realtime_interval,
- update_limit=10,
- )
-
-
-def rotate(
- observatory: str,
- input_factory: Optional[TimeseriesFactory] = None,
- interval: str = "second",
- output_channels=("X", "Y"),
- output_factory: Optional[TimeseriesFactory] = None,
- realtime_interval: int = 600,
- xyz_from="obs",
- xyz_to="geo",
-):
- """Run XYZ rotation algorithm.
-
- Parameters
- ----------
- observatory: observatory to calculate
- input_factory: where to read, should be configured with data_type and interval
- output_channels: which channels to write
- output_factory: where to write, should be configured with data_type and interval
- realtime_interval: window in seconds
- xyz_from: one of {"obs", "mag", "geo"}
- xyz_to: one of {"obs", "obsd", "mag", "geo"}
-
- Uses update_limit=10.
- """
- starttime, endtime = get_realtime_interval(realtime_interval)
- controller = Controller(
- algorithm=XYZAlgorithm(informat=xyz_from, outformat=xyz_to),
- inputFactory=input_factory or get_edge_factory(),
- inputInterval=interval,
- outputFactory=output_factory or get_edge_factory(),
- outputInterval=interval,
- )
- controller.run_as_update(
- observatory=(observatory,),
- output_observatory=(observatory,),
- starttime=starttime,
- endtime=endtime,
- output_channels=output_channels,
- realtime=realtime_interval,
- update_limit=10,
- )
-
-
def sqdist_minute(
observatory: str,
statefile: str,
--
GitLab