-
Notifications
You must be signed in to change notification settings - Fork 58
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
[ENH] add images_to_coordinates #446
Conversation
Codecov Report
@@ Coverage Diff @@
## master #446 +/- ##
==========================================
- Coverage 83.25% 83.23% -0.02%
==========================================
Files 40 40
Lines 4024 4110 +86
==========================================
+ Hits 3350 3421 +71
- Misses 674 689 +15
Continue to review full report at Codecov.
|
I think this is ready for review, @tyarkoni and @tsalo. |
f1fac09
to
e044e81
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.
Looks good! Only a couple of minor comments, one of which is largely obsoleted by our conversation.
nimare/transforms.py
Outdated
else: | ||
return None | ||
|
||
|
||
class CoordinateGenerator(Transformer): | ||
"""Extract peak statistical coordinates from statistical z or p maps. |
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.
Looks like the docstring needs updating to reflect that it's now in a class
8b551e0
to
c7e0007
Compare
17af2b8
to
514ce4c
Compare
I think with one final look over, this should be ready to merge. |
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.
Everything is looking really good. Most of my comments are about docstrings, although there is one about whether metadata should be logged. Also, there is a conflict that needs to be addressed. Finally, can you remove [WIP]
from the PR title since it's ready for review?
add peak z-stats use MNI or TAL for space treat p value maps as cluster table expects
- allow for two sided reporting
Co-authored-by: Taylor Salo <[email protected]>
- add more documentation about ImagesToCoordinates - change name from CoordinateGenerator to ImagesToCoordinates to not confuse with generate.py - add parameter to remove subpeaks if desired - test parameter remove_subpeaks
1263d1f
to
9c89f2c
Compare
several rebases later, I think I've covered @tsalo review comments, ready for another check before merging (make sure my rebases did not undo anything) |
@tsalo I think this is ready for merge (I just don't want to do it without your approval) |
Sorry yes I went through and resolve all of my outstanding comments. I was just planning to check things over one last time today, but honestly I'm happy to merge now and we can address any issues as they come up. |
Closes #423 .
Changes proposed in this pull request:
use transformer class to make ImageToCoordinates
test ImageToCoordinates
add notebook demonstrating use of ImageToCoordinates
add
z_to_p
function for cases when z-maps are not available, but you still specifyz_threshold
as a z-valuetest
z_to_p
fix bug in
dict_to_coordinates
How should I handle circular dependencies for
get_masker
?how to handle missing required stat maps?
merge_strategy
parameter with three different options for users to decide whether to overwrite existing coordinates, and to skip generating coordinates for study contrasts without the required z or p maps.somewhat related to the above point, if I include peak statistics for the coordinates that are generated, how should the coordinates that already exist (and do not have peak statistics reported) be represented? As
NaN
s?NaN
s is my current solution.how should negative and positive statistics be handled?
two_sided
parameter now available thanks to @tsalohow should I represent metadata
coordinate_source
column with eitheroriginal
ornimare
(or None)