marcel/pylot
3
0
Fork 0
Code Issues 7 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 2017-08-14 17:00:15 +02:00
commit a9d06790d2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
QtPyLoT.py
View File

@ -2086,20 +2086,19 @@ class MainWindow(QMainWindow):
outfile = settings.value("{0}/outputFile".format(loctool), outfile = settings.value("{0}/outputFile".format(loctool),
os.path.split(os.tempnam())[-1]) os.path.split(os.tempnam())[-1])
obsdir = os.path.join(locroot, 'obs')
self.saveData(event=self.get_current_event(), directory=obsdir, outformats='.obs')
eventname = self.get_current_event_name() eventname = self.get_current_event_name()
obsdir = os.path.join(self._inputs['rootpath'], self._inputs['datapath'], self._inputs['database'], eventname)
self.saveData(event=self.get_current_event(), directory=obsdir, outformats='.obs')
filename = 'PyLoT_' + eventname filename = 'PyLoT_' + eventname
locpath = os.path.join(locroot, 'loc', filename) locpath = os.path.join(locroot, 'loc', filename)
phasefile = os.path.join(obsdir, filename + '.obs') phasefile = os.path.join(obsdir, filename + '.obs')
phasepath = os.path.join(locroot, 'obs', phasefile)
lt.modify_inputs(infile, locroot, filename, phasefile, ttt) lt.modify_inputs(infile, locroot, filename, phasefile, ttt)
try: try:
lt.locate(infile) lt.locate(infile)
except RuntimeError as e: except RuntimeError as e:
print(e.message) print(e.message)
finally: #finally:
os.remove(phasepath) # os.remove(phasefile)
self.get_data().applyEVTData(lt.read_location(locpath), typ='event') self.get_data().applyEVTData(lt.read_location(locpath), typ='event')
# self.get_data().applyEVTData(self.calc_magnitude(), typ='event') # self.get_data().applyEVTData(self.calc_magnitude(), typ='event')