sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge tag 'v2.75' into develop

Browse Source 
lbstoN corrections
This commit is contained in:
Sander Roosendaal
2017-05-12 21:10:45 +02:00
parent 1c849e8357 dcb2bcc3ae
commit e09b4d2f2b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/dataprep.py
View File

@@ -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
@@ -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,