fix: identifiers not computed for qpformat files

CHANGELOG

@@ -1,3 +1,6 @@
+0.3.3
+ - fix: qpimage file formats: identifiers were not unique, but simply
+   copied from the input hdf5 file
 0.3.2
  - setup: add qpimage version dependency
 0.3.1

qpformat/file_formats/series_hdf5_qpimage.py

@@ -21,10 +21,16 @@ def _qpseries(self):
 
     @property
     def identifier(self):
+        # Qpformat generates a new identifier that also depends on the given
+        # keyword arguments. Thus, the identifiers of source and modified
+        # dataset must not be identical.
         with self._qpseries() as qps:
             identifier = qps.identifier
         if identifier is None:
-            identifier = super(SeriesHdf5Qpimage, self).identifier
+            identifier = ""
+        else:
+            identifier += "_"
+        identifier += super(SeriesHdf5Qpimage, self).identifier
         return identifier
 
     def get_identifier(self, idx):

qpformat/file_formats/single_hdf5_qpimage.py

@@ -14,11 +14,16 @@ class SingleHdf5Qpimage(SingleData):
 
     @property
     def identifier(self):
+        # Qpformat generates a new identifier that also depends on the given
+        # keyword arguments. Thus, the identifiers of source and modified
+        # dataset must not be identical.
         with qpimage.QPImage(h5file=self.path, h5mode="r") as qpi:
             if "identifier" in qpi:
                 identifier = qpi["identifier"]
             else:
-                identifier = super(SingleHdf5Qpimage, self).identifier
+                identifier = ""
+        identifier += "_"
+        identifier += super(SingleHdf5Qpimage, self).identifier
         return identifier
 
     def get_identifier(self, idx=0):

tests/test_dataset.py

@@ -81,7 +81,10 @@ def test_save():
     # load h5
     ds2 = qpformat.load_data(path=save_path)
 
-    assert ds.identifier == ds2.identifier
+    assert ds.identifier is not None
+    # Qpformat generates a new identifier that also depends on the given
+    # keyword arguments. Thus, the identifiers are not identical.
+    assert ds.identifier in ds2.identifier
     assert len(ds) == len(ds2)
     assert np.all(ds.get_qpimage(0).pha == ds2.get_qpimage(0).pha)
 

tests/test_single_hdf5_qpimage.py

@@ -20,7 +20,9 @@ def test_identifier():
     ds2 = qpformat.load_data(tf)
 
     assert ds1.identifier != ds2.identifier
-    assert ds2.identifier == "an extremely important string"
+    # Qpformat generates a new identifier that also depends on the given
+    # keyword arguments. Thus, the identifiers are not identical.
+    assert "an extremely important string" in ds2.identifier
     assert ds1.identifier == ds1.get_identifier()
     assert ds2.identifier == ds2.get_identifier()