fix: when adding tests to better cover the new code, a bug with FSL was discovered

Author: oesteban

nitransforms/io/fsl.py

@@ -109,9 +109,7 @@ def to_filename(self, filename):
         output_dir = Path(filename).parent
         output_dir.mkdir(exist_ok=True, parents=True)
         for i, xfm in enumerate(self.xforms):
-            (output_dir / ".".join((str(filename), "%03d" % i))).write_text(
-                xfm.to_string()
-            )
+            (output_dir / f"{filename}.{i:03d}").write_text(str(xfm))
 
     def to_ras(self, moving=None, reference=None):
         """Return a nitransforms' internal RAS matrix."""

nitransforms/io/itk.py

@@ -5,7 +5,7 @@
 from h5py import File as H5File
 from nibabel import Nifti1Header, Nifti1Image
 from nibabel.affines import from_matvec
-from .base import (
+from nitransforms.io.base import (
     BaseLinearTransformList,
     DisplacementsField,
     LinearParameters,

nitransforms/linear.py

@@ -203,8 +203,17 @@ def from_filename(cls, filename, fmt=None, reference=None, moving=None):
         """Create an affine from a transform file."""
         fmtlist = [fmt] if fmt is not None else ("itk", "lta", "afni", "fsl")
 
-        is_array = cls != Affine
+        if fmt is not None and not Path(filename).exists():
+            if fmt != "fsl":
+                raise FileNotFoundError(
+                    f"[Errno 2] No such file or directory: '{filename}'"
+                )
+            elif not Path(f"{filename}.000").exists():
+                raise FileNotFoundError(
+                    f"[Errno 2] No such file or directory: '{filename}[.000]'"
+                )
 
+        is_array = cls != Affine
         errors = []
         for potential_fmt in fmtlist:
             if (potential_fmt == "itk" and Path(filename).suffix == ".mat"):

nitransforms/tests/test_linear.py

@@ -48,6 +48,12 @@ def test_linear_typeerrors2(data_path):
         nitl.Affine.from_filename(data_path / "itktflist.tfm", fmt="itk")
 
 
+def test_linear_filenotfound(data_path):
+    """Exercise errors in Affine creation."""
+    with pytest.raises(FileNotFoundError):
+        nitl.Affine.from_filename("doesnotexist.tfm", fmt="itk")
+
+
 def test_linear_valueerror():
     """Exercise errors in Affine creation."""
     with pytest.raises(ValueError):
@@ -85,6 +91,38 @@ def test_loadsave_itk(tmp_path, data_path, testdata_path):
     )
 
 
+@pytest.mark.parametrize(
+    "image_orientation",
+    [
+        "RAS",
+        "LAS",
+        "LPS",
+        "oblique",
+    ],
+)
+def test_itkmat_loadsave(tmpdir, data_path, image_orientation):
+    tmpdir.chdir()
+
+    io.itk.ITKLinearTransform.from_filename(
+        data_path / f"affine-{image_orientation}.itk.tfm"
+    ).to_filename(f"affine-{image_orientation}.itk.mat")
+
+    xfm = nitl.load(data_path / f"affine-{image_orientation}.itk.tfm", fmt="itk")
+    mat1 = nitl.load(f"affine-{image_orientation}.itk.mat", fmt="itk")
+
+    assert xfm == mat1
+
+    mat2 = nitl.Affine.from_filename(f"affine-{image_orientation}.itk.mat", fmt="itk")
+
+    assert xfm == mat2
+
+    mat3 = nitl.LinearTransformsMapping.from_filename(
+        f"affine-{image_orientation}.itk.mat", fmt="itk"
+    )
+
+    assert xfm == mat3
+
+
 @pytest.mark.parametrize("autofmt", (False, True))
 @pytest.mark.parametrize("fmt", ["itk", "fsl", "afni", "lta"])
 def test_loadsave(tmp_path, data_path, testdata_path, autofmt, fmt):