cleanup

RI-imaging · Mar 18, 2022 · 5d28f5f · 5d28f5f
1 parent 1f03cb3
commit 5d28f5f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/qpformat/file_formats/fmts_raw_oah/series_hdf5_hyperspy.py b/qpformat/file_formats/fmts_raw_oah/series_hdf5_hyperspy.py
@@ -111,4 +111,5 @@ def verify(path):
                 h5.attrs["file_format"].lower() == "hyperspy" and
                     "Experiments" in h5):
                 valid = True
+            h5.close()
         return valid
diff --git a/qpformat/file_formats/fmts_raw_oah/series_hdf5_raw_oah.py b/qpformat/file_formats/fmts_raw_oah/series_hdf5_raw_oah.py
@@ -2,6 +2,7 @@
 import functools
 
 import h5py
+import numpy as np
 import qpimage
 
 from ..dataset import SeriesData
@@ -24,7 +25,7 @@ def get_time(self, idx):
         """Time for each dataset"""
         with h5py.File(self.path) as h5:
             ds = h5[str(idx)]
-            thetime = ds.attrs.get("time", 0)
+            thetime = ds.attrs.get("time", np.nan)
         return thetime
 
     def get_qpimage_raw(self, idx):

diff --git a/qpformat/file_formats/fmts_raw_oah/single_hdf5_raw_oah.py b/qpformat/file_formats/fmts_raw_oah/single_hdf5_raw_oah.py
@@ -1,6 +1,7 @@
 import copy
-import h5py
 
+import h5py
+import numpy as np
 import qpimage
 
 from ..dataset import SingleData
@@ -25,7 +26,7 @@ def get_time(self, idx=0):
         """Time for each dataset"""
         with h5py.File(self.path) as h5:
             ds = h5["0"]
-            thetime = ds.attrs.get("time", 0)
+            thetime = ds.attrs.get("time", np.nan)
         return thetime
 
     def get_qpimage_raw(self, idx=0):

diff --git a/qpformat/file_formats/fmts_raw_oah/single_tif_holo.py b/qpformat/file_formats/fmts_raw_oah/single_tif_holo.py
@@ -65,4 +65,6 @@ def verify(path):
         else:
             if len(tf.pages) == 1:
                 valid = True
+            if not hasattr(path, "seek"):
+                tf.close()
         return valid
diff --git a/qpformat/file_formats/fmts_ready/series_hdf5_qpimage.py b/qpformat/file_formats/fmts_ready/series_hdf5_qpimage.py
@@ -113,4 +113,5 @@ def verify(path):
                 "bg_data" in qpi0["phase"] and
                     "bg_data" in qpi0["amplitude"]):
                 valid = True
+            h5.close()
         return valid
diff --git a/qpformat/file_formats/fmts_ready/single_tif_phasics.py b/qpformat/file_formats/fmts_ready/single_tif_phasics.py
@@ -203,4 +203,5 @@ def verify(path):
                 (tf.pages[0].tags[61242].value !=
                  tf.pages[1].tags[61242].value)):
                 valid = True
+            tf.close()
         return valid