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

Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop

Browse Source
This commit is contained in:
Marcel Paffrath 2016-06-21 13:29:28 +02:00
commit 0abbb79e64
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pylot/core/loc/nll.py
View File

@ -4,7 +4,7 @@
import subprocess import subprocess
import os import os
from pylot.core.io.phases import writephases from pylot.core.io.phases import writephases
from pylot.core.util.utils import getPatternLine from pylot.core.util.utils import getPatternLine, runProgram
from pylot.core.util.version import get_git_version as _getVersionString from pylot.core.util.version import get_git_version as _getVersionString
__version__ = _getVersionString() __version__ = _getVersionString()
@ -79,7 +79,7 @@ def locate(call, fnin):
''' '''
# locate the event # locate the event
subprocess.call([call, fnin]) runProgram(call, fnin)
def readLocation(fn): def readLocation(fn):

4
pylot/core/util/utils.py
View File

@ -234,10 +234,10 @@ def prepTimeAxis(stime, trace):
etime = stime + nsamp / srate etime = stime + nsamp / srate
time_ax = np.arange(stime, etime, tincr) time_ax = np.arange(stime, etime, tincr)
if len(time_ax) < nsamp: if len(time_ax) < nsamp:
print 'elongate time axes by one datum' print('elongate time axes by one datum')
time_ax = np.arange(stime, etime + tincr, tincr) time_ax = np.arange(stime, etime + tincr, tincr)
elif len(time_ax) > nsamp: elif len(time_ax) > nsamp:
print 'shorten time axes by one datum' print('shorten time axes by one datum')
time_ax = np.arange(stime, etime - tincr, tincr) time_ax = np.arange(stime, etime - tincr, tincr)
if len(time_ax) != nsamp: if len(time_ax) != nsamp:
raise ValueError('{0} samples of data \n ' raise ValueError('{0} samples of data \n '