From c23542154c0f353f58cdc2832c5c7d5c232b6afe Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 12 May 2017 21:07:25 +0200 Subject: [PATCH 1/2] double lbstoN correction --- rowers/dataprep.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 84a25803..a0664223 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -859,8 +859,8 @@ def getrowdata_db(id=0,doclean=False): if doclean: data = clean_df_stats(data,ignorehr=True) - data['averageforce'] = data['averageforce']*lbstoN - data['peakforce'] = data['peakforce']*lbstoN + data['averageforce'] = data['averageforce'] + data['peakforce'] = data['peakforce'] return data,row From 2340b1750026e8b9b8186bff5f5346f6bfd71085 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 12 May 2017 21:09:17 +0200 Subject: [PATCH 2/2] further correction --- rowers/dataprep.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index a0664223..359229ed 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -869,10 +869,10 @@ def getsmallrowdata_db(columns,ids=[],doclean=True,workstrokesonly=True): prepmultipledata(ids) data = read_cols_df_sql(ids,columns) - if 'peakforce' in columns: - data['peakforce'] = data['peakforce']*lbstoN - if 'averageforce' in columns: - data['averageforce'] = data['averageforce']*lbstoN + # if 'peakforce' in columns: + # data['peakforce'] = data['peakforce']*lbstoN + # if 'averageforce' in columns: + # data['averageforce'] = data['averageforce']*lbstoN if doclean: data = clean_df_stats(data,ignorehr=True,