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

Merge branch 'hotfix/v3.25'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-06-29 16:10:00 +02:00
parent 6e14a8086d 64d32f838d
commit fd634e2605
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/datautils.py
View File

@@ -72,7 +72,7 @@ def cpfit(powerdf):
frac = abs(ddmin)/fitpoints.mean() frac = abs(ddmin)/fitpoints.mean()
ratio = fitpoints.mean()/fitpoints0.mean() ratio = fitpoints.mean()/fitpoints0.mean()
return p1,fitt,fitpower,ratio return p1,fitt,fitpower,ratio
def getlogarr(maxt): def getlogarr(maxt):
@@ -180,7 +180,7 @@ def getmaxwattinterval(tt,ww,i):
if testres: if testres:
deltat = 1.0e-3*(t_0-t_1) deltat = 1.0e-3*(t_0-t_1)
wmax = w_roll.ix[indexmax] wmax = w_roll.ix[indexmax]
if wmax > 800 or wmax > 800/(5.0e04*deltat): if wmax > 800 or wmax*5.0e-4*deltat > 800.0:
wmax = 0 wmax = 0
else: else:
wmax = 0 wmax = 0