From b2f4ce7ba0fe7676b0aecefbb7abe9a4e0ddb090 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 1 Dec 2016 21:49:43 +0100 Subject: [PATCH] OTW bug fix --- rowers/dataprepnodjango.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index b03f75f1..379a0ddd 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -359,18 +359,18 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, except KeyError: equivergpower = 0*p+50. - #nowindpace = nowindpace.apply(lambda x: timedeltaconv(x)) + nowindpace = nowindpace.apply(lambda x: timedeltaconv(x)) ergvelo = (equivergpower/2.8)**(1./3.) ergpace = 500./ergvelo ergpace[ergpace == np.inf] = 240. - #ergpace = ergpace.apply(lambda x: timedeltaconv(x)) + ergpace = ergpace.apply(lambda x: timedeltaconv(x)) - data['ergpace'] = ergpace - data['nowindpace'] = nowindpace + data['ergpace'] = ergpace*1e3 + data['nowindpace'] = nowindpace*1e3 data['equivergpower'] = equivergpower - data['fergpace'] = nicepaceformat(ergpace) - data['fnowindpace'] = nicepaceformat(nowindpace) + data['fergpace'] = nicepaceformat(ergpace2) + data['fnowindpace'] = nicepaceformat(nowindpace2) data = data.replace([-np.inf,np.inf],np.nan) data = data.fillna(method='ffill')