From 44a2e73a0c346054691e1774b4793b26701567a5 Mon Sep 17 00:00:00 2001
From: Heather Schovanec <hschovanec@usgs.gov>
Date: Wed, 13 Sep 2017 17:37:01 -0600
Subject: [PATCH] Get minutes from radians after copying traces
This is done to ensure that the original trace is not changed.
---
geomagio/Controller.py | 1 -
geomagio/imfjson/IMFJSONWriter.py | 11 +++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index 402a9d095..7db68da0e 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -14,7 +14,6 @@ from . import TimeseriesUtility
from . import binlog
from . import edge
from . import iaga2002
-from . import imfjson
from . import pcdcp
from . import imfv122
from . import imfv283
diff --git a/geomagio/imfjson/IMFJSONWriter.py b/geomagio/imfjson/IMFJSONWriter.py
index b45026fc5..899f19649 100644
--- a/geomagio/imfjson/IMFJSONWriter.py
+++ b/geomagio/imfjson/IMFJSONWriter.py
@@ -8,6 +8,7 @@ import numpy as np
from .. import ChannelConverter, TimeseriesUtility
from ..TimeseriesFactoryException import TimeseriesFactoryException
+
class IMFJSONWriter(object):
"""JSON writer.
"""
@@ -67,9 +68,6 @@ class IMFJSONWriter(object):
array_like
an array containing dictionaries of data.
"""
- if timeseries.select(channel='D'):
- d = timeseries.select(channel='D')
- d[0].data = ChannelConverter.get_minutes_from_radians(d[0].data)
values = []
for c in channels:
value_dict = OrderedDict()
@@ -89,9 +87,10 @@ class IMFJSONWriter(object):
value_dict['location'] = stats.location
# TODO: Add flag metadata
values += [value_dict]
- data = np.copy(trace.data)
- data[np.isnan(data)] = None
- value_dict['values'] = data.tolist()
+ series = np.copy(trace.data)
+ series = ChannelConverter.get_minutes_from_radians(series)
+ series[np.isnan(series)] = None
+ value_dict['values'] = series
return values
def _format_metadata(self, stats, channels):
--
GitLab