Merge pull request #27 from thomas-vincent/fix_csaps

Add more checks & warnings about csaps
Nirstorm · May 8, 2018 · d3a6188 · d3a6188
2 parents 17dadc8 + db3b8d3
commit d3a6188
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/bst_plugin/process_nst_get_data_perform_2018.m b/bst_plugin/process_nst_get_data_perform_2018.m
@@ -159,7 +159,7 @@
     bst_error('Fluence data installation failed');
 end
 
-bst_progress('start', 'Check dependencies', 'Checking dependencies...', 1, 2);
+bst_progress('start', 'Check dependencies', 'Checking dependencies...', 1, 3);
 %% Check CPLEX
 try
     cplx = Cplex();
@@ -178,7 +178,13 @@
 if ~license('test', 'Curve_Fitting_Toolbox')
     bst_report('Warning', sProcess, sInputs, 'Curve Fitting Toolbox not available. Motion correction will not work.');
 else
-    bst_report('Info', sProcess, sInputs, 'Curve Fitting Toolbox found');
+    if isempty(which('csaps'))
+        bst_report('Warning', sProcess, sInputs, ...
+                   ['Curve Fitting Toolbox OK but function csaps not found.<BR>' ...
+                    'Try refreshing matlab cache using command: rehash toolboxcache']);
+    else
+        bst_report('Info', sProcess, sInputs, 'Curve Fitting Toolbox found');
+    end
 end
 bst_progress('inc', 1);
 

diff --git a/bst_plugin/process_nst_motion_correction.m b/bst_plugin/process_nst_motion_correction.m
@@ -54,6 +54,16 @@
 
 %% ===== RUN =====
 function OutputFile = Run(sProcess, sInputs) %#ok<DEFNU>
+OutputFile = {};
+
+if ~license('test', 'Curve_Fitting_Toolbox')
+    bst_error('Curve Fitting Toolbox not available');
+    return 
+elseif isempty(which('csaps'))
+    bst_error(['Curve Fitting Toolbox OK but function csaps not found.<BR>' ...
+               'Try refreshing matlab cache using command: rehash toolboxcache']);
+    return
+end
 
 % Get selected events
 event_name =  strtrim(sProcess.options.option_event_name.Value);