misc updates

Author: spunt

fsl/bfsl_ica_aroma.m

@@ -51,8 +51,10 @@
 if isempty(rpfile), disp('Motion Correction file not found!'); return; end
 
 % | - Configure Path
+bspmdir = fileparts(fileparts(mfilename('fullpath')));
+addpath(fullfile(bspmdir, 'dependencies'));
 if isempty(aromadir)
-    aromadir = fullfile(fileparts(fileparts(mfilename('fullpath'))), 'thirdparty', 'ICA_AROMA_79x95x69');
+    aromadir = fullfile(bspmdir, 'thirdparty', 'ICA_AROMA_79x95x69');
 end
 icaaroma    = fullfile(aromadir, 'ICA_AROMA.py');
 if ~exist(icaaroma, 'file'), fprintf('\n\nPATH IS INVALID: %s\n', icaaroma); return; end

level1/bspm_beta2name.m

@@ -6,8 +6,8 @@
     if iscell(beta), beta = char(beta); end
     h       = spm_vol(beta);
     name    = {h.descrip}'; 
-    name    = regexprep(name, '^.*Sn\(\d\)\s', ''); 
-    name    = regexprep(name, '\*bf\(\d\)', '');
+    name    = regexprep(name, '^.*Sn\(\d\)\s', '');
+    name    = regexprep(name, '\*bf.+$', '');
 end