From 0e2155c5af28638b098e1467614f0975e5ea16c8 Mon Sep 17 00:00:00 2001
From: spencer <swilbur@usgs.gov>
Date: Wed, 4 Oct 2023 16:34:47 -0600
Subject: [PATCH] Revised the minute definition in ObservatoryMetadata and
VariometerMetadata. Removed the ObservatoryMetadata variable from IRISFactory
and replaced it with the VariometerMetadata variable and an optional variable
that points to the VariometerMetadata module.
---
geomagio/ObservatoryMetadata.py | 2 +-
.../{VariometerMetaData.py => VariometerMetadata.py} | 2 +-
geomagio/api/ws/Observatory.py | 7 ++-----
geomagio/edge/IRISFactory.py | 11 +++++------
4 files changed, 9 insertions(+), 13 deletions(-)
rename geomagio/{VariometerMetaData.py => VariometerMetadata.py} (99%)
diff --git a/geomagio/ObservatoryMetadata.py b/geomagio/ObservatoryMetadata.py
index cdab2586..7d897740 100644
--- a/geomagio/ObservatoryMetadata.py
+++ b/geomagio/ObservatoryMetadata.py
@@ -17,7 +17,7 @@ DEFAULT_INTERVAL_SPECIFIC = {
"minute": {
"data_interval_type": "1-minute",
"filter_comments": [
- "Scalar and Vector 1-minute values are computed from 1 Hz values using an INTERMAGNET gaussian filter centered on the start of the minute (00:30-01:30)."
+ "Scalar and Vector 1-minute values are computed from 1 Hz values using an INTERMAGNET gaussian filter centered on the start of the minute (00:15-01:45))."
],
},
"second": {
diff --git a/geomagio/VariometerMetaData.py b/geomagio/VariometerMetadata.py
similarity index 99%
rename from geomagio/VariometerMetaData.py
rename to geomagio/VariometerMetadata.py
index 990a65c6..419b425f 100644
--- a/geomagio/VariometerMetaData.py
+++ b/geomagio/VariometerMetadata.py
@@ -14,7 +14,7 @@ DEFAULT_INTERVAL_SPECIFIC = {
"minute": {
"data_interval_type": "1-minute",
"filter_comments": [
- "Scalar and Vector 1-minute values are computed from 1 Hz values using an INTERMAGNET gaussian filter centered on the start of the minute (00:30-01:30)."
+ "Scalar and Vector 1-minute values are computed from 1 Hz values using an INTERMAGNET gaussian filter centered on the start of the minute (00:15-01:45))."
],
},
"second": {
diff --git a/geomagio/api/ws/Observatory.py b/geomagio/api/ws/Observatory.py
index 73a8a4e6..12c662a1 100644
--- a/geomagio/api/ws/Observatory.py
+++ b/geomagio/api/ws/Observatory.py
@@ -1,9 +1,6 @@
from pydantic import BaseModel, validator
-from geomagio.ObservatoryMetadata import (
- DEFAULT_METADATA,
- DEFAULT_INTERVAL_SPECIFIC,
-) # remove data_int here as well
-from geomagio.VariometerMetaData import DEFAULT_ASL_METADATA
+from geomagio.ObservatoryMetadata import DEFAULT_METADATA
+from geomagio.VariometerMetadata import DEFAULT_ASL_METADATA
from typing import Dict
diff --git a/geomagio/edge/IRISFactory.py b/geomagio/edge/IRISFactory.py
index 5499bdf8..7f7889c3 100644
--- a/geomagio/edge/IRISFactory.py
+++ b/geomagio/edge/IRISFactory.py
@@ -4,8 +4,7 @@ from obspy import Trace, UTCDateTime, Stream
from obspy.clients.iris.client import Client
from ..geomag_types import DataInterval, DataType
-from ..ObservatoryMetadata import ObservatoryMetadata
-from geomagio.VariometerMetaData import VariometerMetadata
+from geomagio.VariometerMetadata import VariometerMetadata
from .. import TimeseriesUtility
from .IRISSNCL import IRISSNCL
from .MiniSeedFactory import MiniSeedFactory
@@ -32,8 +31,8 @@ class IRISFactory(MiniSeedFactory):
data type
interval: {"tenhertz", "second", "minute", "hour", "day"}
data interval
- observatoryMetadata: ObservatoryMetadata
- observatory metadata to replace the default ObservatoryMetadata
+ variometerMetadata: VariometerMetadata
+ variometer metadata to replace the default ObservatoryMetadata
locationCode: str
the location code for the given edge server
convert_channels: array
@@ -62,9 +61,9 @@ class IRISFactory(MiniSeedFactory):
channels: Optional[List[str]] = None,
type: Optional[DataType] = None,
interval: Optional[DataInterval] = None,
- observatoryMetadata: Optional[ObservatoryMetadata] = None,
locationCode: Optional[str] = None,
convert_channels: Optional[List[str]] = None,
+ variometerMetadata: Optional[VariometerMetadata] = None,
):
super().__init__(
host=host,
@@ -73,7 +72,7 @@ class IRISFactory(MiniSeedFactory):
channels=channels,
type=type,
interval=interval,
- observatoryMetadata=observatoryMetadata or VariometerMetadata(),
+ observatoryMetadata=variometerMetadata or VariometerMetadata(),
locationCode=locationCode,
convert_channels=convert_channels,
)
--
GitLab