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

If several locations done, use the most recent one.

Browse Source
This commit is contained in:
Ludger Küperkoch 2019-09-13 12:29:42 +02:00
parent 813a2c989e
commit e94129ec36
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PyLoT.py
View File

@ -3379,7 +3379,6 @@ class MainWindow(QMainWindow):
for station in self.getPicks(): for station in self.getPicks():
wf_select = wf_copy.select(station=station) wf_select = wf_copy.select(station=station)
corr_wf = restitute_data(wf_select, self.metadata) corr_wf = restitute_data(wf_select, self.metadata)
# calculate moment magnitude # calculate moment magnitude
moment_mag = MomentMagnitude(corr_wf, self.get_data().get_evt_data(), self.inputs.get('vp'), moment_mag = MomentMagnitude(corr_wf, self.get_data().get_evt_data(), self.inputs.get('vp'),
self.inputs.get('Qp'), self.inputs.get('rho'), verbosity=True) self.inputs.get('Qp'), self.inputs.get('rho'), verbosity=True)

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

@ -95,10 +95,15 @@ def locate(fnin, parameter=None):
def read_location(fn): def read_location(fn):
path, file = os.path.split(fn) path, file = os.path.split(fn)
file = glob.glob1(path, file + '.[0-9]*.grid0.loc.hyp') nllfile = glob.glob1(path, file + '.[0-9]*.grid0.loc.hyp')
if len(file) > 1: if len(nllfile) > 1:
raise IOError('ambiguous location name {0}'.format(file)) # get most recent file
fn = os.path.join(path, file[0]) print("Found several location files matching pattern!")
print("Using the most recent one ...")
files_to_search = '{0}/{1}'.format(path, file) + '.[0-9]*.grid0.loc.hyp'
fn = max(glob.glob(files_to_search), key=os.path.getctime)
else:
fn = os.path.join(path, nllfile[0])
return read_events(fn)[0] return read_events(fn)[0]