-
Notifications
You must be signed in to change notification settings - Fork 16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FIX: Implement AFNI's deoblique operations #117
Conversation
9b8247a
to
41778cb
Compare
Codecov Report
@@ Coverage Diff @@
## master #117 +/- ##
==========================================
+ Coverage 97.88% 98.59% +0.70%
==========================================
Files 13 13
Lines 1184 1208 +24
Branches 183 184 +1
==========================================
+ Hits 1159 1191 +32
+ Misses 18 10 -8
Partials 7 7
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
89cc54e
to
a6dc91b
Compare
Hello @oesteban! Thanks for updating this PR. There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻 Comment last updated at 2022-02-28 17:39:08 UTC |
bd32bbf
to
4ad366e
Compare
Okay, this is as far as I can go for the moment (see afni/afni#353). I'm going to focus on other things while I wait for more feedback from AFNI folks. |
998ac43
to
66a0594
Compare
Finalize the interpretation in I/O of AFNI's linear matrices when reference or moving data are oblique w.r.t. the canonical axes. Resolves: #45.
…affine (without axes swap)
66a0594
to
01a855a
Compare
With the generous support from Paul Taylor <@mrneont> and his answers in afni/afni#353, I have managed to get all tests to PASS. I am not resolving the problem of oblique datasets for displacements fields this time. Resolves: #45. Resolves: #150. Continues: #157.
01a855a
to
38202bb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The notebooks don't run all the way through. Was hoping to use them to guide my review.
Ouch, yes, I think they are not necessary anymore but I agree they are
useful to understand some of the tests. Will try to rework them a little
for your review.
…On Fri, Feb 25, 2022, 21:57 Chris Markiewicz ***@***.***> wrote:
***@***.**** commented on this pull request.
The notebooks don't run all the way through. Was hoping to use them to
guide my review.
------------------------------
In nitransforms/io/afni.py
<#117 (comment)>
:
> + ras : :obj:`bool`
+ Whether output should be referrenced to AFNI's internal system (LPS+) or RAS+
Unused.
------------------------------
In docs/notebooks/01_preparing_images.ipynb
<#117 (comment)>
:
> @@ -745,9 +757,11 @@
}
],
"source": [
- "!3dAllineate -base someones_anatomy_rot.nii.gz -input someones_anatomy_rot.nii.gz -1Dmatrix_apply M.afni -prefix moved-afni.nii.gz -final NN\n",
- "nb.load('moved-afni.nii.gz').orthoview()\n",
- "moved.orthoview()"
+ "afnixfm = nt.io.afni.AFNILinearTransform.from_filename('M.afni')\n",
+ "xfm = nt.linear.Affine(afnixfm.to_ras(), reference=deobnii)\n",
+ "nt_with_afni = xfm.apply(plumb, order=0)\n",
plumb is not defined.
—
Reply to this email directly, view it on GitHub
<#117 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAESDRVNQMTAWTPCG2GQUWTU47UKBANCNFSM47W2FZLQ>
.
Triage notifications on the go with GitHub Mobile for iOS
<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675>
or Android
<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
If they're not necessary, that's fine. Just assumed that with their changes they were intended to curate the situation. |
I was thinking about removing the notebook 02 about AFNI, and rewriting 01
to focus on stuff from the io submodule.
…On Fri, Feb 25, 2022, 22:46 Chris Markiewicz ***@***.***> wrote:
If they're not necessary, that's fine. Just assumed that with their
changes they were intended to curate the situation.
—
Reply to this email directly, view it on GitHub
<#117 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAESDRQ7GYA5VXYUKT2JZCTU472CNANCNFSM47W2FZLQ>
.
Triage notifications on the go with GitHub Mobile for iOS
<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675>
or Android
<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Co-authored-by: Chris Markiewicz <[email protected]>.
Co-authored-by: Chris Markiewicz <[email protected]>.
f4db892
to
4d4e3d9
Compare
Okay, I think now the notebooks are in much better shape. LMKWYT. |
I would imagine you are really up to your eyeballs @effigies - should I wait for review or can I go ahead and maybe you can catch up later when the integration with nibabel starts? |
Was just starting to have a quick look before our call, and planned to finish up after. I'm okay if you want to go ahead and merge, but I did want to suggest that it might make sense to think of affines generally as |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, the code makes sense once I worked through the algebra, which I coded up as a docstring so others don't have to do it again. I read the tests with an eye to get the gist, but did not verify that all comments correctly described what was being done. This looks reasonable to me.
Co-authored-by: Chris Markiewicz <[email protected]>
e767525
to
bea9c27
Compare
Finalize the interpretation in I/O of AFNI's linear matrices when reference
or moving data are oblique w.r.t. the canonical axes.
Resolves: #45.