diff --git a/autoPyLoT.py b/autoPyLoT.py index 9204c23c..4faa8d14 100755 --- a/autoPyLoT.py +++ b/autoPyLoT.py @@ -14,6 +14,7 @@ import pylot.core.loc.hypo71 as hypo71 import pylot.core.loc.velest as velest import pylot.core.loc.hypodd as hypodd import pylot.core.loc.focmec as focmec +import pylot.core.loc.hash as hash import pylot.core.loc.nll as nll from pylot.core.analysis.magnitude import MomentMagnitude, RichterMagnitude from pylot.core.io.data import Data @@ -231,6 +232,12 @@ def autoPyLoT(inputfile): ########################################################## # write phase files for various location # and fault mechanism calculation routines + # ObsPy event object + data.applyEVTData(picks) + if evt is not None: + data.applyEVTData(evt, 'event') + fnqml = '%s/autoPyLoT' % event + data.exportEvent(fnqml) # HYPO71 hypo71file = '%s/autoPyLoT_HYPO71_phases' % event hypo71.export(picks, hypo71file, parameter) @@ -246,12 +253,9 @@ def autoPyLoT(inputfile): # FOCMEC focmecfile = '%s/autoPyLoT_FOCMEC.in' % event focmec.export(picks, focmecfile, parameter, evt) - # ObsPy event object - data.applyEVTData(picks) - if evt is not None: - data.applyEVTData(evt, 'event') - fnqml = '%s/autoPyLoT' % event - data.exportEvent(fnqml) + # HASH + hashfile = '%s/autoPyLoT_HASH' % event + hash.export(picks, hashfile, parameter, evt) endsplash = '''------------------------------------------\n' -----Finished event %s!-----\n'