Merge branch 'develop' of ariadne:/data/git/pylot into 176

This commit is contained in:
2015-09-05 09:40:52 +02:00
6 changed files with 147 additions and 120 deletions

View File

@@ -229,6 +229,9 @@ class Data(object):
:param streams:
:return:
"""
restflag = 0
if streams is None:
st_raw = self.getWFData()
st = st_raw.copy()
@@ -237,7 +240,7 @@ class Data(object):
for tr in st:
# remove underscores
if tr.stats.station[3] == '_':
if len(tr.stats.station) > 3 and tr.stats.station[3] == '_':
tr.stats.station = tr.stats.station[0:3]
dlp = '%s/*.dless' % invdlpath
invp = '%s/*.xml' % invdlpath
@@ -274,6 +277,7 @@ class Data(object):
'date': st[
i].stats.starttime,
'units': "VEL"})
restflag = 1
except ValueError as e:
vmsg = '{0}'.format(e)
print(vmsg)
@@ -304,6 +308,7 @@ class Data(object):
st[i].attach_response(inv)
st[i].remove_response(output='VEL',
pre_filt=prefilt)
restflag = 1
except ValueError as e:
vmsg = '{0}'.format(e)
print(vmsg)
@@ -335,6 +340,7 @@ class Data(object):
'units': "VEL"}
st[i].simulate(paz_remove=None, pre_filt=prefilt,
seedresp=seedresp)
restflag = 1
except ValueError as e:
vmsg = '{0}'.format(e)
print(vmsg)
@@ -347,7 +353,7 @@ class Data(object):
print("Go on processing data without source parameter "
"determination!")
return st
return st, restflag
def getEvtData(self):
"""