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

This commit is contained in:
Sebastian Wehling-Benatelli 2015-07-13 06:41:02 +02:00
commit 108d6c75d6

View File

@ -231,7 +231,7 @@ def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None):
imax2 = np.argmax(abs(xfilt[ipick[0][1]:ipick[0][li2]])) imax2 = np.argmax(abs(xfilt[ipick[0][1]:ipick[0][li2]]))
if imax2 == 0: if imax2 == 0:
imax2 = np.argmax(abs(xfilt[ipick[0][1]:ipick[0][index2[1]]])) imax2 = np.argmax(abs(xfilt[ipick[0][1]:ipick[0][index2[1]]]))
if imax1 == 0: if imax2 == 0:
print 'fmpicker: Zero crossings too close!' print 'fmpicker: Zero crossings too close!'
print 'Skip first motion determination!' print 'Skip first motion determination!'
return FM return FM