Fix wrong order of risma columns, update notebook (#70)

* Fix wrong order of rismn columns, update notebook * Delete file * Update changelog
TUW-GEO · Jun 16, 2023 · 66d7980 · 66d7980
1 parent bcb9c37
commit 66d7980
Show file tree

Hide file tree

Showing 3 changed files with 263 additions and 119 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,11 @@ Changelog
 Unreleased changes in master branch
 ===================================
 
+-
+
+Version 1.3.4
+=============
+
 - Fixed bug with parsing sensor files for RISMA network in "header & files" format
 
 Version 1.3.3

diff --git a/docs/examples/interface.ipynb b/docs/examples/interface.ipynb
diff --git a/src/ismn/filehandlers.py b/src/ismn/filehandlers.py
@@ -601,9 +601,9 @@ def __read_format_header_values(self) -> pd.DataFrame:
             names=names,
             usecols=[0, 1, 2, 3, 4],
             skiprows=1,
-            sep=" ",
+            #sep=" ",
             low_memory=False,
-            delim_whitespace=False,
+            delim_whitespace=True,
         )
 
     def __read_csv(self, names=None, usecols=None, skiprows=0, **kwargs):
@@ -632,9 +632,7 @@ def readf(
             skiprows=skiprows,
             parse_dates=[[0, 1]],
             engine="c",
-            delim_whitespace=None,
-            sep=None,
-            low_memory=None,
+            **kwargs
         ):
             try:
                 return pd.read_csv(
@@ -644,8 +642,9 @@ def readf(
                     names=names,
                     parse_dates=parse_dates,
                     engine=engine,
+                    **kwargs
                 )
-            except pd.errors.ParserError as text_exception:
+            except pd.errors.ParserError:
                 return pd.read_csv(
                     filepath_or_buffer=f,
                     skiprows=skiprows,
@@ -654,6 +653,7 @@ def readf(
                     delim_whitespace=True,
                     parse_dates=parse_dates,
                     engine="c",
+                    **kwargs
                 )
 
         if self.root.zip: