From ad058cb455a943e11135833b3a400e0c7996bfb5 Mon Sep 17 00:00:00 2001
From: p147685 <p147685@XAP021.workspace.rug.nl>
Date: Mon, 30 Mar 2020 13:18:50 +0200
Subject: [PATCH] Completed test. This should be the alpha version.

---
 resources/BSM_Class/BSM.m | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/resources/BSM_Class/BSM.m b/resources/BSM_Class/BSM.m
index 40f4aca..3c2267f 100644
--- a/resources/BSM_Class/BSM.m
+++ b/resources/BSM_Class/BSM.m
@@ -52,7 +52,14 @@ classdef BSM<handle
             % obj.calc(n) to calculated the nth SPM.mat file
             % obj.calc([1 3 6]) to indicate which SPM.mat file to calculate
             
-            
+            %only initialize once. Every subsequent call to this function,
+            %do not reinitialize. 
+            persistent InitDone
+            if isempty(InitDone) || not(InitDone)
+                %   initialize spm job enviourment
+                spm_jobman('initcfg');
+                InitDone = true;
+            end
             SPMidx=[];% will contain the index to the SPMs to work on
             if logical(numel(varargin))
                 SPMidx=varargin{1};
@@ -112,8 +119,7 @@ classdef BSM<handle
                 [val,TF]=obj.MyGetVal('Type',varargin);if TF;obj.Type=val;end
                 [val,TF]=obj.MyGetVal('Acfl',varargin);if TF;obj.Acfl=val;end
             end
-            %   initialize spm job enviourment
-            spm_jobman('initcfg');
+           
         end
         function val=get.NumSPMs(obj)
             val=numel(obj.SPMs);
@@ -259,8 +265,12 @@ classdef BSM<handle
                         obj.RunJob(DirTrialList{e});%process SPM
                         BetaTrialList{e}=spm_select('ExtFPList',DirTrialList{e},'^beta_0001.*.nii$',1);
                     end%      end loop
-                    obj.PackBetas(BetaTrialList,LocalTargetFolder,CurCol)%pack per event result
-                    obj.CleanUp(TargetFolderCurCol);
+                    try 
+                        obj.PackBetas(BetaTrialList,LocalTargetFolder,CurCol)%pack per event result
+                        obj.CleanUp(TargetFolderCurCol);
+                    catch ME
+                        keyboard; %for debuging purpose only
+                    end
                 end % end loop act. col
                 % restore warning status
                 warning(WarnStat);
@@ -269,7 +279,7 @@ classdef BSM<handle
                 rethrow(ME);
             end
         end
-        function CleanUp(~,D)
+        function CleanUp(obj,D)
             if obj.Clean
                 try
                     rmdir(D,'s');