Merge branch 'develop' into feature/sensorfusion

2017-03-08 16:12:41 +01:00
parent 433aa348a2 870d9466e7
commit 5be668ebf0
4 changed files with 7 additions and 3 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -753,11 +753,12 @@ def getrowdata_db(id=0,doclean=False):
    return data,row

 # Fetch a subset of the data from the DB
-def getsmallrowdata_db(columns,ids=[],doclean=True):
+def getsmallrowdata_db(columns,ids=[],doclean=True,workstrokesonly=True):
    prepmultipledata(ids)
    data = read_cols_df_sql(ids,columns)
    if doclean:
-        data = clean_df_stats(data,ignorehr=True)
+        data = clean_df_stats(data,ignorehr=True,
+                              workstrokesonly=workstrokesonly)
    
    return data