From 0db945ee396a3a575de7b05a98074b419990e6cd Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 24 Feb 2017 15:59:51 +0100 Subject: [PATCH] dataprep --- rowers/dataprep.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index d7497a78..33827e10 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -774,13 +774,14 @@ def smalldataprep(therows,xparam,yparam1,yparam2): return df # data fusion -def datafusion(id1,id2,column,offset): +def datafusion(id1,id2,columns,offset): df1 = getrowdata_db(id=id1) - columns = ['time',column] + columns = ['time']+columns df2 = getsmallrowdata_db(columns,ids=[id2]) keep1 = set(df1.columns) - keep1.pop(column) + for c in columns: + keep1.pop(c) for c in df1.columns: if not c in keep1: