Merge branch 'develop' into feature/opaqueid

2019-01-25 08:35:38 +01:00
parent 018ee43fdb 58a7b04596
commit dbf98cf8da
73 changed files with 59990 additions and 2468 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1225,7 +1225,10 @@ def handle_nonpainsled(f2, fileformat, summary=''):
    try:
        os.remove(f_to_be_deleted)
    except:
-        os.remove(f_to_be_deleted + '.gz')
+        try:
+            os.remove(f_to_be_deleted + '.gz')
+        except:
+            pass

    return (f2, summary, oarlength, inboard, fileformat)