From 015bcd8f933ad68518ab766ac38a135669df1920 Mon Sep 17 00:00:00 2001 From: Tom Kirk Date: Wed, 5 Jan 2022 11:06:41 +0000 Subject: [PATCH] dummy commit (no actual changes) --- .gitignore | 0 LICENSE | 0 MANIFEST.in | 0 README.md | 0 docs/Makefile | 0 docs/conf.py | 0 docs/demo.png | Bin docs/demo.pptx | Bin docs/index.rst | 0 docs/make.bat | 0 docs/modules.rst | 0 docs/quickstart.md | 0 docs/regtricks.rst | 0 docs/regtricks.transforms.rst | 0 regtricks/__init__.py | 0 regtricks/multiplication.py | 0 regtricks/transforms/__init__.py | 0 regtricks/transforms/linear.py | 2 +- regtricks/transforms/nonlinear.py | 0 regtricks/wrappers.py | 0 regtricks/x5_interface.py | 0 requirements.txt | 0 setup.py | 0 test.py | 2 +- 24 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 LICENSE mode change 100644 => 100755 MANIFEST.in mode change 100644 => 100755 README.md mode change 100644 => 100755 docs/Makefile mode change 100644 => 100755 docs/conf.py mode change 100644 => 100755 docs/demo.png mode change 100644 => 100755 docs/demo.pptx mode change 100644 => 100755 docs/index.rst mode change 100644 => 100755 docs/make.bat mode change 100644 => 100755 docs/modules.rst mode change 100644 => 100755 docs/quickstart.md mode change 100644 => 100755 docs/regtricks.rst mode change 100644 => 100755 docs/regtricks.transforms.rst mode change 100644 => 100755 regtricks/__init__.py mode change 100644 => 100755 regtricks/multiplication.py mode change 100644 => 100755 regtricks/transforms/__init__.py mode change 100644 => 100755 regtricks/transforms/linear.py mode change 100644 => 100755 regtricks/transforms/nonlinear.py mode change 100644 => 100755 regtricks/wrappers.py mode change 100644 => 100755 regtricks/x5_interface.py mode change 100644 => 100755 requirements.txt mode change 100644 => 100755 setup.py mode change 100644 => 100755 test.py diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/MANIFEST.in b/MANIFEST.in old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/docs/Makefile b/docs/Makefile old mode 100644 new mode 100755 diff --git a/docs/conf.py b/docs/conf.py old mode 100644 new mode 100755 diff --git a/docs/demo.png b/docs/demo.png old mode 100644 new mode 100755 diff --git a/docs/demo.pptx b/docs/demo.pptx old mode 100644 new mode 100755 diff --git a/docs/index.rst b/docs/index.rst old mode 100644 new mode 100755 diff --git a/docs/make.bat b/docs/make.bat old mode 100644 new mode 100755 diff --git a/docs/modules.rst b/docs/modules.rst old mode 100644 new mode 100755 diff --git a/docs/quickstart.md b/docs/quickstart.md old mode 100644 new mode 100755 diff --git a/docs/regtricks.rst b/docs/regtricks.rst old mode 100644 new mode 100755 diff --git a/docs/regtricks.transforms.rst b/docs/regtricks.transforms.rst old mode 100644 new mode 100755 diff --git a/regtricks/__init__.py b/regtricks/__init__.py old mode 100644 new mode 100755 diff --git a/regtricks/multiplication.py b/regtricks/multiplication.py old mode 100644 new mode 100755 diff --git a/regtricks/transforms/__init__.py b/regtricks/transforms/__init__.py old mode 100644 new mode 100755 diff --git a/regtricks/transforms/linear.py b/regtricks/transforms/linear.py old mode 100644 new mode 100755 index 628fb3a..95251e2 --- a/regtricks/transforms/linear.py +++ b/regtricks/transforms/linear.py @@ -148,7 +148,7 @@ def resolve(self, src, ref, *unused): # Array of all voxel indices in the reference grid # Map them into world coordinates, apply the transform # and then into source voxel coordinates for the interpolation - ref2src_vox = (src.world2vox @ self.ref2src @ ref.vox2world) + ref2src_vox = ((src.world2vox @ self.ref2src) @ ref.vox2world) ijk = apply.aff_trans(ref2src_vox, self.cache).T scale = 1 return (ijk, scale) diff --git a/regtricks/transforms/nonlinear.py b/regtricks/transforms/nonlinear.py old mode 100644 new mode 100755 diff --git a/regtricks/wrappers.py b/regtricks/wrappers.py old mode 100644 new mode 100755 diff --git a/regtricks/x5_interface.py b/regtricks/x5_interface.py old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 diff --git a/test.py b/test.py old mode 100644 new mode 100755 index 6b582bc..8e7619e --- a/test.py +++ b/test.py @@ -220,4 +220,4 @@ def test_mcasl2brain(): if __name__ == "__main__": - test_aslmc2MNI() \ No newline at end of file + test_brain2MNI() \ No newline at end of file