trying to cover another part. this refs #294

ornlneutronimaging · Mar 2, 2024 · 938cdbc · 938cdbc
1 parent 813571a
commit 938cdbc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/imars3d/backend/dataio/data.py b/src/imars3d/backend/dataio/data.py
@@ -190,9 +190,9 @@ def __call__(self, **params):
                 tqdm_class=params.tqdm_class,
             )
 
-        elif sigs.intersection(ref) == {"files", "dir"}:
-            logger.error("Other cases of files and dir cannot be used at the same time")
-            raise ValueError("Mix signatures not allowed")
+        elif ("ct_files" in params.keys()) and ("ob_dir" in params.keys()): 
+            logger.error("ct_files and ob_dir mixed not allowed!")
+            raise ValueError("Mix signatures (ct_files, ob_dir) not allowed!")
 
         elif sigs.intersection(ref) == {"files"}:
             logger.debug("Load by file list")

diff --git a/tests/unit/backend/dataio/test_data.py b/tests/unit/backend/dataio/test_data.py
@@ -98,6 +98,7 @@ def test_load_data(
     with pytest.raises(ValueError):
         load_data(ct_files=1, ob_files=[], dc_files=[])
         load_data(ct_dir=1, ob_files=[])
+        load_data(ct_files=1, ob_dir="/tmp")
         load_data(ct_files=[], ob_files=[], dc_files=[], ct_fnmatch=1)
         load_data(ct_files=[], ob_files=[], dc_files=[], ob_fnmatch=1)
         load_data(ct_files=[], ob_files=[], dc_files=[], dc_fnmatch=1)