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

typos + pep stuf #308

Merged
merged 2 commits into from Jan 7, 2014

Conversation

Projects
None yet
2 participants
@samuelstjean
Contributor

samuelstjean commented Jan 6, 2014

Found some while reading stuff, nothing major.

@arokem

This comment has been minimized.

Member

arokem commented Jan 6, 2014

Any idea what this is all about?

https://travis-ci.org/nipy/dipy/jobs/16482421

On Mon, Jan 6, 2014 at 11:07 AM, Samuel St-Jean notifications@github.comwrote:

Found some while reading stuff, nothing major.

You can merge this Pull Request by running

git pull https://github.com/samuelstjean/dipy typo_csd

Or view, comment on, or merge it at:

#308
Commit Summary

  • typos + pep stuf

File Changes

  • M dipy/reconst/csdeconv.pyhttps://github.com//pull/308/files#diff-0(60)

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com//pull/308
.

@@ -73,7 +74,7 @@ def __init__(self, gtab, response, reg_sphere=None, sh_order=8, lambda_=1, tau=0
no_params = ((sh_order + 1) * (sh_order + 2)) / 2
if no_params > np.sum(gtab.b0s_mask == False):
if no_params > np.sum(gtab.b0s_mask is False):

This comment has been minimized.

@arokem

arokem Jan 6, 2014

Member

OK - this won't work. The comparison is an array comparison, so I don't think that we want to use is.

@@ -164,7 +165,7 @@ def __init__(self, gtab, ratio, reg_sphere=None, sh_order=8, lambda_=1., tau=0.1
no_params = ((sh_order + 1) * (sh_order + 2)) / 2
if no_params > np.sum(gtab.b0s_mask == False):
if no_params > np.sum(gtab.b0s_mask is False):

This comment has been minimized.

@arokem

arokem Jan 6, 2014

Member

Same here

# focus on trying to eliminate it. In a sense, this "adds" a
# measurement, which can help to better estimate the fodf_sh, even if
# Wherever there is a negative amplitude value on the fODF, it
# concatinates a value to the S vector so that the estimation can

This comment has been minimized.

@arokem

arokem Jan 6, 2014

Member

"concatenates"

@arokem

This comment has been minimized.

Member

arokem commented Jan 7, 2014

Nice. Onward and upward!

arokem added a commit that referenced this pull request Jan 7, 2014

@arokem arokem merged commit 997a7bd into nipy:master Jan 7, 2014

1 check passed

default The Travis CI build passed
Details

@samuelstjean samuelstjean deleted the samuelstjean:typo_csd branch Jul 4, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment