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

Marginal changes

Browse Source
This commit is contained in:
Ludger Küperkoch 2015-11-05 08:49:44 +01:00
parent f738160a8b
commit 686395defc
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autoPyLoT.py
View File

@ -172,17 +172,12 @@ def autoPyLoT(inputfile):
# locate the event # locate the event
subprocess.call([nlloccall, locfile]) subprocess.call([nlloccall, locfile])
########################################################## ##########################################################
<<<<<<< HEAD
# write phase files for various location routines # write phase files for various location routines
# HYPO71 # HYPO71
hypo71file = '%s/%s/autoPyLoT_HYPO71.pha' % (datapath, parameter.getParam('eventID')) hypo71file = '%s/%s/autoPyLoT_HYPO71.pha' % (datapath, parameter.getParam('eventID'))
writephases(picks, 'HYPO71', hypo71file) writephases(picks, 'HYPO71', hypo71file)
=======
>>>>>>> 223902f2d4a9fe992730bb1ba925bfa432f26550
print '------------------------------------------' print '------------------------------------------'
print '-------Finished event %s!-------' % parameter.getParam('eventID') print '-------Finished event %s!-------' % parameter.getParam('eventID')
print '------------------------------------------' print '------------------------------------------'