From df95097e2aa420dedb38a3f8e509d998cbcc7409 Mon Sep 17 00:00:00 2001
From: Hal Simpson <hasimpson@usgs.gov>
Date: Fri, 3 Apr 2015 00:05:01 -0600
Subject: [PATCH] cleaned up moved code, and moved convert_trace_to_decimal
 into post_process

---
 geomagio/edge/EdgeFactory.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py
index 12a86af0e..61cc2093b 100644
--- a/geomagio/edge/EdgeFactory.py
+++ b/geomagio/edge/EdgeFactory.py
@@ -17,19 +17,6 @@ from obspy import earthworm
 from ObservatoryMetadata import ObservatoryMetadata
 
 
-def edge_add_parse_arguments(parser):
-    """add edge specific arguments to parser
-
-    Parameters
-    ----------
-    parser: argparse.ArgumentParser
-    """
-    parser.add_argument('--input-edge-host',
-            help='ip address of the edge input server')
-    parser.add_argument('--input-edge-port', type=int,
-            help='port number of the edge input server')
-
-
 class EdgeFactory(TimeseriesFactory):
     """TimeseriesFactory for Edge related data.
 
@@ -327,7 +314,6 @@ class EdgeFactory(TimeseriesFactory):
         data = self.client.getWaveform(network, station, location,
                 edge_channel, starttime, endtime)
         data.merge()
-        self._convert_trace_to_decimal(data)
         self._set_metadata(data,
                 observatory, channel, type, interval)
         return data
@@ -385,6 +371,7 @@ class EdgeFactory(TimeseriesFactory):
 
         Notes: the original timeseries object is changed.
         """
+        self._convert_trace_to_decimal(timeseries)
         for trace in timeseries:
             if isinstance(trace.data, numpy.ma.MaskedArray):
                 trace.data.set_fill_value(numpy.nan)
-- 
GitLab