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

odf_sh_sharpening function fix and new test #384

Merged
merged 2 commits into from Jun 24, 2014

Conversation

Projects
None yet
3 participants
@mdesco
Contributor

mdesco commented Jun 24, 2014

In odf_sh_to_sharp function, the r2_term was not set properly using function arguments when deconvolution matrices were built. Hence, for already normalized model such as SHORE, the deconvolution was failing. The deconvolution was running as if the input was a q-ball model.

Also, the test testing this was too permissive with a 75 degree crossing angle. I have pushed it down to 45 degrees.

@@ -608,7 +608,7 @@ def odf_sh_to_sharp(odfs_sh, sphere, basis=None, ratio=3 / 15., sh_order=8, lamb
real_sym_sh = sph_harm_lookup[basis]
B_reg, m, n = real_sym_sh(sh_order, theta, phi)
R, P = forward_sdt_deconv_mat(ratio, n)
R, P = forward_sdt_deconv_mat(ratio, n, r2_term=r2_term)

This comment has been minimized.

@arokem

arokem Jun 24, 2014

Member

Good catch!

@@ -206,7 +206,7 @@ def test_forward_sdeconv_mat():
def test_r2_term_odf_sharp():
SNR = None
S0 = 1
angle = 75
angle = 45 #45 degrees is a very tight angle to disentangle

This comment has been minimized.

@arokem

arokem Jun 24, 2014

Member

Would it be silly to test both?

This comment has been minimized.

@Garyfallidis

Garyfallidis Jun 24, 2014

Member

Yeah no need to test both

Garyfallidis added a commit that referenced this pull request Jun 24, 2014

Merge pull request #384 from mdesco/bf_odf_sh_sharp
odf_sh_sharpening function fix and new test

@Garyfallidis Garyfallidis merged commit 018a87b into nipy:master Jun 24, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment