Skip to content
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] Only use good echoes for metric calculation/optimal combination #358

Merged
merged 32 commits into from
Apr 18, 2020
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a9068b4
Only use good echoes for metric calculation and optimal combination.
tsalo Jul 10, 2019
b0a2966
Change variable name.
tsalo Jul 10, 2019
4eebf5f
A bit more memory management.
tsalo Jul 10, 2019
faaaedf
Fix.
tsalo Jul 10, 2019
4caa6ec
Fix tests.
tsalo Jul 10, 2019
fac5749
Fix style.
tsalo Jul 10, 2019
10cd675
Limit mask to adaptive_mask >= 3
tsalo Jul 11, 2019
a320d38
Fix make_adaptive_mask
tsalo Jul 11, 2019
e2da4d1
Fix test.
tsalo Jul 11, 2019
a37f861
Update outputs.
tsalo Jul 11, 2019
92a9224
Merge branch 'master' into use-adaptive-mask
tsalo Jul 15, 2019
bc31c78
Merge branch 'master' into use-adaptive-mask
tsalo Jul 17, 2019
e17ae0e
Merge remote-tracking branch 'ME-ICA/master' into use-adaptive-mask
tsalo Jul 23, 2019
a47c2d6
Merge remote-tracking branch 'ME-ICA/master' into use-adaptive-mask
tsalo Jul 23, 2019
509a224
Merge remote-tracking branch 'ME-ICA/master' into use-adaptive-mask
tsalo Nov 11, 2019
d852a6f
Remove old file.
tsalo Nov 11, 2019
2379fc1
Revert some variable name changes.
tsalo Nov 11, 2019
0062679
Revert some more.
tsalo Nov 11, 2019
e13ad17
Merge remote-tracking branch 'ME-ICA/master' into use-adaptive-mask
tsalo Dec 1, 2019
a565e68
Fix style issues with test.
tsalo Dec 1, 2019
9e00632
Merge branch 'master' into use-adaptive-mask
tsalo Dec 11, 2019
0b4ec14
Merge branch 'master' into use-adaptive-mask
tsalo Dec 28, 2019
261b110
Add constant when calculating betas.
tsalo Dec 28, 2019
c6ea7d3
Merge remote-tracking branch 'ME-ICA/master' into use-adaptive-mask
tsalo Jan 16, 2020
af60558
Merge remote-tracking branch 'ME-ICA/master' into use-adaptive-mask
tsalo Jan 23, 2020
c5417ad
Drop extra components from outputs file.
tsalo Feb 2, 2020
99129da
Improve tedpca docstring.
tsalo Apr 17, 2020
b249616
Improve description of adaptive mask.
tsalo Apr 17, 2020
47719d9
Change empty to unstable.
tsalo Apr 17, 2020
e435343
Update tedana/combine.py
tsalo Apr 18, 2020
e544bb3
Update tedana/combine.py
tsalo Apr 18, 2020
1b19c76
Update tedana/combine.py
tsalo Apr 18, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve description of adaptive mask.
tsalo committed Apr 17, 2020

Verified

This commit was signed with the committer’s verified signature.
simeonschaub Simeon David Schaub
commit b2496160b6f92ea5b4554d74cd0473407e3987c5
5 changes: 4 additions & 1 deletion tedana/combine.py
Original file line number Diff line number Diff line change
@@ -108,7 +108,10 @@ def make_optcom(data, tes, adaptive_mask, t2s=None, combmode='t2s', verbose=True
tes : (E,) :obj:`numpy.ndarray`
Array of TEs, in seconds.
adaptive_mask : (S,) :obj:`numpy.ndarray`
Brain adaptive_mask in 3D array.
Adaptive mask of the data indicating those voxels for which at least
tsalo marked this conversation as resolved.
Show resolved Hide resolved
three echos are available. If this is less than the total number of
collected echos, we assume that later echos do not provided
meaningful signal.
t2s : (S [x T]) :obj:`numpy.ndarray` or None, optional
Estimated T2* values. Only required if combmode = 't2s'.
Default is None.