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

This commit is contained in:
Sebastian Wehling-Benatelli 2015-07-09 11:37:11 +02:00
commit f704d8b258

View File

@ -507,6 +507,7 @@ def wadaticheck(pickdic, dttolerance, iplot):
checkedSPtimes = [] checkedSPtimes = []
# calculate deviations from Wadati regression # calculate deviations from Wadati regression
ii = 0 ii = 0
ibad = 0
for key in pickdic: for key in pickdic:
if pickdic[key].has_key('SPt'): if pickdic[key].has_key('SPt'):
wddiff = abs(pickdic[key]['SPt'] - wdfit[ii]) wddiff = abs(pickdic[key]['SPt'] - wdfit[ii])
@ -517,6 +518,7 @@ def wadaticheck(pickdic, dttolerance, iplot):
# (not used anymore) # (not used anymore)
marker = 'badWadatiCheck' marker = 'badWadatiCheck'
pickdic[key]['S']['weight'] = 9 pickdic[key]['S']['weight'] = 9
ibad += 1
else: else:
marker = 'goodWadatiCheck' marker = 'goodWadatiCheck'
checkedPpick = UTCDateTime(pickdic[key]['P']['mpp']) checkedPpick = UTCDateTime(pickdic[key]['P']['mpp'])
@ -536,6 +538,7 @@ def wadaticheck(pickdic, dttolerance, iplot):
# calculate vp/vs ratio after check # calculate vp/vs ratio after check
cvpvsr = p2[0] + 1 cvpvsr = p2[0] + 1
print 'wadaticheck: Average Vp/Vs ratio after check:', cvpvsr print 'wadaticheck: Average Vp/Vs ratio after check:', cvpvsr
print 'wadatacheck: Skipped %d S pick(s).' % ibad
else: else:
print '###############################################' print '###############################################'
print 'wadatacheck: Not enough checked S-P times available!' print 'wadatacheck: Not enough checked S-P times available!'
@ -696,7 +699,7 @@ def checkPonsets(pickdic, dttolerance, iplot):
# these picks did not pass jackknife test # these picks did not pass jackknife test
badjk = np.where(PHI_pseudo > 2 * xjack) badjk = np.where(PHI_pseudo > 2 * xjack)
badjkstations = np.array(stations)[badjk] badjkstations = np.array(stations)[badjk]
print 'checkPonsets: %d picks did not pass jackknife test!' % len(badjkstations) print 'checkPonsets: %d pick(s) did not pass jackknife test!' % len(badjkstations)
# calculate median from these picks # calculate median from these picks
pmedian = np.median(np.array(Ppicks)[ij]) pmedian = np.median(np.array(Ppicks)[ij])
@ -708,8 +711,8 @@ def checkPonsets(pickdic, dttolerance, iplot):
goodstations = np.array(stations)[igood] goodstations = np.array(stations)[igood]
badstations = np.array(stations)[ibad] badstations = np.array(stations)[ibad]
print 'checkPonsets: %d picks deviate too much from median!' % len(ibad) print 'checkPonsets: %d pick(s) deviate too much from median!' % len(ibad)
print 'checkPonsets: Skipped %d P onsets out of %d' % (len(badstations) \ print 'checkPonsets: Skipped %d P pick(s) out of %d' % (len(badstations) \
+ len(badjkstations), len(stations)) + len(badjkstations), len(stations))
goodmarker = 'goodPonsetcheck' goodmarker = 'goodPonsetcheck'