diff --git a/geomagio/__init__.py b/geomagio/__init__.py
index d51ffc9e4b4c26c879838dbf69c5e0caab8c2229..1887216cb25d8ac23a5afa614c2ad4c9a018939a 100644
--- a/geomagio/__init__.py
+++ b/geomagio/__init__.py
@@ -10,6 +10,7 @@ from . import Util
from .Controller import Controller
from .DerivedTimeseriesFactory import DerivedTimeseriesFactory
from .ObservatoryMetadata import ObservatoryMetadata
+from .VariometerMetadata import VariometerMetadata
from .PlotTimeseriesFactory import PlotTimeseriesFactory
from .TimeseriesFactory import TimeseriesFactory
from .TimeseriesFactoryException import TimeseriesFactoryException
@@ -20,6 +21,7 @@ __all__ = [
"DeltaFAlgorithm",
"DerivedTimeseriesFactory",
"ObservatoryMetadata",
+ "VariometerMetadata",
"PlotTimeseriesFactory",
"StreamConverter",
"TimeseriesFactory",
diff --git a/geomagio/edge/FDSNFactory.py b/geomagio/edge/FDSNFactory.py
index fcbc3a982a37546feeff4ac065dca5aa08c4d122..91020bd3b41328fcaa64dca931f1a9b5e49fd0f7 100644
--- a/geomagio/edge/FDSNFactory.py
+++ b/geomagio/edge/FDSNFactory.py
@@ -20,6 +20,7 @@ from ..ObservatoryMetadata import ObservatoryMetadata
from ..VariometerMetadata import VariometerMetadata
from .RawInputClient import RawInputClient
from .FDSNSNCL import FDSNSNCL
+from .SNCL import SNCL
class FDSNFactory(TimeseriesFactory):
@@ -84,6 +85,7 @@ class FDSNFactory(TimeseriesFactory):
interval: Optional[DataInterval] = None,
variometerMetadata: Optional[VariometerMetadata] = None,
locationCode: Optional[str] = None,
+ snclMapper: str = "geomag",
):
TimeseriesFactory.__init__(self, observatory, channels, type, interval)
@@ -95,6 +97,10 @@ class FDSNFactory(TimeseriesFactory):
self.observatoryMetadata = variometerMetadata or VariometerMetadata()
self.network = network
self.locationCode = locationCode
+ if snclMapper == "geomag":
+ self.get_sncl = FDSNSNCL.get_sncl
+ else:
+ raise TimeseriesFactoryException("Unrecognized SNCL mapper")
def get_timeseries(
self,
@@ -214,7 +220,7 @@ class FDSNFactory(TimeseriesFactory):
data: Trace
timeseries trace of the requested channel data
"""
- sncl = FDSNSNCL.get_sncl(
+ sncl = self.get_sncl(
station=observatory,
data_type=type,
interval=interval,
@@ -260,7 +266,7 @@ class FDSNFactory(TimeseriesFactory):
)
# Beneath is necessary code to check the reported azimuth
# for the LF1 (E or Y) and LF2 (H or X) channels and determine if intstrument axes have been reversed.
- azi, dip = self._get_orientations(data[0], starttime)
+ azi, dip = self._get_orientations(data[0], starttime, sncl)
# Checks Azimuth for LF2 channel
if 270 > azi and azi > 90.0 and data[0].stats.channel == "LF2":
@@ -331,8 +337,8 @@ class FDSNFactory(TimeseriesFactory):
stream: Stream,
observatory: str,
channel: str,
- type: DataType,
- interval: DataInterval,
+ type: str,
+ interval: str,
):
"""set metadata for a given stream/channel
Parameters
@@ -352,19 +358,10 @@ class FDSNFactory(TimeseriesFactory):
)
def _get_orientations(
- self, trace: Trace, starttime: UTCDateTime
+ self, trace: Trace, starttime: UTCDateTime, sncl
) -> Tuple[float, float]:
# Retrieve station orientation information using FDSN for each trace
- sncl = FDSNSNCL.get_sncl(
- data_type=trace.stats.location,
- element=trace.stats.channel,
- interval=self.interval,
- station=trace.stats.station,
- network=trace.stats.network,
- location=trace.stats.location,
- )
-
FDSN = FDSNClient("IRIS")
inv = FDSN.get_stations(
network=sncl.network,
diff --git a/geomagio/edge/FDSNSNCL.py b/geomagio/edge/FDSNSNCL.py
index 4e94158cbdffe686cedd43330155e415fe15499e..0f0641c7ba3eb2ad28d655a680d41d059336da50 100644
--- a/geomagio/edge/FDSNSNCL.py
+++ b/geomagio/edge/FDSNSNCL.py
@@ -1,7 +1,7 @@
-from typing import Optional
+from typing import Optional, Dict
from ..geomag_types import DataInterval, DataType
-from .SNCL import SNCL, get_channel, get_location, _get_channel_start
+from .SNCL import SNCL, get_channel, get_location, get_channel_start
class FDSNSNCL(SNCL):
@@ -22,7 +22,6 @@ class FDSNSNCL(SNCL):
):
raise ValueError(f"Unsupported data type: {data_type}")
location = location or get_location(element=element, data_type=data_type)
-
return FDSNSNCL(
station=station,
network=network,
@@ -48,22 +47,6 @@ class FDSNSNCL(SNCL):
return _get_FDSN_element(channel=self.channel)
return super().element
- @property
- def interval(self) -> str:
- """Translates beginning of channel to interval"""
- channel_start = self.channel[0]
- if channel_start == "B":
- return "tenhertz"
- elif channel_start == "L":
- return "second"
- elif channel_start == "U":
- return "minute"
- elif channel_start == "R":
- return "hour"
- elif channel_start == "P":
- return "day"
- raise ValueError(f"Unexcepted interval code: {channel_start}")
-
def _get_FDSN_element(channel: str) -> str:
channel_end = channel[1:]
@@ -84,7 +67,7 @@ def get_FDSN_channel(
location: Optional[str] = None,
) -> str:
if location == "40" and network == "IU":
- return _get_channel_start(interval=interval) + _get_channel_end(element=element)
+ return get_channel_start(interval=interval) + _get_channel_end(element=element)
return get_channel(element=element, interval=interval, data_type=data_type)
diff --git a/geomagio/edge/IRISSNCL.py b/geomagio/edge/IRISSNCL.py
index 1993c755fc9089b5144cb04dc4b1b1fa62848d8d..cbad07bcb069b1dfe0605026863dc44b6d84fe85 100644
--- a/geomagio/edge/IRISSNCL.py
+++ b/geomagio/edge/IRISSNCL.py
@@ -1,7 +1,7 @@
from typing import Optional
from ..geomag_types import DataInterval, DataType
-from .SNCL import SNCL, get_channel, get_location, _get_channel_start
+from .SNCL import SNCL, get_channel, get_location, get_channel_start
class IRISSNCL(SNCL):
@@ -67,7 +67,7 @@ def get_iris_channel(
location: Optional[str] = None,
) -> str:
if location == "40" and network == "IU":
- return _get_channel_start(interval=interval) + _get_channel_end(element=element)
+ return get_channel_start(interval=interval) + _get_channel_end(element=element)
return get_channel(element=element, interval=interval, data_type=data_type)
diff --git a/geomagio/edge/SNCL.py b/geomagio/edge/SNCL.py
index 88e012e9bb31b85cd92c78fd6043e1a421546d96..0570a8bf73bbae1230096a91689230f9587c8a63 100644
--- a/geomagio/edge/SNCL.py
+++ b/geomagio/edge/SNCL.py
@@ -94,7 +94,7 @@ class SNCL(BaseModel):
def get_channel(element: str, interval: str, data_type: str) -> str:
return _check_predefined_channel(element=element, interval=interval) or (
- _get_channel_start(interval=interval)
+ get_channel_start(interval=interval)
+ _get_channel_end(element=element, data_type=data_type)
)
@@ -112,7 +112,7 @@ def _check_predefined_element(channel: str) -> Optional[str]:
return None
-def _get_channel_start(interval: str) -> str:
+def get_channel_start(interval: str) -> str:
if interval == "tenhertz":
return "B"
if interval == "second":
@@ -153,7 +153,7 @@ def _get_element(channel: str, location: str) -> str:
def _check_predefined_channel(element: str, interval: str) -> Optional[str]:
if element in ELEMENT_CONVERSIONS:
- return _get_channel_start(interval=interval) + ELEMENT_CONVERSIONS[element]
+ return get_channel_start(interval=interval) + ELEMENT_CONVERSIONS[element]
elif len(element) == 3:
return element
# chan.loc format
diff --git a/geomagio/iaga2002/IAGA2002Writer.py b/geomagio/iaga2002/IAGA2002Writer.py
index 4aac8db92a27426ec88ef4bc48d9dd7e9ab8f60a..5cf5c4113bacead305489de64b5b6d95d9b248fd 100644
--- a/geomagio/iaga2002/IAGA2002Writer.py
+++ b/geomagio/iaga2002/IAGA2002Writer.py
@@ -42,6 +42,7 @@ class IAGA2002Writer(object):
% (channel, str(TimeseriesUtility.get_channels(timeseries)))
)
stats = timeseries[0].stats
+
if len(channels) != 4:
channels = self._pad_to_four_channels(timeseries, channels)
out.write(self._format_headers(stats, channels).encode("utf8"))
@@ -80,7 +81,7 @@ class IAGA2002Writer(object):
self._format_header("Geodetic Longitude", str(stats.geodetic_longitude))
)
if "elevation" in stats:
- buf.append(self._format_header("Elevation", stats.elevation))
+ buf.append(self._format_header("Elevation", str(stats.elevation)))
buf.append(self._format_header("Reported", "".join(channels)))
if "sensor_orientation" in stats:
buf.append(
diff --git a/test/edge_test/FDSNSNCL_test.py b/test/edge_test/FDSNSNCL_test.py
index 448bc11c936cb8a8d7bec0124ff9f94bb317e4d5..4d66363ab58ff0e90689b674ca671731f66fa019 100644
--- a/test/edge_test/FDSNSNCL_test.py
+++ b/test/edge_test/FDSNSNCL_test.py
@@ -125,12 +125,13 @@ def test_get_sncl():
location="40",
)
assert error.value == "Unsupported data type: adjusted"
- assert FDSNSNCL.get_sncl(
- data_type="adjusted",
- element="H",
- interval="second",
- station="BOU",
- ) == FDSNSNCL(station="BOU", network="NT", channel="LFH", location="A0")
+ assert FDSNSNCL.get_sncl(
+ data_type="adjusted",
+ element="H",
+ interval="second",
+ station="ANMO",
+ ) == FDSNSNCL(station="ANMO", network="NT", channel="LFH", location="40")
+ assert error.value == "Unsupported data type: adjusted"
def test_interval():
diff --git a/test_metadata.py b/test_metadata.py
index 2a975f896f4469d831bf33588eac9539d0f97dda..4436aa0a68c2830ae8df80a22244f6c70173b83a 100644
--- a/test_metadata.py
+++ b/test_metadata.py
@@ -121,7 +121,7 @@ readings = WebAbsolutesFactory().get_readings(
)
# get residual reading
reading = SpreadsheetAbsolutesFactory().parse_spreadsheet(
- "etc/residual/DED-20140952332.xlsm"
+ "etc/residual/DED-20140952332.xlsm", []
)
readings.append(reading)