Merge branch 'develop' of ariadne:/data/git/pylot into develop
This commit is contained in:
commit
f409861d10
14
autoPyLoT.py
14
autoPyLoT.py
@ -352,26 +352,26 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
|
|||||||
data.applyEVTData(picks)
|
data.applyEVTData(picks)
|
||||||
if evt is not None:
|
if evt is not None:
|
||||||
data.applyEVTData(evt, 'event')
|
data.applyEVTData(evt, 'event')
|
||||||
fnqml = '%s/picks_%s' % (event, evID)
|
fnqml = '%s/PyLoT_%s' % (event, evID)
|
||||||
data.exportEvent(fnqml)
|
data.exportEvent(fnqml)
|
||||||
# HYPO71
|
# HYPO71
|
||||||
hypo71file = '%s/%s_HYPO71_phases' % (event, evID)
|
hypo71file = '%s/PyLoT_%s_HYPO71_phases' % (event, evID)
|
||||||
hypo71.export(picks, hypo71file, parameter)
|
hypo71.export(picks, hypo71file, parameter)
|
||||||
# HYPOSAT
|
# HYPOSAT
|
||||||
hyposatfile = '%s/%s_HYPOSAT_phases' % (event, evID)
|
hyposatfile = '%s/PyLoT_%s_HYPOSAT_phases' % (event, evID)
|
||||||
hyposat.export(picks, hyposatfile, parameter)
|
hyposat.export(picks, hyposatfile, parameter)
|
||||||
if locflag == 1:
|
if locflag == 1:
|
||||||
# VELEST
|
# VELEST
|
||||||
velestfile = '%s/%s_VELEST_phases.cnv' % (event, evID)
|
velestfile = '%s/PyLoT_%s_VELEST_phases.cnv' % (event, evID)
|
||||||
velest.export(picks, velestfile, parameter, evt)
|
velest.export(picks, velestfile, parameter, evt)
|
||||||
# hypoDD
|
# hypoDD
|
||||||
hypoddfile = '%s/%s_hypoDD_phases.pha' % (event, evID)
|
hypoddfile = '%s/PyLoT_%s_hypoDD_phases.pha' % (event, evID)
|
||||||
hypodd.export(picks, hypoddfile, parameter, evt)
|
hypodd.export(picks, hypoddfile, parameter, evt)
|
||||||
# FOCMEC
|
# FOCMEC
|
||||||
focmecfile = '%s/%s_FOCMEC.in' % (event, evID)
|
focmecfile = '%s/PyLoT_%s_FOCMEC.in' % (event, evID)
|
||||||
focmec.export(picks, focmecfile, parameter, evt)
|
focmec.export(picks, focmecfile, parameter, evt)
|
||||||
# HASH
|
# HASH
|
||||||
hashfile = '%s/%s_HASH' % (event, evID)
|
hashfile = '%s/PyLoT_%s_HASH' % (event, evID)
|
||||||
hash.export(picks, hashfile, parameter, evt)
|
hash.export(picks, hashfile, parameter, evt)
|
||||||
|
|
||||||
endsplash = '''------------------------------------------\n'
|
endsplash = '''------------------------------------------\n'
|
||||||
|
@ -382,12 +382,12 @@ def reassess_pilot_event(root_dir, db_dir, event_id, out_dir=None, fn_param=None
|
|||||||
evt.picks = picks_from_picksdict(picks_dict)
|
evt.picks = picks_from_picksdict(picks_dict)
|
||||||
# write phase information to file
|
# write phase information to file
|
||||||
if not out_dir:
|
if not out_dir:
|
||||||
fnout_prefix = os.path.join(root_dir, db_dir, event_id, '{0}.'.format(event_id))
|
fnout_prefix = os.path.join(root_dir, db_dir, event_id, 'PyLoT_{0}.'.format(event_id))
|
||||||
else:
|
else:
|
||||||
out_dir = os.path.join(out_dir, db_dir)
|
out_dir = os.path.join(out_dir, db_dir)
|
||||||
if not os.path.isdir(out_dir):
|
if not os.path.isdir(out_dir):
|
||||||
os.makedirs(out_dir)
|
os.makedirs(out_dir)
|
||||||
fnout_prefix = os.path.join(out_dir, '{0}.'.format(event_id))
|
fnout_prefix = os.path.join(out_dir, 'PyLoT_{0}.'.format(event_id))
|
||||||
evt.write(fnout_prefix + 'xml', format='QUAKEML')
|
evt.write(fnout_prefix + 'xml', format='QUAKEML')
|
||||||
#evt.write(fnout_prefix + 'cnv', format='VELEST')
|
#evt.write(fnout_prefix + 'cnv', format='VELEST')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user