refined rScore

rowers/tasks.py

@@ -589,8 +589,9 @@ def handle_calctrimp(id,
         )
 
     duration = df['TimeStamp (sec)'].max()-df['TimeStamp (sec)'].min()
-    df2 = df2.resample('30s',on='time').mean()
-
+    df2 = df2.resample('1s',on='time').mean()
+    df2.fillna(method='ffill',inplace=True)
+    df2 = df2.rolling(30).mean()
 
     df2[' Power (watts)'] = df2[' Power (watts)'].abs()
     
@@ -607,6 +608,7 @@ def handle_calctrimp(id,
     intensityfactor = normp/float(ftp)
     tss = 100.*((duration*normp*intensityfactor)/(3600.*ftp))
 
+    print tss
 
     if sex == 'male':
         f = 1.92