From f6636550791097a3aca448956401438e71a775a0 Mon Sep 17 00:00:00 2001
From: arigdon-usgs <arigdon@usgs.gov>
Date: Mon, 30 Jul 2018 09:20:59 -0600
Subject: [PATCH] fixed linting errors
---
geomagio/TimeseriesUtility.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py
index 9c6a41ba..89ad4ff9 100644
--- a/geomagio/TimeseriesUtility.py
+++ b/geomagio/TimeseriesUtility.py
@@ -212,7 +212,6 @@ def merge_streams(*streams):
# split traces that contain gaps
merged = merged.split()
-
# merge data
merged.merge(
# 1 = do not interpolate
@@ -220,7 +219,8 @@ def merge_streams(*streams):
# 1 = when there is overlap, use data from trace with last endtime
method=1)
- # trim masked trace to the same size as other traces and add back to merged stream
+ # trim masked trace to the same size as other traces (not done in merge())
+ # and add back to merged stream
if masked_trace:
masked_trace.trim(merged[0].stats.starttime, merged[0].stats.endtime)
merged += masked_trace
--
GitLab