Unify datasets 10: Remove StrictDataset (#2402)

mantidproject · Nov 28, 2024 · e4732a8 · e4732a8
2 parents 1a1937b + 2b7887a
commit e4732a8
Show file tree

Hide file tree

Showing 17 changed files with 90 additions and 411 deletions.
diff --git a/mantidimaging/core/data/dataset.py b/mantidimaging/core/data/dataset.py
@@ -176,7 +176,7 @@ def set_stack(self, file_type: FILE_TYPES, image_stack: ImageStack) -> None:
         if hasattr(self, attr_name):
             setattr(self, attr_name, image_stack)
         else:
-            raise AttributeError(f"StrictDataset does not have an attribute for {attr_name}")
+            raise AttributeError(f"Dataset does not have an attribute for {attr_name}")
 
     def set_stack_by_type_name(self, file_type_name: str, image_stack: ImageStack) -> None:
         file_type_name = file_type_name.upper().replace(" ", "_")
@@ -201,10 +201,6 @@ def is_processed(self) -> bool:
         return False
 
 
-class StrictDataset(Dataset):
-    pass
-
-
 def _get_stack_data_type(stack_id: uuid.UUID, dataset: Dataset) -> str:
     """
     Find the data type as a string of a stack.

diff --git a/mantidimaging/core/data/test/strictdataset_test.py b/mantidimaging/core/data/test/strictdataset_test.py
diff --git a/mantidimaging/core/io/saver.py b/mantidimaging/core/io/saver.py
@@ -182,7 +182,7 @@ def image_save(images: ImageStack,
 
 def nexus_save(dataset: Dataset, path: str, sample_name: str, save_as_float: bool) -> None:
     """
-    Uses information from a StrictDataset to create a NeXus file.
+    Uses information from a Dataset to create a NeXus file.
     :param dataset: The dataset to save as a NeXus file.
     :param path: The NeXus file path.
     :param sample_name: The sample name.
@@ -204,9 +204,9 @@ def nexus_save(dataset: Dataset, path: str, sample_name: str, save_as_float: boo
 
 def _nexus_save(nexus_file: h5py.File, dataset: Dataset, sample_name: str, save_as_float: bool) -> None:
     """
-    Takes a NeXus file and writes the StrictDataset information to it.
+    Takes a NeXus file and writes the Dataset information to it.
     :param nexus_file: The NeXus file.
-    :param dataset: The StrictDataset.
+    :param dataset: The Dataset.
     :param sample_name: The sample name.
     """
     # Top-level group