Merge tag 'v5.34' into develop

hotfix
2017-12-13 19:29:09 +01:00
parent 01255c0d9e 098262607b
commit 1a18f033b4
1 changed files with 4 additions and 1 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1941,7 +1941,10 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,

    f = rowdatadf['TimeStamp (sec)'].diff().mean()
    if f != 0 and not np.isinf(f):
-        windowsize = 2 * (int(10. / (f))) + 1
+        try:
+            windowsize = 2 * (int(10. / (f))) + 1
+        except ValueError:
+            windowsize = 1
    else:
        windowsize = 1
    if windowsize <= 3: