Merge branch 'hotfix/v3.24'

2017-06-29 16:03:01 +02:00
parent 0d7dd17d79 936da6f9f8
commit 6e14a8086d
1 changed files with 1 additions and 1 deletions
--- a/rowers/datautils.py
+++ b/rowers/datautils.py
@@ -180,7 +180,7 @@ def getmaxwattinterval(tt,ww,i):
            if testres:
                deltat = 1.0e-3*(t_0-t_1)
                wmax = w_roll.ix[indexmax]
-                if wmax > 800:
+                if wmax > 800 or wmax > 800/(5.0e04*deltat):
                    wmax = 0
            else:
                wmax = 0