marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Debuged getDataArray: Reliable cutting of waveforms independetn from actual waveform lengths.

Browse Source
This commit is contained in:
Ludger Küperkoch 2015-08-12 16:48:55 +02:00
parent d9cb3517cc
commit 4f634cc43a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pylot/core/pick/CharFuns.py
View File

@ -15,6 +15,8 @@ autoregressive prediction: application ot local and regional distances, Geophys.
:author: MAGS2 EP3 working group :author: MAGS2 EP3 working group
""" """
import matplotlib.pyplot as plt
import numpy as np import numpy as np
from obspy.core import Stream from obspy.core import Stream
@ -162,10 +164,12 @@ class CharacteristicFunction(object):
stop = min([len(self.orig_data[0]), len(self.orig_data[1])]) stop = min([len(self.orig_data[0]), len(self.orig_data[1])])
elif self.cut[0] == 0 and self.cut[1] is not 0: elif self.cut[0] == 0 and self.cut[1] is not 0:
start = 0 start = 0
stop = self.cut[1] / self.dt stop = min([self.cut[1] / self.dt, len(self.orig_data[0]), \
len(self.orig_data[1])])
else: else:
start = self.cut[0] / self.dt start = max([0, self.cut[0] / self.dt])
stop = self.cut[1] / self.dt stop = min([self.cut[1] / self.dt, len(self.orig_data[0]), \
len(self.orig_data[1])])
hh = self.orig_data.copy() hh = self.orig_data.copy()
h1 = hh[0].copy() h1 = hh[0].copy()
h2 = hh[1].copy() h2 = hh[1].copy()
@ -176,13 +180,15 @@ class CharacteristicFunction(object):
elif len(self.orig_data) == 3: elif len(self.orig_data) == 3:
if self.cut[0] == 0 and self.cut[1] == 0: if self.cut[0] == 0 and self.cut[1] == 0:
start = 0 start = 0
stop = min([len(self.orig_data[0]), len(self.orig_data[1]), len(self.orig_data[2])]) stop = min([self.cut[1] / self.dt, len(self.orig_data[0]), \
len(self.orig_data[1]), len(self.orig_data[2])])
elif self.cut[0] == 0 and self.cut[1] is not 0: elif self.cut[0] == 0 and self.cut[1] is not 0:
start = 0 start = 0
stop = self.cut[1] / self.dt stop = self.cut[1] / self.dt
else: else:
start = self.cut[0] / self.dt start = max([0, self.cut[0] / self.dt])
stop = self.cut[1] / self.dt stop = min([self.cut[1] / self.dt, len(self.orig_data[0]), \
len(self.orig_data[1]), len(self.orig_data[2])])
hh = self.orig_data.copy() hh = self.orig_data.copy()
h1 = hh[0].copy() h1 = hh[0].copy()
h2 = hh[1].copy() h2 = hh[1].copy()