From 7a25e5187d85e9126b91c730f31de8ed1585e90f Mon Sep 17 00:00:00 2001
From: pcain <pcain@usgs.gov>
Date: Mon, 23 Aug 2021 16:47:47 +0000
Subject: [PATCH] stream type hint, metadata after filtering
---
geomagio/DerivedTimeseriesFactory.py | 4 ++--
geomagio/TimeseriesFactory.py | 2 +-
geomagio/edge/EdgeFactory.py | 2 +-
geomagio/edge/MiniSeedFactory.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/geomagio/DerivedTimeseriesFactory.py b/geomagio/DerivedTimeseriesFactory.py
index c2a4fca2b..c722bf312 100644
--- a/geomagio/DerivedTimeseriesFactory.py
+++ b/geomagio/DerivedTimeseriesFactory.py
@@ -63,6 +63,8 @@ class DerivedTimeseriesFactory(TimeseriesFactory):
data_type=type,
interval=interval,
)
+ # file-based factories return all channels found in file
+ timeseries = Stream([t for t in timeseries if t.stats.channel in channels])
for channel in channels:
self.factory._set_metadata(
stream=timeseries.select(channel=channel),
@@ -71,8 +73,6 @@ class DerivedTimeseriesFactory(TimeseriesFactory):
type=type,
interval=interval,
)
- # file-based factories return all channels found in file
- timeseries = Stream([t for t in timeseries if t.stats.channel in channels])
return timeseries
def _get_derived_channels(
diff --git a/geomagio/TimeseriesFactory.py b/geomagio/TimeseriesFactory.py
index 38b89d448..3d92f9c58 100644
--- a/geomagio/TimeseriesFactory.py
+++ b/geomagio/TimeseriesFactory.py
@@ -533,7 +533,7 @@ class TimeseriesFactory(object):
def _set_metadata(
self,
- stream: obspy.core.Trace,
+ stream: obspy.core.Stream,
observatory: str,
channel: str,
type: str,
diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py
index 43ad19524..c25955fe1 100644
--- a/geomagio/edge/EdgeFactory.py
+++ b/geomagio/edge/EdgeFactory.py
@@ -470,7 +470,7 @@ class EdgeFactory(TimeseriesFactory):
def _set_metadata(
self,
- stream: obspy.core.Trace,
+ stream: obspy.core.Stream,
observatory: str,
channel: str,
type: str,
diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index 7208e36e1..94103caee 100644
--- a/geomagio/edge/MiniSeedFactory.py
+++ b/geomagio/edge/MiniSeedFactory.py
@@ -502,7 +502,7 @@ class MiniSeedFactory(TimeseriesFactory):
def _set_metadata(
self,
- stream: obspy.core.Trace,
+ stream: obspy.core.Stream,
observatory: str,
channel: str,
type: str,
--
GitLab