From 3224e084170129932ff0ce1a97de0ae9261a2337 Mon Sep 17 00:00:00 2001
From: arigdon-usgs <arigdon@usgs.gov>
Date: Fri, 27 Jul 2018 13:49:04 -0600
Subject: [PATCH] fixed rebasing issues
---
geomagio/TimeseriesUtility.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py
index 69917909..406200d5 100644
--- a/geomagio/TimeseriesUtility.py
+++ b/geomagio/TimeseriesUtility.py
@@ -195,11 +195,19 @@ def merge_streams(*streams):
stream with contiguous traces merged, and gaps filled with numpy.nan
"""
merged = obspy.core.Stream()
+<<<<<<< HEAD
<<<<<<< HEAD
# add unmasked, split traces to be merged
for stream in streams:
merged += mask_stream(stream)
=======
+=======
+
+ # add unmasked, split traces to be merged
+ for stream in streams:
+ merged += mask_stream(stream)
+
+>>>>>>> fixed rebasing issues
masked_trace = None
# add unmasked, split traces to be merged
@@ -224,7 +232,11 @@ def merge_streams(*streams):
# 1 = when there is overlap, use data from trace with last endtime
method=1)
<<<<<<< HEAD
+<<<<<<< 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
@@ -234,8 +246,11 @@ def merge_streams(*streams):
# print('\n after merging masked trace back in \n')
# print(merged)
+<<<<<<< HEAD
>>>>>>> Merge stream issues with empty channels
+=======
+>>>>>>> fixed rebasing issues
# convert back to NaN filled array
merged = unmask_stream(merged)
return merged
--
GitLab