From 807ca9a04d22a55aafbf8e7717603d99d8c62086 Mon Sep 17 00:00:00 2001
From: Nicholas Shavers <nshavers@contractor.usgs.gov>
Date: Wed, 15 Jan 2025 14:32:45 -0800
Subject: [PATCH] import module syntax i.e __init__.py used
---
geomagio/Controller.py | 7 +++----
geomagio/{api => }/xml/XMLFactory.py | 3 ++-
geomagio/xml/__init__.py | 8 ++++++++
3 files changed, 13 insertions(+), 5 deletions(-)
rename geomagio/{api => }/xml/XMLFactory.py (97%)
create mode 100644 geomagio/xml/__init__.py
diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index bfdffb04..64138ed7 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -7,8 +7,6 @@ from typing import List, Optional, Tuple, Union
from obspy.core import Stream, UTCDateTime
-from geomagio.api.xml.XMLFactory import XMLFactory
-
from .algorithm import Algorithm, algorithms, AlgorithmException, FilterAlgorithm
from .DerivedTimeseriesFactory import DerivedTimeseriesFactory
from .PlotTimeseriesFactory import PlotTimeseriesFactory
@@ -25,6 +23,7 @@ from . import imfv122
from . import imfv283
from . import temperature
from . import vbf
+from . import xml
class Controller(object):
@@ -562,7 +561,7 @@ def get_input_factory(args):
**input_factory_args,
)
elif input_type == "xml":
- input_factory = XMLFactory(**input_factory_args)
+ input_factory = xml.XMLFactory(**input_factory_args)
# wrap stream
if input_stream is not None:
input_factory = StreamTimeseriesFactory(
@@ -649,7 +648,7 @@ def get_output_factory(args):
**output_factory_args,
)
elif output_type == "xml":
- output_factory = XMLFactory(**output_factory_args)
+ output_factory = xml.XMLFactory(**output_factory_args)
# wrap stream
if output_stream is not None:
output_factory = StreamTimeseriesFactory(
diff --git a/geomagio/api/xml/XMLFactory.py b/geomagio/xml/XMLFactory.py
similarity index 97%
rename from geomagio/api/xml/XMLFactory.py
rename to geomagio/xml/XMLFactory.py
index d5a63f71..9199f713 100644
--- a/geomagio/api/xml/XMLFactory.py
+++ b/geomagio/xml/XMLFactory.py
@@ -185,12 +185,13 @@ class XMLFactory(TimeseriesFactory):
# Create Data element
data_elem = ET.SubElement(root, "Data")
- # All traces should have the same starttime and delta per convention
+ # For each sample, create and add as sub element of <data>...</data>
for i in range(npts):
sample = ET.SubElement(data_elem, "Sample")
for trace in timeseries:
ch_name = trace.stats.channel
value = trace.data[i] if i < len(trace.data) else ""
+ # For each channels trace, get data point, add as a sub element of <sample>...</sample>
ET.SubElement(sample, ch_name).text = f"{value}"
# Generate the XML string
diff --git a/geomagio/xml/__init__.py b/geomagio/xml/__init__.py
new file mode 100644
index 00000000..5253c8ca
--- /dev/null
+++ b/geomagio/xml/__init__.py
@@ -0,0 +1,8 @@
+"""IO Module for Edge Format
+"""
+
+from __future__ import absolute_import
+
+from .XMLFactory import XMLFactory
+
+__all__ = ["XMLFactory"]
--
GitLab