Merge branch 'fix_from_dict' into '0.3'

[hdf5tomoscan] fix: path is the master file and not the folder path

See merge request !19

tomoscan/esrf/hdf5scan.py

@@ -122,16 +122,6 @@ class HDF5TomoScan(TomoScanBase):
                 scan = os.path.dirname(scan)
             else:
                 self.master_file = self.get_master_file(scan)
-
-                self.master_file = os.path.join(scan, os.path.basename(scan))
-                if os.path.exists(self.master_file + '.nx'):
-                    self.master_file = self.master_file + '.nx'
-                elif os.path.exists(self.master_file + '.hdf5'):
-                    self.master_file = self.master_file + '.hdf5'
-                elif os.path.exists(self.master_file + '.h5'):
-                    self.master_file = self.master_file + '.h5'
-                else:
-                    self.master_file = self.master_file + '.nx'
         else:
             self.master_file = None
 
@@ -284,6 +274,7 @@ class HDF5TomoScan(TomoScanBase):
     @docstring(TomoScanBase.to_dict)
     def to_dict(self) -> dict:
         res = super().to_dict()
+        res[self.DICT_PATH_KEY] = self.master_file
         res[self._DICT_ENTRY_KEY] = self.entry
         return res
 
@@ -312,6 +303,7 @@ class HDF5TomoScan(TomoScanBase):
         assert self.DICT_PATH_KEY in data
         self.path = data[self.DICT_PATH_KEY]
         self._entry = data[self._DICT_ENTRY_KEY]
+        self.master_file = self.get_master_file(self.path)
         return self
 
     @property

tomoscan/esrf/test/test_hdf5scan.py

@@ -85,7 +85,7 @@ class TestHDF5Scan(HDF5TestBaseClass):
         # check conversion to dict
         _dict = self.scan.to_dict()
         scan2 = HDF5TomoScan.from_dict(_dict)
-        self.assertEqual(scan2.path, self.scan.path)
+        self.assertEqual(scan2.master_file, self.scan.master_file)
         self.assertEqual(scan2.entry, self.scan.entry)
 
     def testFrames(self):