From 85384c2ebffc7ccf8576542ba03df031a24d1e1f Mon Sep 17 00:00:00 2001 From: Eilidh MacNicol Date: Thu, 5 May 2022 11:51:53 +0100 Subject: [PATCH 1/3] enh: add to get_spm_globals() --- spm_funcs.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/spm_funcs.py b/spm_funcs.py index 450c1ab..97758e3 100644 --- a/spm_funcs.py +++ b/spm_funcs.py @@ -54,8 +54,14 @@ def get_spm_globals(fname): spm_vals : array SPM global metric for each 3D volume in the 4D image. """ - # +++your code here+++ - # return + img = nib.load(fname) + data = img.get_fdata() + + vals = [ + spm_global(data[:,:,:,vol]) for vol in range(img.shape[-1]) + ] + + return vals def main(): From 1e93e702cf1352b2f8821c8e193c0562a6bbd258 Mon Sep 17 00:00:00 2001 From: Eilidh MacNicol Date: Thu, 5 May 2022 11:58:05 +0100 Subject: [PATCH 2/3] fix: return array as specified in docstring --- spm_funcs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spm_funcs.py b/spm_funcs.py index 97758e3..09ac318 100644 --- a/spm_funcs.py +++ b/spm_funcs.py @@ -57,9 +57,9 @@ def get_spm_globals(fname): img = nib.load(fname) data = img.get_fdata() - vals = [ + vals = np.array([ spm_global(data[:,:,:,vol]) for vol in range(img.shape[-1]) - ] + ]) return vals From 8f83e55ed2c7a9d3dd4a352e42e699fb614c6521 Mon Sep 17 00:00:00 2001 From: Eilidh MacNicol Date: Thu, 5 May 2022 12:02:08 +0100 Subject: [PATCH 3/3] fix: update variable names to match docstring --- spm_funcs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spm_funcs.py b/spm_funcs.py index 09ac318..71ea24c 100644 --- a/spm_funcs.py +++ b/spm_funcs.py @@ -57,11 +57,11 @@ def get_spm_globals(fname): img = nib.load(fname) data = img.get_fdata() - vals = np.array([ + spm_vals = np.array([ spm_global(data[:,:,:,vol]) for vol in range(img.shape[-1]) ]) - return vals + return spm_vals def main():