Merge pull request #52 from ramenbytes/close-files-on-error

Ensure h5file is closed even if validation fails
Photon-HDF5 · May 19, 2024 · 28488e6 · 28488e6
2 parents 3a86e58 + cb42325
commit 28488e6
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/phconvert/hdf5.py b/phconvert/hdf5.py
@@ -397,12 +397,14 @@ def save_photon_hdf5(data_dict,
     h5file.flush()
 
     ## Validation
-    if validate:
-        kwargs = dict(skip_measurement_specs=skip_measurement_specs,
-                      warnings=warnings, require_setup=require_setup)
-        assert_valid_photon_hdf5(h5file, **kwargs)
-    if close:
-        h5file.close()
+    try:
+        if validate:
+            kwargs = dict(skip_measurement_specs=skip_measurement_specs,
+                          warnings=warnings, require_setup=require_setup)
+            assert_valid_photon_hdf5(h5file, **kwargs)
+    finally:
+        if close:
+            h5file.close()
 
 
 def _is_mutispot(h5root_or_dict):