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

Merge branch 'release/v7.26'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-07-08 21:36:02 +02:00
parent e14aed92c9 b964a728d8
commit b8f85a916f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/tasks.py
View File

@@ -594,16 +594,16 @@ def handle_calctrimp(id,
else:
f = 1.67
dt = df['TimeStamp (sec)'].diff()/6.e4
dt = df['TimeStamp (sec)'].diff()/60.
hrr = (df[' HRCur (bpm)']-hrmin)/(hrmax-hrmin)
hrrftp = (hrftp-hrmin)/float(hrmax-hrmin)
trimp1hr = 60*hrrftp*0.64*np.exp(f*hrrftp)
trimp1hr = 60.*hrrftp*0.64*np.exp(f*hrrftp)
trimpdata = dt*hrr*0.64*np.exp(f*hrr)
trimp = trimpdata.sum()
hrtss = 100*trimp/trimp1hr
hrtss = 100.*trimp/trimp1hr
pp = 8.0