From d9a5ba870e9a48996d97f4ee44724ba35fe9082e Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Tue, 6 Apr 2021 14:20:48 -0600
Subject: [PATCH 1/4] Convert output miniseed data to float32
---
geomagio/TimeseriesUtility.py | 6 ++++--
geomagio/edge/MiniSeedFactory.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py
index 459287dbe..d372cd7d9 100644
--- a/geomagio/TimeseriesUtility.py
+++ b/geomagio/TimeseriesUtility.py
@@ -395,13 +395,15 @@ def mask_stream(stream):
return masked
-def unmask_stream(stream):
+def unmask_stream(stream, float_type=numpy.float64):
"""Convert stream traces to unmasked arrays.
Parameters
----------
stream : obspy.core.Stream
stream to unmask
+ float_type: type
+ floating point precision for stream data
Returns
-------
@@ -414,7 +416,7 @@ def unmask_stream(stream):
unmasked += obspy.core.Trace(
trace.data.filled(fill_value=numpy.nan)
if isinstance(trace.data, numpy.ma.MaskedArray)
- else trace.data,
+ else trace.data.astype(float_type),
trace.stats,
)
return unmasked
diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index 99c3b9eec..163cd6d46 100644
--- a/geomagio/edge/MiniSeedFactory.py
+++ b/geomagio/edge/MiniSeedFactory.py
@@ -664,7 +664,7 @@ class MiniSeedFactory(TimeseriesFactory):
to_write = timeseries.select(channel=channel)
to_write = TimeseriesUtility.mask_stream(to_write)
to_write = to_write.split()
- to_write = TimeseriesUtility.unmask_stream(to_write)
+ to_write = TimeseriesUtility.unmask_stream(to_write, float_type=numpy.float32)
# relabel channels from internal to edge conventions
station = self._get_edge_station(observatory, channel, type, interval)
location = self._get_edge_location(observatory, channel, type, interval)
--
GitLab
From f539da0951ad47f9884f51d905abe61716479595 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Wed, 7 Apr 2021 09:52:36 -0600
Subject: [PATCH 2/4] undo edits
---
geomagio/TimeseriesUtility.py | 6 ++----
geomagio/edge/MiniSeedFactory.py | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py
index d372cd7d9..459287dbe 100644
--- a/geomagio/TimeseriesUtility.py
+++ b/geomagio/TimeseriesUtility.py
@@ -395,15 +395,13 @@ def mask_stream(stream):
return masked
-def unmask_stream(stream, float_type=numpy.float64):
+def unmask_stream(stream):
"""Convert stream traces to unmasked arrays.
Parameters
----------
stream : obspy.core.Stream
stream to unmask
- float_type: type
- floating point precision for stream data
Returns
-------
@@ -416,7 +414,7 @@ def unmask_stream(stream, float_type=numpy.float64):
unmasked += obspy.core.Trace(
trace.data.filled(fill_value=numpy.nan)
if isinstance(trace.data, numpy.ma.MaskedArray)
- else trace.data.astype(float_type),
+ else trace.data,
trace.stats,
)
return unmasked
diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index 163cd6d46..99c3b9eec 100644
--- a/geomagio/edge/MiniSeedFactory.py
+++ b/geomagio/edge/MiniSeedFactory.py
@@ -664,7 +664,7 @@ class MiniSeedFactory(TimeseriesFactory):
to_write = timeseries.select(channel=channel)
to_write = TimeseriesUtility.mask_stream(to_write)
to_write = to_write.split()
- to_write = TimeseriesUtility.unmask_stream(to_write, float_type=numpy.float32)
+ to_write = TimeseriesUtility.unmask_stream(to_write)
# relabel channels from internal to edge conventions
station = self._get_edge_station(observatory, channel, type, interval)
location = self._get_edge_location(observatory, channel, type, interval)
--
GitLab
From e607e1f78747c6a0afd209693282f798e252bbe1 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Wed, 7 Apr 2021 09:56:56 -0600
Subject: [PATCH 3/4] configure encoding in mseed InputClient, pass to
stream.write
---
geomagio/edge/MiniSeedInputClient.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/geomagio/edge/MiniSeedInputClient.py b/geomagio/edge/MiniSeedInputClient.py
index 122b1eb4e..cadd6b508 100644
--- a/geomagio/edge/MiniSeedInputClient.py
+++ b/geomagio/edge/MiniSeedInputClient.py
@@ -18,9 +18,10 @@ class MiniSeedInputClient(object):
MiniSeedServer port
"""
- def __init__(self, host, port=2061):
+ def __init__(self, host, port=2061, encoding="FLOAT32"):
self.host = host
self.port = port
+ self.encoding = encoding
self.socket = None
def close(self):
@@ -71,6 +72,6 @@ class MiniSeedInputClient(object):
self.connect()
# convert stream to miniseed
buf = io.BytesIO()
- stream.write(buf, format="MSEED", reclen=512)
+ stream.write(buf, encoding=self.encoding, format="MSEED", reclen=512)
# send data
self.socket.sendall(buf.getvalue())
--
GitLab
From 988d480c7365d1e5f63d153e3a0ecc4a33e10366 Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Wed, 7 Apr 2021 09:58:27 -0600
Subject: [PATCH 4/4] Add docstring
---
geomagio/edge/MiniSeedInputClient.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/geomagio/edge/MiniSeedInputClient.py b/geomagio/edge/MiniSeedInputClient.py
index cadd6b508..9d8370187 100644
--- a/geomagio/edge/MiniSeedInputClient.py
+++ b/geomagio/edge/MiniSeedInputClient.py
@@ -16,6 +16,8 @@ class MiniSeedInputClient(object):
MiniSeedServer hostname
port: int
MiniSeedServer port
+ encoding: str
+ Floating point precision for output data
"""
def __init__(self, host, port=2061, encoding="FLOAT32"):
--
GitLab