Merge branch 'master'

Conflicts:
	pylot/core/analysis/magnitude.py
	pylot/core/pick/autopick.py
	pylot/core/util/dataprocessing.py
This commit is contained in:
Sebastian Wehling-Benatelli 2016-09-29 14:01:15 +02:00
commit ad909804d1
2 changed files with 2 additions and 0 deletions

View File

@ -17,6 +17,7 @@ from pylot.core.pick.charfuns import CharacteristicFunction
from pylot.core.pick.charfuns import HOScf, AICcf, ARZcf, ARHcf, AR3Ccf
from pylot.core.pick.utils import checksignallength, checkZ4S, earllatepicker, \
getSNR, fmpicker, checkPonsets, wadaticheck
from pylot.core.util.dataprocessing import restitute_data
from pylot.core.util.utils import getPatternLine
from pylot.core.io.data import Data

View File

@ -4,6 +4,7 @@
import os
import glob
import sys
from obspy.io.xseed import Parser
import numpy as np