sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v3.22'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-06-29 15:43:58 +02:00
parent 91dc7f742b 8eb4e9f6aa
commit a7b6486dfd
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/datautils.py
View File

@@ -175,8 +175,14 @@ def getmaxwattinterval(tt,ww,i):
try: try:
t_0 = tt.ix[indexmax] t_0 = tt.ix[indexmax]
t_1 = tt.ix[indexmax-i] t_1 = tt.ix[indexmax-i]
deltat = 1.0e-3*(t_0-t_1) deltas = tt.ix[indexmax-1:indexmax].diff().dropna()
wmax = w_roll.ix[indexmax] testres = 1.0e-3*deltas.max() < 30.
if testres:
deltat = 1.0e-3*(t_0-t_1)
wmax = w_roll.ix[indexmax]
else:
wmax = 0
deltat = 0
except KeyError: except KeyError:
pass pass
else: else: