autoPyLoT button works nearly properly now.

This commit is contained in:
Ludger Küperkoch 2017-05-19 13:22:04 +02:00
parent 4767add68f
commit 092aeb4cec
2 changed files with 5 additions and 6 deletions

View File

@ -8,7 +8,6 @@ import glob
import os import os
import datetime import datetime
from obspy import read_events from obspy import read_events
import pylot.core.loc.hyposat as hyposat import pylot.core.loc.hyposat as hyposat
import pylot.core.loc.hypo71 as hypo71 import pylot.core.loc.hypo71 as hypo71
import pylot.core.loc.velest as velest import pylot.core.loc.velest as velest
@ -141,8 +140,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
events = glob.glob(os.path.join(datapath, parameter.get('eventID'))) events = glob.glob(os.path.join(datapath, parameter.get('eventID')))
else: else:
# autoPyLoT was initialized from GUI # autoPyLoT was initialized from GUI
events = eventid events = [os.path.join(datapath, eventid)]
event = eventid
evID = eventid evID = eventid
locflag = 2 locflag = 2
@ -165,8 +163,8 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
parameter.setParam(eventID=eventID) parameter.setParam(eventID=eventID)
else: else:
data.setWFData(fnames) data.setWFData(fnames)
event = savepath event = events[0]
now = datetime.datetime.now() #now = datetime.datetime.now()
#evID = '%d%02d%02d%02d%02d' % (now.year, #evID = '%d%02d%02d%02d%02d' % (now.year,
# now.month, # now.month,
# now.day, # now.day,
@ -181,6 +179,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
return return
wfdat = remove_underscores(wfdat) wfdat = remove_underscores(wfdat)
metadata = read_metadata(parameter.get('invdir')) metadata = read_metadata(parameter.get('invdir'))
print("Restitute data ...")
corr_dat = restitute_data(wfdat.copy(), *metadata) corr_dat = restitute_data(wfdat.copy(), *metadata)
print('Working on event %s. Stations: %s' % (event, station)) print('Working on event %s. Stations: %s' % (event, station))

View File

@ -1 +1 @@
e911-dirty 4767-dirty