Merge pull request #1 from Photon-HDF5/master

Merge upstream
harripd · May 19, 2024 · 881c42f · 881c42f
2 parents 1290c6b + 7ed3981
commit 881c42f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/phconvert/hdf5.py b/phconvert/hdf5.py
@@ -402,8 +402,6 @@ def save_photon_hdf5(data_dict,
             kwargs = dict(skip_measurement_specs=skip_measurement_specs,
                           warnings=warnings, require_setup=require_setup)
             assert_valid_photon_hdf5(h5file, **kwargs)
-    except Exception as e:
-        raise e
     finally:
         if close:
             h5file.close()

diff --git a/phconvert/smreader.py b/phconvert/smreader.py
@@ -35,6 +35,7 @@
 """
 
 import numpy as np
+from os.path import getsize
 
 
 class Decoder:
@@ -105,7 +106,8 @@ def load_sm(fname, return_labels=False):
         timestamps, detectors and optionally a list of detectors labels
     """
     with open(fname, 'rb') as f:
-        fulldata = f.read()
+        fulldata = bytearray(getsize(fname))
+        f.readinto(fulldata)
 
     header_size, labels = decode_header(fulldata)
     rawdata = fulldata[header_size:]