From b0fe3c3fa6814db9b97f6ad3e51886e196727288 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Fri, 8 May 2020 11:53:08 -0600
Subject: [PATCH] Add inchannels and outchannels parameters to
AdjustedAlgorithm
---
geomagio/algorithm/AdjustedAlgorithm.py | 56 ++++++++++++-------
test/algorithm_test/AdjustedAlgorithm_test.py | 8 ++-
2 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/geomagio/algorithm/AdjustedAlgorithm.py b/geomagio/algorithm/AdjustedAlgorithm.py
index 70f908afb..e2cdd4b0a 100644
--- a/geomagio/algorithm/AdjustedAlgorithm.py
+++ b/geomagio/algorithm/AdjustedAlgorithm.py
@@ -21,16 +21,18 @@ class AdjustedAlgorithm(Algorithm):
statefile=None,
data_type=None,
location=None,
+ inchannels=None,
+ outchannels=None,
):
- Algorithm.__init__(
- self, inchannels=("H", "E", "Z", "F"), outchannels=("X", "Y", "Z", "F")
- )
+ Algorithm.__init__(self, inchannels=None, outchannels=None)
# state variables
self.matrix = matrix
self.pier_correction = pier_correction
self.statefile = statefile
self.data_type = data_type
self.location = location
+ self.inchannels = inchannels
+ self.outchannels = outchannels
if matrix is None:
self.load_state()
@@ -141,22 +143,29 @@ class AdjustedAlgorithm(Algorithm):
"""
out = None
-
- h = stream.select(channel="H")[0]
- e = stream.select(channel="E")[0]
- z = stream.select(channel="Z")[0]
- f = stream.select(channel="F")[0]
-
- raws = np.vstack([h.data, e.data, z.data, np.ones_like(h.data)])
+ inchannels = self.inchannels
+ outchannels = self.outchannels
+
+ raws = []
+ for channel in inchannels:
+ if channel != "F":
+ trace = stream.select(channel=channel)[0]
+ raws.append(trace.data)
+ raws.append(np.ones_like(stream[0].data))
+ raws = np.vstack(raws)
adj = np.dot(self.matrix, raws)
- fnew = f.data + self.pier_correction
+ if "F" in inchannels:
+ f = stream.select(channel="F")[0]
+ fnew = f.data + self.pier_correction
+ adj[-1] = fnew
- x = self.create_trace("X", h.stats, adj[0])
- y = self.create_trace("Y", e.stats, adj[1])
- z = self.create_trace("Z", z.stats, adj[2])
- f = self.create_trace("F", f.stats, fnew)
+ out = Stream()
- out = Stream([x, y, z, f])
+ for i in range(len(stream)):
+ trace = stream[i]
+ data = adj[i]
+ channel = outchannels[i]
+ out += self.create_trace(channel, trace.stats, data)
return out
@@ -172,10 +181,7 @@ class AdjustedAlgorithm(Algorithm):
The input stream we want to make certain has data for the algorithm
"""
- # collect channels in stream
- channels = []
- for trace in stream:
- channels += trace.stats["channel"]
+ channels = self.inchannels
# if F is available, can produce at least adjusted F
if "F" in channels and super(AdjustedAlgorithm, self).can_produce_data(
@@ -199,6 +205,16 @@ class AdjustedAlgorithm(Algorithm):
):
return True
+ if np.all(
+ [
+ super(AdjustedAlgorithm, self).can_produce_data(
+ starttime, endtime, stream.select(channel=chan)
+ )
+ for chan in channels
+ ]
+ ):
+ return True
+
# return false if cannot produce adjustded F or XYZ
return False
diff --git a/test/algorithm_test/AdjustedAlgorithm_test.py b/test/algorithm_test/AdjustedAlgorithm_test.py
index 4fe1c2838..1c918733e 100644
--- a/test/algorithm_test/AdjustedAlgorithm_test.py
+++ b/test/algorithm_test/AdjustedAlgorithm_test.py
@@ -25,7 +25,13 @@ def test_process():
matrix = None
pier_correction = None
# load adjusted data transform matrix and pier correction
- a = adj(matrix, pier_correction, "etc/adjusted/adjbou_state_.json")
+ a = adj(
+ matrix,
+ pier_correction,
+ "etc/adjusted/adjbou_state_.json",
+ inchannels=["H", "E", "Z", "F"],
+ outchannels=["X", "Y", "Z", "F"],
+ )
# load boulder Jan 16 files from /etc/ directory
hezf_iaga2002_file = open("etc/adjusted/BOU201601vmin.min")
--
GitLab