fixed bug related to split after rowing physics calc

rowers/dataprep.py

@@ -1421,7 +1421,7 @@ def add_efficiency(id=0):
 # saves it to the stroke_data table in the database
 # Takes a rowingdata object's DataFrame as input
 def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
-             empower=True,inboard=0.88):
+             empower=True,inboard=0.88,forceunit='lbs'):
     if rowdatadf.empty:
         return 0
 
@@ -1485,8 +1485,17 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
     except TypeError:
         drivespeed = 0.0*rowdatadf['TimeStamp (sec)']
         
+
     drivespeed = drivespeed.fillna(value=0)
-    driveenergy = drivelength*averageforce*lbstoN
+
+    try:
+        driveenergy = rowdatadf['driveenergy']
+    except KeyError:
+        if forceunit == 'lbs':
+            driveenergy = drivelength*averageforce*lbstoN
+        else:
+            drivenergy = drivelength*averageforce
+        
     distance = rowdatadf.ix[:,'cum_dist']
 
     

rowers/interactiveplots.py

@@ -1918,7 +1918,6 @@ def interactive_flex_chart2(id=0,promember=0,
         yparam1 = 'None'
         
     rowdata.dropna(axis=1,how='all',inplace=True)
-    rowdata.dropna(axis=0,how='any',inplace=True)
 
     # test if we have drive energy
     nowork = 1