diff --git a/PyLoT.py b/PyLoT.py index 0b1b91c1..2db7a1ff 100755 --- a/PyLoT.py +++ b/PyLoT.py @@ -200,7 +200,7 @@ class MainWindow(QMainWindow): settings.setValue('useGuiFilter', False) if settings.value('output/Format', None) is None: outformat = QInputDialog.getText(self, - "Enter output format (*.xml, *.cnv, *.obs, *.focmec, *.pha):", + "Enter output format (*.xml, *.cnv, *.obs, *_focmec.in, *.pha):", "Format") settings.setValue("output/Format", outformat) if settings.value('autoFilter', None) is None: @@ -1484,7 +1484,7 @@ class MainWindow(QMainWindow): self.set_fname(self.get_data().getEventFileName(), type) return self.get_fnames(type) - def saveData(self, event=None, directory=None, outformats=['.xml', '.cnv', '.obs', '.focmec', '.pha']): + def saveData(self, event=None, directory=None, outformats=['.xml', '.cnv', '.obs', '_focmec.in', '.pha']): ''' Save event data to directory with specified output formats. :param event: PyLoT Event, if not set current event will be used diff --git a/pylot/core/io/data.py b/pylot/core/io/data.py index 76f5e0c6..c737eb21 100644 --- a/pylot/core/io/data.py +++ b/pylot/core/io/data.py @@ -366,7 +366,7 @@ class Data(object): except KeyError as e: raise KeyError('''{0} export format not implemented: {1}'''.format(evtformat, e)) - if fnext == '.focmec': + if fnext == '_focmec.in': try: infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in') print('Using default input file {}'.format(infile)) diff --git a/pylot/core/util/defaults.py b/pylot/core/util/defaults.py index ce195b23..d982da8c 100644 --- a/pylot/core/util/defaults.py +++ b/pylot/core/util/defaults.py @@ -37,7 +37,7 @@ TIMEERROR_DEFAULTS = os.path.join(os.path.expanduser('~'), OUTPUTFORMATS = {'.xml': 'QUAKEML', '.cnv': 'CNV', '.obs': 'NLLOC_OBS', - '.focmec': 'FOCMEC', + '_focmec.in': 'FOCMEC', '.pha': 'HYPODD'} LOCTOOLS = dict(nll=nll, hyposat=hyposat, velest=velest, hypo71=hypo71, hypodd=hypodd)