mostly cosmetic

code/classes/SCDclass_expcode.m

@@ -36,7 +36,7 @@ classdef SCDclass_expcode
         mdscontainer        % container class for MDS+ interface objects
         taskcontainer       % container class for generic init and term task objects
         exportedtps         % list of tunable parameters variable to be exported
-        fpinits            % list of standard inits scripts
+        fpinits             % list of standard inits scripts
         modeltoactualize    % name of the algorithm to actualize ('all' means all coonfigured) 
         algos               % list of algorithms objects
         nodes               % array of node properties structs
@@ -306,13 +306,16 @@ classdef SCDclass_expcode
            % and wavegens, call actualizedata for that
            fprintf('Setting up expcode %d, ''%s'', configuring wrappers ...\n',obj.maincode,obj.name);
            obj=obj.setupwrappers;
-           fprintf('Setting up main expcode data dictionary')
-           obj = obj.setupmaindd;
-           
-           obj.setupvaralgo;
+
            fprintf('Setting up expcode %d, ''%s'', configuring data dictionaries ...\n',obj.maincode,obj.name);
            obj.setupwrapdd;
            obj.setupalgodd;
+
+           fprintf('Setting up variant model configuration')
+           obj.setupvaralgo;
+
+           fprintf('Setting up main expcode data dictionary')
+           obj = obj.setupmaindd;
            fprintf('Setting up expcode %d, ''%s'', configuring default tunable parameters ...\n',obj.maincode,obj.name);           
            obj.updatedefaulttp;
            fprintf('Setting up expcode %d, ''%s'', configuring global data ...\n',obj.maincode,obj.name);
@@ -330,8 +333,8 @@ classdef SCDclass_expcode
         function obj = setupmaindd(obj)
           % prepare main top-level SLDD
           
-          ddpath = which(obj.ddname);
-          if isempty(ddpath)
+          ddfullpath = which(obj.ddname);
+          if isempty(ddfullpath)
             dd = Simulink.data.dictionary.create(fullfile(obj.ddpath,obj.ddname));
           else 
             dd = Simulink.data.dictionary.open(obj.ddname);
@@ -340,7 +343,9 @@ classdef SCDclass_expcode
           
           % link data dictionaries for active nodes
           for ii=obj.activenodes
-            dd.addDataSource(obj.nodes(ii).datadict);
+            mydatasource = obj.nodes(ii).datadict;
+            fprintf('adding data source %s to %s\n',mydatasource,obj.ddname)
+            dd.addDataSource(mydatasource);
           end
           % Set up RFM bus
           addRFMbus(obj,dd)