Skip to content

Moved the RT fmrisim generator and updated it to use resource stream #460

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.

Sign up for GitHub

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

Merged
mihaic merged 37 commits into from
May 5, 2020
Merged

Moved the RT fmrisim generator and updated it to use resource stream #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f0c9b68
Moved the RT fmrisim generator and updated it to use resource stream
Mar 27, 2020
b9f11ae
PEP8 issues
Mar 28, 2020
34afff0
PEP8 issues
Mar 28, 2020
58c07e4
PEP8 issues
Mar 28, 2020
61a5b8e
Updates based on comments
Apr 7, 2020
eb5fcee
Does not delete contents of tmp_path when function is called
Apr 7, 2020
156798a
fixed the resource stream path
Apr 7, 2020
dc15451
fixed the resource stream path
Apr 7, 2020
0edc66b
pep8 error
Apr 7, 2020
330f4de
pep8 error
Apr 7, 2020
6e502a1
pep8 error
Apr 7, 2020
33e73e3
Wrong function call
Apr 7, 2020
6ba226c
Wrong function call
Apr 7, 2020
1b30e9e
Fix the test for run-checks
Apr 8, 2020
a8f655b
Add pydicom to the list of software
Apr 8, 2020
5719137
Remove the deep copy that protects the dictionary across function calls
Apr 8, 2020
7da52c8
Remove the deep copy that protects the dictionary across function calls
Apr 8, 2020
3edd15f
Remove the deep copy that protects the dictionary across function calls
Apr 8, 2020
e925a4c
Resource stream updates
Apr 15, 2020
bb3e67d
Resource stream updates
Apr 15, 2020
e93e9f6
Resource stream updates
Apr 15, 2020
b1d67a9
Resource stream updates
Apr 16, 2020
87d358c
Resource stream updates
Apr 16, 2020
6176a55
Add resource support for text files
Apr 20, 2020
8c3498d
Update for file name appending
Apr 30, 2020
6629e57
Make posix path a string
Apr 30, 2020
a8bf77c
Reorder function calls
Apr 30, 2020
1caefe9
Reorder function calls
Apr 30, 2020
8ff7cb2
PEP8 error
Apr 30, 2020
107e9e7
Make docstring consistent with the Sphinx styles
May 2, 2020
a7673c1
Make docstring consistent with the Sphinx styles
May 2, 2020
14a63e0
Update for python 3.5, improved arg parser and fixed a big with defau…
May 4, 2020
4e3a07c
Fixed underscore
May 4, 2020
a129015
Make python 3.5 compatible for the path
May 4, 2020
2a039c7
Make python 3.5 compatible for the path
May 4, 2020
5334129
dev: Use setuptools include_package_data
mihaic May 5, 2020
c1cbd81
Merge branch 'master' into fix-data
mihaic May 5, 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
3 changes: 2 additions & 1 deletion brainiak/utils/fmrisim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2217,7 +2217,8 @@ def mask_brain(volume,
if mask_self is True:
mask_raw = volume
elif template_name is None:
mask_raw = np.load(resource_stream(__name__, "grey_matter_mask.npy"))
mfn = resource_stream(__name__, "sim_parameters/grey_matter_mask.npy")
mask_raw = np.load(mfn)
else:
mask_raw = np.load(template_name)

Expand Down
Loading