diff --git a/rowers/dataprep.py b/rowers/dataprep.py index c8c5dc80..a262244d 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -114,10 +114,6 @@ def testdata(time,distance,pace,spm): def getrowdata_db(id=0): data = read_df_sql(id) - # data['pace'] = data['pace']/1.0e6 - # data['ergpace'] = data['ergpace']/1.0e6 - # data['nowindpace'] = data['nowindpace']/1.0e6 - # data['time'] = data['time']/1.0e6 data['x_right'] = data['x_right']/1.0e6 if data.empty: rowdata,row = getrowdata(id=id) @@ -133,7 +129,6 @@ def getrowdata_db(id=0): def getsmallrowdata_db(columns,ids=[]): prepmultipledata(ids) data = read_cols_df_sql(ids,columns) - print columns return data @@ -249,7 +244,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2): return df -def dataprep(rowdatadf,id=0,bands=False,barchart=False,otwpower=False): +def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True): rowdatadf.set_index([range(len(rowdatadf))],inplace=True) t = rowdatadf.ix[:,'TimeStamp (sec)'] t = pd.Series(t-rowdatadf.ix[0,'TimeStamp (sec)']) @@ -353,12 +348,12 @@ def dataprep(rowdatadf,id=0,bands=False,barchart=False,otwpower=False): 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