From d7bb8f9082a6b211f154749eb23bbf08a0ebdd23 Mon Sep 17 00:00:00 2001
From: arigdon-usgs <arigdon@usgs.gov>
Date: Fri, 27 Jul 2018 13:55:26 -0600
Subject: [PATCH] Fixed linting and spacing errors and cleaned up code
---
geomagio/TimeseriesUtility.py | 7 ++++---
test/TimeseriesUtility_test.py | 20 +++++++-------------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py
index 406200d5e..8cbce5eb0 100644
--- a/geomagio/TimeseriesUtility.py
+++ b/geomagio/TimeseriesUtility.py
@@ -236,15 +236,16 @@ def merge_streams(*streams):
=======
=======
+<<<<<<< HEAD
>>>>>>> fixed rebasing issues
# print('\n masked trace \n')
# print(masked_trace)
# trim masked trace to the same size as other traces and add back to merged stream
+=======
+>>>>>>> Fixed linting and spacing errors and cleaned up code
if masked_trace:
- masked_trace.trim(merged[0].stats.starttime,merged[0].stats.endtime)
+ masked_trace.trim(merged[0].stats.starttime, merged[0].stats.endtime)
merged += masked_trace
- # print('\n after merging masked trace back in \n')
- # print(merged)
<<<<<<< HEAD
diff --git a/test/TimeseriesUtility_test.py b/test/TimeseriesUtility_test.py
index 922e062eb..644c7f76e 100644
--- a/test/TimeseriesUtility_test.py
+++ b/test/TimeseriesUtility_test.py
@@ -114,6 +114,7 @@ def test_get_merged_gaps():
assert_equals(gap[0], UTCDateTime('2015-01-01T00:00:05Z'))
assert_equals(gap[1], UTCDateTime('2015-01-01T00:00:07Z'))
+
def test_merge_streams():
"""TimeseriesUtility_test.test_merge_streams()
@@ -128,26 +129,19 @@ def test_merge_streams():
npts1 = len(trace1.data)
npts2 = len(trace4.data)
timeseries1 = Stream(traces=[trace1, trace2, trace3])
- timeseries2 = Stream(traces=[trace4, trace5, trace6])
+ timeseries2 = Stream(traces=[trace4, trace5, trace6])
for trace in timeseries1:
trace.stats.starttime = UTCDateTime('2018-01-01T00:00:00Z')
trace.stats.npts = npts1
for trace in timeseries2:
trace.stats.starttime = UTCDateTime('2018-01-01T00:02:00Z')
trace.stats.npts = npts2
- print(timeseries1)
Merged_streams1 = TimeseriesUtility.merge_streams(timeseries1)
- print(Merged_streams1)
- assert_equals(len(timeseries1),len(Merged_streams1))
-
+ # Make sure the empty 'F' was not removed from stream
+ assert_equals(len(timeseries1), len(Merged_streams1))
# Merge multiple streams with overlapping timestamps
-
-
timeseries = timeseries1 + timeseries2
- print(timeseries)
Merged_streams = TimeseriesUtility.merge_streams(timeseries)
- print('\n Merged Streams before clean \n')
- print(Merged_streams)
-
- assert_equals(len(Merged_streams),len(timeseries1))
- assert_equals(Merged_streams[0])
\ No newline at end of file
+ assert_equals(len(Merged_streams), len(timeseries1))
+ assert_equals(len(Merged_streams[0].data), 6)
+ assert_equals(len(Merged_streams[2]), 6)
--
GitLab