Merge branch 'develop' into feature/metadata_class

This commit is contained in:
Marcel Paffrath 2018-07-17 14:51:24 +02:00
commit c172cfa892

View File

@ -643,11 +643,11 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None):
# check, if deviation is larger than adjusted # check, if deviation is larger than adjusted
if wddiff > dttolerance: if wddiff > dttolerance:
# remove pick from dictionary # remove pick from dictionary
pickdic.pop(key) # # mark onset and downgrade S-weight to 9, also set SPE to None (disregarded in GUI)
# # mark onset and downgrade S-weight to 9
# # (not used anymore) # # (not used anymore)
# marker = 'badWadatiCheck' marker = 'badWadatiCheck'
# pickdic[key]['S']['weight'] = 9 pickdic[key]['S']['weight'] = 9
pickdic[key]['S']['spe'] = None
badstations.append(key) badstations.append(key)
ibad += 1 ibad += 1
else: else:
@ -660,7 +660,6 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None):
checkedSPtimes.append(checkedSPtime) checkedSPtimes.append(checkedSPtime)
pickdic[key]['S']['marked'] = marker pickdic[key]['S']['marked'] = marker
# pickdic[key]['S']['marked'] = marker
print("wadaticheck: the following stations failed the check:") print("wadaticheck: the following stations failed the check:")
print(badstations) print(badstations)