enh: remove buggy spaces at the end of matrices

Author: oesteban

nitransforms/io/lta.py

@@ -224,19 +224,27 @@ def to_string(self, partial=False):
             "nxforms   = 1",
         ] if not partial else []
 
+        # Standard preamble
         lines += [
             "mean      = {:6.4f} {:6.4f} {:6.4f}".format(*sa["mean"].flatten()),
             "sigma     = {:6.4f}".format(float(sa["sigma"])),
             "1 4 4",
-            ("{:18.15e} " * 4).format(*sa["m_L"][0]),
-            ("{:18.15e} " * 4).format(*sa["m_L"][1]),
-            ("{:18.15e} " * 4).format(*sa["m_L"][2]),
-            ("{:18.15e} " * 4).format(*sa["m_L"][3]),
+        ]
+
+        # Format parameters matrix
+        lines += [
+            " ".join(f"{v:18.15e}" for v in sa["m_L"][i])
+            for i in range(4)
+        ]
+
+        lines += [
             "src volume info",
             str(self["src"]),
             "dst volume info",
             str(self["dst"]),
         ]
+
+        lines += [] if partial else [""]
         return "\n".join(lines)
 
     @classmethod
@@ -253,8 +261,8 @@ def from_string(cls, string, partial=False):
             label, valstring = lines.pop(0).split(" = ")
             assert label.strip() == key
 
-            val = np.genfromtxt([valstring.encode()], dtype=cls.dtype[key])
             if key != "nxforms":
+                val = np.genfromtxt([valstring.encode()], dtype=cls.dtype[key])
                 sa[key] = val.reshape(sa[key].shape)
             else:
                 assert valstring.strip() == "1"
@@ -333,6 +341,7 @@ def to_string(self):
         footer = [
             "subject {}".format(self["subject"]),
             "fscale {:.6f}".format(float(self["fscale"])),
+            "",
         ]
         return "\n".join(header + xforms + footer)
 

nitransforms/tests/data/affine-LAS.fs.lta

@@ -4,10 +4,10 @@ nxforms   = 1
 mean      = 0.0000 0.0000 0.0000
 sigma     = 1.0000
 1 4 4
-9.999989867210388e-01 -9.999993490055203e-04 9.999998146668077e-04 4.000000000000000e+00 
-1.404936308972538e-03 6.216088533401489e-01 -7.833265066146851e-01 2.000000000000000e+00 
-1.617172238184139e-04 7.833271622657776e-01 6.216096282005310e-01 -1.000000000000000e+00 
-0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 
+9.999989867210388e-01 -9.999993490055203e-04 9.999998146668077e-04 4.000000000000000e+00
+1.404936308972538e-03 6.216088533401489e-01 -7.833265066146851e-01 2.000000000000000e+00
+1.617172238184139e-04 7.833271622657776e-01 6.216096282005310e-01 -1.000000000000000e+00
+0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
 src volume info
 valid = 1  # volume info valid
 filename = 
@@ -27,4 +27,4 @@ yras   = 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00
 zras   = 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
 cras   = -2.375000000000000e+00 1.125000000000000e+00 -1.400000000000000e+01
 subject 
-fscale 0.000000
+fscale 0.000000

nitransforms/tests/data/affine-LPS.fs.lta

@@ -4,10 +4,10 @@ nxforms   = 1
 mean      = 0.0000 0.0000 0.0000
 sigma     = 1.0000
 1 4 4
-9.999989867210388e-01 -9.999993490055203e-04 9.999998146668077e-04 4.000000000000000e+00 
-1.404936308972538e-03 6.216088533401489e-01 -7.833265066146851e-01 2.000000000000000e+00 
-1.617172238184139e-04 7.833271622657776e-01 6.216096282005310e-01 -1.000000000000000e+00 
-0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 
+9.999989867210388e-01 -9.999993490055203e-04 9.999998146668077e-04 4.000000000000000e+00
+1.404936308972538e-03 6.216088533401489e-01 -7.833265066146851e-01 2.000000000000000e+00
+1.617172238184139e-04 7.833271622657776e-01 6.216096282005310e-01 -1.000000000000000e+00
+0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
 src volume info
 valid = 1  # volume info valid
 filename = 
@@ -27,4 +27,4 @@ yras   = 0.000000000000000e+00 -1.000000000000000e+00 0.000000000000000e+00
 zras   = 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
 cras   = -2.375000000000000e+00 -1.625000000000000e+00 -1.400000000000000e+01
 subject 
-fscale 0.000000
+fscale 0.000000

nitransforms/tests/data/affine-RAS.fs.lta

@@ -4,10 +4,10 @@ nxforms   = 1
 mean      = 0.0000 0.0000 0.0000
 sigma     = 1.0000
 1 4 4
-9.999989867210388e-01 -9.999993490055203e-04 9.999998146668077e-04 4.000000000000000e+00 
-1.404936308972538e-03 6.216088533401489e-01 -7.833265066146851e-01 2.000000000000000e+00 
-1.617172238184139e-04 7.833271622657776e-01 6.216096282005310e-01 -1.000000000000000e+00 
-0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 
+9.999989867210388e-01 -9.999993490055203e-04 9.999998146668077e-04 4.000000000000000e+00
+1.404936308972538e-03 6.216088533401489e-01 -7.833265066146851e-01 2.000000000000000e+00
+1.617172238184139e-04 7.833271622657776e-01 6.216096282005310e-01 -1.000000000000000e+00
+0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
 src volume info
 valid = 1  # volume info valid
 filename = 
@@ -27,4 +27,4 @@ yras   = 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00
 zras   = 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
 cras   = 3.750000000000000e-01 1.125000000000000e+00 -1.400000000000000e+01
 subject 
-fscale 0.100000
+fscale 0.100000

nitransforms/tests/data/affine-oblique.fs.lta

@@ -4,10 +4,10 @@ nxforms   = 1
 mean      = 0.0000 0.0000 0.0000
 sigma     = 1.0000
 1 4 4
-9.999990000003331e-01 -9.999993333334666e-04 9.999998333333415e-04 4.000000000000001e+00 
-1.404936252078656e-03 6.216088741390576e-01 -7.833265179640612e-01 2.000000000000000e+00 
-1.617172252089032e-04 7.833271395738222e-01 6.216096574657063e-01 -9.999999999999999e-01 
-0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 
+9.999989867210388e-01 -9.999993490055203e-04 9.999998146668077e-04 4.000000000000000e+00
+1.404936308972538e-03 6.216088533401489e-01 -7.833265066146851e-01 2.000000000000000e+00
+1.617172238184139e-04 7.833271622657776e-01 6.216096282005310e-01 -1.000000000000000e+00
+0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
 src volume info
 valid = 1  # volume info valid
 filename = 
@@ -26,5 +26,5 @@ xras   = 9.999990000003334e-01 1.085831056298871e-03 -9.060735348253849e-04
 yras   = -9.999993333334666e-04 9.959521451571500e-01 8.987950021114122e-02
 zras   = 9.999998333333417e-04 -8.987850425874018e-02 9.959522350356693e-01
 cras   = 1.374998625687951e+00 1.247344273937728e+00 1.491772784853978e+00
-subject
-fscale 0.000000
+subject 
+fscale 0.000000

nitransforms/tests/test_io.py

@@ -80,6 +80,39 @@ def test_LinearTransform(tmpdir):
     for vol in ("src", "dst"):
         assert lt[vol]["valid"] == 0
 
+    lta_text = """\
+# LTA file created by NiTransforms
+type      = 1
+nxforms   = 1
+mean      = 0.0000 0.0000 0.0000
+sigma     = 1.0000
+1 4 4
+1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
+0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
+0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00
+0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
+src volume info
+valid = 1  # volume info valid
+filename = file.nii.gz
+volume = 57 67 56
+voxelsize = 2.750000000000000e+00 2.750000000000000e+00 2.750000000000000e+00
+xras   = -1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
+yras   = 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00
+zras   = 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
+cras   = -2.375000000000000e+00 1.125000000000000e+00 -1.400000000000000e+01
+dst volume info
+valid = 1  # volume info valid
+filename = file.nii.gz
+volume = 57 67 56
+voxelsize = 2.750000000000000e+00 2.750000000000000e+00 2.750000000000000e+00
+xras   = -1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
+yras   = 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00
+zras   = 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00
+cras   = -2.375000000000000e+00 1.125000000000000e+00 -1.400000000000000e+01
+"""
+    xfm = LT.from_string(lta_text)
+    assert xfm.to_string() == lta_text
+
 
 def test_LinearTransformArray(tmpdir, data_path):
     lta = LTA()
@@ -177,12 +210,10 @@ def test_Linear_common(tmpdir, data_path, sw, image_orientation, get_testdata):
         xfm = factory.from_fileobj(f)
 
     # Test to_string
-    if (sw, image_orientation) != ("fs", "oblique"):  # Rounding errors
-        assert fs._drop_comments(text) == fs._drop_comments(xfm.to_string())
+    assert fs._drop_comments(text) == fs._drop_comments(xfm.to_string())
 
     xfm.to_filename(fname)
-    if (sw, image_orientation) != ("fs", "oblique"):  # Rounding errors
-        assert filecmp.cmp(fname, str((data_path / fname).resolve()))
+    assert filecmp.cmp(fname, str((data_path / fname).resolve()))
 
     # Test from_ras
     RAS = from_matvec(euler2mat(x=0.9, y=0.001, z=0.001), [4.0, 2.0, -1.0])