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

added effective drive length

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-03 15:41:51 +01:00
parent 866a4123b4
commit 5e5cc36da0
7 changed files with 109 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataprep.py
View File

@@ -1020,7 +1020,10 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
drivelength = arclength
else:
drivelength = driveenergy/(averageforce*4.44822)
slip = rowdatadf.ix[:,'slip']
totalangle = finish-catch
effectiveangle = finish-wash-catch-slip
if windowsize > 3 and windowsize<len(slip):
wash = savgol_filter(wash,windowsize,3)
slip = savgol_filter(slip,windowsize,3)
@@ -1036,6 +1039,8 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
data['peakforceangle'] = peakforceangle
data['driveenergy'] = driveenergy
data['drivelength'] = drivelength
data['totalangle'] = totalangle
data['effectiveangle'] = effectiveangle
except KeyError:
pass