From e43f491f67900fcd5c60fdbc49e8a7ccdd6b4486 Mon Sep 17 00:00:00 2001
From: spencer <swilbur@usgs.gov>
Date: Fri, 13 Sep 2024 12:07:39 -0600
Subject: [PATCH] Added necessary check within FDSNSNCL.py to assign the
sncl.channel as LF1,LF2,LFZ when X,Y,Z are requested by the user.
---
geomagio/edge/FDSNFactory.py | 31 +++++++++++++++++++++----------
geomagio/edge/FDSNSNCL.py | 20 ++++++++++++++------
2 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/geomagio/edge/FDSNFactory.py b/geomagio/edge/FDSNFactory.py
index d06b7924..068cb722 100644
--- a/geomagio/edge/FDSNFactory.py
+++ b/geomagio/edge/FDSNFactory.py
@@ -228,7 +228,7 @@ class FDSNFactory(TimeseriesFactory):
network=self.network,
location=self.locationCode,
)
- print("the channel reported to SCNL is ", channel)
+
# geomag-algorithms *should* treat starttime/endtime as inclusive everywhere;
# according to its author, EdgeCWB is inclusive of starttime, but exclusive of
# endtime, to satisfy seismic standards/requirements, to precision delta/2;
@@ -376,15 +376,26 @@ class FDSNFactory(TimeseriesFactory):
)
# Rotate the stream to ZNE
+ print(f"Before rotation: {[tr.stats.channel for tr in data]}")
data.rotate(method="->ZNE", inventory=inv)
- print(data)
+ print(f"After rotation: {[tr.stats.channel for tr in data]}")
+
+ # After rotation, extract the correct channel based on requested_channel
+ if requested_channel == "X":
+ selected_channel = "*FN"
+ elif requested_channel == "Y":
+ selected_channel = "*FE"
+ elif requested_channel == "Z":
+ selected_channel = "*FZ"
+ else:
+ raise ValueError(f"Invalid channel {requested_channel}")
- # # Now return only the requested channel (mapped to Z, N, or E)
- # if requested_channel == "X":
- # return data.select(channel="?FN") # N after rotation
- # elif requested_channel == "Y":
- # return data.select(channel="?FE") # E after rotation
- # elif requested_channel == "Z":
- # return data.select(channel="?FZ") # Z remains Z
+ # Filter the rotated stream to return only the trace for the selected channel
+ filtered_stream = data.select(channel=selected_channel)
- return data
+ # If no data found for the selected channel, return an empty stream
+ if len(filtered_stream) == 0:
+ print(f"No data found for channel: {requested_channel}")
+ return Stream()
+
+ return filtered_stream
diff --git a/geomagio/edge/FDSNSNCL.py b/geomagio/edge/FDSNSNCL.py
index b40c4f0e..1cbd380b 100644
--- a/geomagio/edge/FDSNSNCL.py
+++ b/geomagio/edge/FDSNSNCL.py
@@ -66,19 +66,27 @@ def get_FDSN_channel(
network: Optional[str] = None,
location: Optional[str] = None,
) -> str:
+ channel_start = _get_channel_start(interval=interval, data_type=data_type)
+
+ # Check if element is X, Y, or Z and return the concatenated string with the start prepended
+ if element in ["X", "Y", "Z"]:
+ # Return *F1,*F2,*FZ with the start applied to each
+ return ",".join([f"{channel_start}{suffix}" for suffix in ["F1", "F2", "FZ"]])
+
+ # Handle the case when location is "40" and network is "IU"
if location == "40" and network == "IU":
- return _get_channel_start(
- interval=interval, data_type=data_type
- ) + _get_channel_end(element=element)
+ return channel_start + _get_channel_end(element=element)
+
+ # Default case
return get_channel(element=element, interval=interval, data_type=data_type)
def _get_channel_end(element: str) -> str:
- if element in ["H", "U", "X"]:
+ if element in ["H", "U"]:
return "F2"
- elif element in ["E", "V", "Y"]:
+ elif element in ["E", "V"]:
return "F1"
- elif element in ["Z", "W"]:
+ elif element in ["W"]:
return "FZ"
elif element[0:2] == "LF": # predefined element
return element[1:]
--
GitLab