bug fix in trimp calc

2018-07-08 21:34:03 +02:00
parent d43f0e27af
commit 7b7171ca0f
1 changed files with 9 additions and 3 deletions
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -594,16 +594,22 @@ 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
+    print hrr.mean()
+    
+    print trimp
+
+    hrtss = 100.*trimp/trimp1hr
+
+    print hrtss,trimp1hr

    pp = 8.0