Merge branch 'develop' of ariadne:/data/git/pylot into develop

This commit is contained in:
Marcel Paffrath 2017-06-29 10:24:27 +02:00
commit 574704cc49

View File

@ -202,6 +202,10 @@ class Data(object):
evtdata_copy.picks[k].method_id == 'auto':
del evtdata_copy.picks[k]
break
lendiff = len(evtdata_org.picks) - len(evtdata_copy.picks)
if lendiff is not 0:
print("Manual as well as automatic picks available. Prefered the {} manual ones!".format(lendiff))
if fnext == '.obs':
try:
evtdata_copy.write(fnout + fnext, format=evtformat)