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

[Bugfix] Wrong format of nested if conditions.

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-07-12 13:05:43 +02:00
parent da372b435c
commit 351d473cbf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pylot/core/io/data.py
View File

@ -196,9 +196,9 @@ class Data(object):
mstation = evtdata_org.picks[i].waveform_id.station_code mstation = evtdata_org.picks[i].waveform_id.station_code
mstation_ext = mstation + '_' mstation_ext = mstation + '_'
for k in range(len(evtdata_copy.picks)): for k in range(len(evtdata_copy.picks)):
if evtdata_copy.picks[k].waveform_id.station_code == mstation or \ if ((evtdata_copy.picks[k].waveform_id.station_code == mstation) or \
evtdata_copy.picks[k].waveform_id.station_code == mstation_ext and \ (evtdata_copy.picks[k].waveform_id.station_code == mstation_ext)) and \
evtdata_copy.picks[k].method_id == 'auto': (evtdata_copy.picks[k].method_id == 'auto'):
del evtdata_copy.picks[k] del evtdata_copy.picks[k]
break break
lendiff = len(evtdata_org.picks) - len(evtdata_copy.picks) lendiff = len(evtdata_org.picks) - len(evtdata_copy.picks)
@ -211,8 +211,8 @@ class Data(object):
for j in range(len(evtdata_org.picks)): for j in range(len(evtdata_org.picks)):
for i in range(len(evtdata_copy.picks)): for i in range(len(evtdata_copy.picks)):
if evtdata_copy.picks[i].phase_hint[0] == 'P': if evtdata_copy.picks[i].phase_hint[0] == 'P':
if evtdata_copy.picks[i].time_errors['upper_uncertainty'] >= upperErrors[0] or \ if (evtdata_copy.picks[i].time_errors['upper_uncertainty'] >= upperErrors[0]) or \
evtdata_copy.picks[i].time_errors['uncertainty'] == None: (evtdata_copy.picks[i].time_errors['uncertainty'] == None):
print("Uncertainty exceeds or equal adjusted upper time error!") print("Uncertainty exceeds or equal adjusted upper time error!")
print("Adjusted uncertainty: {}".format(upperErrors[0])) print("Adjusted uncertainty: {}".format(upperErrors[0]))
print("Pick uncertainty: {}".format(evtdata_copy.picks[i].time_errors['uncertainty'])) print("Pick uncertainty: {}".format(evtdata_copy.picks[i].time_errors['uncertainty']))
@ -223,8 +223,8 @@ class Data(object):
del evtdata_copy.picks[i] del evtdata_copy.picks[i]
break break
if evtdata_copy.picks[i].phase_hint[0] == 'S': if evtdata_copy.picks[i].phase_hint[0] == 'S':
if evtdata_copy.picks[i].time_errors['upper_uncertainty'] >= upperErrors[1] or \ if (evtdata_copy.picks[i].time_errors['upper_uncertainty'] >= upperErrors[1]) or \
evtdata_copy.picks[i].time_errors['uncertainty'] == None: (evtdata_copy.picks[i].time_errors['uncertainty'] == None):
print("Uncertainty exceeds or equal adjusted upper time error!") print("Uncertainty exceeds or equal adjusted upper time error!")
print("Adjusted uncertainty: {}".format(upperErrors[1])) print("Adjusted uncertainty: {}".format(upperErrors[1]))
print("Pick uncertainty: {}".format(evtdata_copy.picks[i].time_errors['uncertainty'])) print("Pick uncertainty: {}".format(evtdata_copy.picks[i].time_errors['uncertainty']))