Further cleanup

code/classes/SCDclass_expcode.m

@@ -623,10 +623,10 @@ classdef SCDclass_expcode
             if(~ismember(algo.getname,obj.algonamelist))
                 obj.algonamelist{end+1}=algo.getname;
                 obj.algos{end+1}=algo;
-                present=false;
+                algoispresent=false;
             else
-                warning('SCDclass_expcode:addalgorithm','algorithm ''%s'' already present in the expcode, importing only wavegens',algo.getname);
-                present=true;
+                fprintf('algorithm ''%s'' already present in the expcode, importing only wavegens',algo.getname);
+                algoispresent=true;
             end
                 
             % Importing algorithm MDS objects into the main mdscontainer,
@@ -635,20 +635,18 @@ classdef SCDclass_expcode
             basewgstruct=sprintf('SCDsimdata.SCDnode%02d%02d_simdata.wavegen', node, cpu);
             algomdscontainer=algomdscontainer.setwavegenbasestruct(basewgstruct);
             obj.mdscontainer=obj.mdscontainer.importmdswavegens(algomdscontainer);
-            if ~present
-                obj.mdscontainer=obj.mdscontainer.importmdsparams  (algomdscontainer);
-            else
-                return;
-            end
+            
+            if algoispresent, return; end % return if algo is already present
                 
-            % Importing exported tps
+            % Importing exported tunable parameters
+            obj.mdscontainer=obj.mdscontainer.importmdsparams  (algomdscontainer);
             algoexptps=algo.getexportedtps;
-            if(numel(algoexptps)>0)
-                for(ii=1:numel(algoexptps))
-                    if(~ismember(algoexptps{ii},obj.exportedtps))
+            if numel(algoexptps)>0
+                for ii=1:numel(algoexptps)
+                    if ~ismember(algoexptps{ii},obj.exportedtps)
                         obj.exportedtps{end+1}=algoexptps{ii};
                     else
-                        warning('SCDclass_expcode:addalgorithm','exported tunparams sctruct ''%s'' already present, ignoring',algoexptps{ii})
+                        fprintf('exported tunparams sctruct ''%s'' already present, ignoring',algoexptps{ii})
                     end
                 end
             end