fixed imports and type-specific parsing

IBT-FMI · Jul 10, 2017 · 903e227 · 903e227
1 parent 8143d76
commit 903e227
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/samri/pipelines/fc.py b/samri/pipelines/fc.py
@@ -4,7 +4,7 @@
 from os import path, listdir, getcwd, remove
 
 
-from nilearn.input_data import NiftiMasker
+from nilearn.input_data import NiftiMasker, NiftiLabelsMasker
 from nilearn.connectome import ConnectivityMeasure
 from nipype.interfaces import fsl
 

diff --git a/samri/plotting/connectivity.py b/samri/plotting/connectivity.py
@@ -1,4 +1,5 @@
 import numpy as np
+from os import path
 from matplotlib import pyplot as plt
 from numpy import genfromtxt
 import seaborn as sns
@@ -25,7 +26,8 @@ def plot_connectivity_matrix(correlation_matrix,
 
 	#TODO: fix labels in ascending order corresponding to intensity values
 	labels = path.abspath(path.expanduser(labels))
-	correlation_matrix = path.abspath(path.expanduser(correlation_matrix))
+	if isinstance(correlation_matrix, str):
+		correlation_matrix = path.abspath(path.expanduser(correlation_matrix))
 
 	labels_np = genfromtxt(labels, delimiter=',', usecols = (1), dtype = 'str')
 	correlation_matrix = genfromtxt(correlation_matrix, delimiter=',')