Merge tag 'v4.34' into develop

hotfixed bug
2017-10-22 11:58:14 +02:00
parent e541289066 22f9ed2c92
commit c4c9ec6460
1 changed files with 7 additions and 1 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -182,9 +182,15 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
    except KeyError:
        pass

-    datadf = datadf.clip(lower=0)
+
+    try:
+        datadf = datadf.clip(lower=0)
+    except TypeError:
+        pass
+
    datadf.replace(to_replace=0, value=np.nan, inplace=True)

+
    # return from positive domain to negative
    try:
        datadf['catch'] = -datadf['catch']