Rebased 'TestPanelClasses' onto 'dev' at diverge point c9c27a2 after pull request changes

Test Panel as Classes modeled off SignalsExp & MControl

variable name changes to exp.SignalsExp

added 'cprintf.m'

updated signals submodule

updated signals submodule

updates submodule signals

updates signals submodule (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

MControl and mc commits to match dev branch

alyx-related commits to match dev branch

updated submodule signals (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

updated signals submodule (to 'TestPanelClasses' branch) and alyx-matlab(to 'dev' branch) and improved 'namedArg'

updated signals submodule ('TestPanelClasses') after rebasing that branch in that submodule

typo fix in 'hw.devices'

made changes for Miles

updated signals (TestPanelClasses) submodule

Rebased 'TestPanelClasses' onto 'dev' at diverge point after pull request changes

Rebased 'TestPanelClasses' onto 'dev' at diverge point

Test Panel as Classes modeled off SignalsExp & MControl

variable name changes to exp.SignalsExp

added 'cprintf.m'

updated signals submodule

updated signals submodule

updates submodule signals

updates signals submodule (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

MControl and mc commits to match dev branch

alyx-related commits to match dev branch

updated submodule signals (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

updated signals submodule (to 'TestPanelClasses' branch) and alyx-matlab(to 'dev' branch) and improved 'namedArg'

updated signals submodule ('TestPanelClasses') after rebasing that branch in that submodule

typo fix in 'hw.devices'

made changes for Miles

updated signals (TestPanelClasses) submodule

updated signals (TestPannelClasses) submodule after incorporating pull request changes

undid variable name changes for Miles

Author: jaib1

+eui/AlyxPanel.m

@@ -217,6 +217,8 @@ function login(obj)
             % Logging out does not cause the token to expire, instead the
             % token is simply deleted from this object.
 
+            % Temporarily disable the Subject Selector
+            obj.NewExpSubject.UIControl.Enable = 'off';
             % Reset headless flag in case user wishes to retry connection
             obj.AlyxInstance.Headless = false;
             % Are we logging in or out?
@@ -282,6 +284,8 @@ function login(obj)
                 notify(obj, 'Disconnected'); % Notify listeners of logout
                 obj.log('Logged out of Alyx');
             end
+            % Reable the Subject Selector
+            obj.NewExpSubject.UIControl.Enable = 'on';
             obj.dispWaterReq()
         end
 
@@ -314,7 +318,7 @@ function giveFutureWater(obj)
               'enter space-separated numbers, i.e. \n',...
               '[tomorrow, day after that, day after that.. etc] \n\n',...
               'Enter "0" to skip a day\nEnter "-1" to indicate training for that day\n']);
-            amtStr = inputdlg(prompt,'Future Amounts', [1 50]);
+            amtStr = newid(prompt,'Future Amounts', [1 50]);
             if isempty(amtStr)||~obj.AlyxInstance.IsLoggedIn
                 return  % user pressed 'Close' or 'x'
             end
@@ -446,10 +450,10 @@ function recordWeight(obj, weight, subject)
                 dlgTitle = 'Manual weight logging';
                 numLines = 1;
                 defaultAns = {'',''};
-                weight = inputdlg(prompt, dlgTitle, numLines, defaultAns);
+                weight = newid(prompt, dlgTitle, numLines, defaultAns);
                 if isempty(weight); return; end
             end
-            % inputdlg returns weight as a cell, otherwise it may now be
+            % newid returns weight as a cell, otherwise it may now be
             weight = ensureCell(weight); % ensure it's a cell
             % convert to double if weight is a string
             weight = iff(ischar(weight{1}), str2double(weight{1}), weight{1});
@@ -601,13 +605,13 @@ function viewSubjectHistory(obj, ax)
                 axWater = axes('Parent',plotBox);
                 plot(axWater, dates, obj.round([records.given_water_total], 'up'), '.-');
                 hold(axWater, 'on');
-                plot(axWater, dates, obj.round([records.given_water_hydrogel], 'down'), '.-');
-                plot(axWater, dates, obj.round([records.given_water_liquid], 'down'), '.-');
+                plot(axWater, dates, obj.round([records.given_water_supplement], 'down'), '.-');
+                plot(axWater, dates, obj.round([records.given_water_reward], 'down'), '.-');
                 plot(axWater, dates, obj.round([records.expected_water], 'up'), 'r', 'LineWidth', 2.0);
                 box(axWater, 'off');
                 xlim(axWater, [min(dates) maxDate]);
                 set(axWater, 'XTickLabel', arrayfun(@(x)datestr(x, 'dd-mmm'), get(axWater, 'XTick'), 'uni', false))
-                ylabel(axWater, 'water/hydrogel (mL)');
+                ylabel(axWater, 'water (mL)');
 
                 % Create table of useful weight and water information,
                 % sorted by date
@@ -627,14 +631,14 @@ function viewSubjectHistory(obj, ax)
                     arrayfun(@(x)iff(isnan(x), [], @()sprintf('%.1f', 0.8*(x-iw)+iw)), expected', 'uni', false), ...
                     weightPctByDate');
                 waterDat = (...
-                    num2cell(horzcat([records.given_water_liquid]', [records.given_water_hydrogel]', ...
+                    num2cell(horzcat([records.given_water_reward]', [records.given_water_supplement]', ...
                     [records.given_water_total]', [records.expected_water]',...
                     [records.given_water_total]'-[records.expected_water]')));
                 waterDat = cellfun(@(x)sprintf('%.2f', x), waterDat, 'uni', false);
                 waterDat(~[records.is_water_restricted],[1,3]) = {'ad lib'};
                 dat = horzcat(dat, waterDat);
 
-                set(histTable, 'ColumnName', {'date', 'meas. weight', '80% weight', 'weight pct', 'water', 'hydrogel', 'total', 'min water', 'excess'}, ...
+                set(histTable, 'ColumnName', {'date', 'meas. weight', '80% weight', 'weight pct', 'water', 'supplement', 'total', 'min water', 'excess'}, ...
                     'Data', dat(end:-1:1,:),...
                     'ColumnEditable', false(1,5));
                 histbox.Widths = [ -1 725];

+eui/MControl.m

@@ -20,6 +20,7 @@
   end
 
   properties (SetAccess = private)
+    AlyxPanel % holds the AlyxPanel object (see buildUI(), eui.AlyxPanel())
     LogSubject % Subject selector control
     NewExpSubject % Experiment selector control
     NewExpType % Experiment type selector control
@@ -33,7 +34,6 @@
   properties (Access = private)
     ParamEditor
     ParamPanel
-    AlyxPanel % holds the AlyxPanel object (see buildUI(), eui.AlyxPanel())
     BeginExpButton % The 'Start' button that begins an experiment
     RigOptionsButton % The 'Options' button that opens the rig options dialog
     NewExpFactory % A struct containing all availiable experiment types and function handles to constructors for their default parameters

+exp/SignalsExp.m

@@ -720,6 +720,8 @@ function mainLoop(obj)
           obj.Data.stimWindowRenderTimes(obj.StimWindowUpdateCount) = renderTime;
           obj.StimWindowInvalid = false;
         end
+        % make sure some minimum time passes before updating signals, to 
+        % improve performance on MC
         if (obj.Clock.now - t) > 0.1 || obj.IsLooping == false
           sendSignalUpdates(obj);
           t = obj.Clock.now;

+exp/inferParameters.m

@@ -5,51 +5,35 @@
 % create some signals just to pass to the definition function and track
 % which parameter names are used
 
-% if ischar(expdef) && file.exists(expdef)
-%   expdeffun = fileFunction(expdef);
-% else
-%   expdeffun = expdef;
-%   expdef = which(func2str(expdef));
-% end
 if ischar(expdef) && file.exists(expdef)
   expdeffun = fileFunction(expdef);
 else
   expdeffun = expdef;
   expdef = which(func2str(expdef));
 end
 
-net = sig.Net;
-e = struct;
-e.t = net.origin('t');
-e.events = net.subscriptableOrigin('events');
-e.pars = net.subscriptableOrigin('pars');
-e.pars.CacheSubscripts = true;
-e.visual = net.subscriptableOrigin('visual');
-e.audio.Devices = @dummyDev;
-e.inputs = net.subscriptableOrigin('inputs');
-e.outputs = net.subscriptableOrigin('outputs');
+e = sig.void;
+pars = sig.void(true);
+audio.Devices = @dummyDev;
 
 try
+  expdeffun(e.t, e.events, pars, e.visual, e.inputs, e.outputs, audio);
 
-  expdeffun(e.t, e.events, e.pars, e.visual, e.inputs, e.outputs, e.audio);
-    
-  % paramNames will be the strings corresponding to the fields of e.pars
+  % paramNames will be the strings corresponding to the fields of pars
   % that the user tried to reference in her expdeffun.
-  paramNames = e.pars.Subscripts.keys';
-  %The paramValues are signals corresponding to those parameters and they
-  %will all be empty, except when they've been given explicit numerical
-  %definitions right at the end of the function - and in that case, we'll
-  %take those values (extracted into matlab datatypes, from the signals,
-  %using .Node.CurrValue) to be the desired default values.
-  paramValues = e.pars.Subscripts.values';
-  parsStruct = cell2struct(cell(size(paramNames)), paramNames);
-  for i = 1:size(paramNames,1)
-      parsStruct.(paramNames{i}) = paramValues{i}.Node.CurrValue;
-  end
+  parsStruct = pars.Subscripts;
+  
+  % Check for reserved fieldnames
+  reserved = {'randomiseConditions', 'services', 'expPanelFun', ...
+    'numRepeats', 'defFunction', 'waterType', 'isPassive'};
+  assert(~any(ismember(fieldnames(parsStruct), reserved)), ...
+    'exp:InferParameters:ReservedParameters', ...
+    'The following param names are reserved:\n%s', ...
+    strjoin(intersect(fieldnames(parsStruct), reserved), ', '))
+  
+  szFcn = @(a)iff(ischar(a), @()size(a,1), @()size(a,2));
   sz = iff(isempty(fieldnames(parsStruct)), 1,... % if there are no paramters sz = 1
-      structfun(@(a)size(a,2), parsStruct)); % otherwise get number of columns
-  isChar = structfun(@ischar, parsStruct); % we disregard charecter arrays
-  if any(isChar); sz = sz(~isChar); end
+      structfun(szFcn, parsStruct)); % otherwise get number of columns
   % add 'numRepeats' parameter, where total number of trials = 1000
   parsStruct.numRepeats = ones(1,max(sz))*floor(1000/max(sz));
   parsStruct.defFunction = expdef;
@@ -60,12 +44,9 @@
   ExpPanel_fn = [path filesep ExpPanel_name ext];
   if exist(ExpPanel_fn,'file'); parsStruct.expPanelFun = ExpPanel_name; end
 catch ex
-  net.delete();
   rethrow(ex)
 end
 
-net.delete();
-
   function dev = dummyDev(~)
     % Returns a dummy audio device structure, regardless of input
     %   Returns a standard structure with values for generating tone
@@ -75,4 +56,4 @@
           'DefaultSampleRate', 44100,...
           'NrOutputChannels', 2);
   end
-end
+end

+hw/devices.m

@@ -69,8 +69,8 @@
   % Get list of audio devices
   devs = getOr(rig, 'audioDevices', PsychPortAudio('GetDevices'));
   % Sanitize the names
-  names = matlab.lang.makeValidName([{'default'} {devs(2:end).DeviceName}],...
-    'ReplacementStyle', 'delete');
+  names = matlab.lang.makeValidName({devs.DeviceName}, 'ReplacementStyle', 'delete');
+  names = iff(ismember('default', names), names, @()[{'default'} names(2:end)]);
   for i = 1:length(names); devs(i).DeviceName = names{i}; end
   rig.audioDevices = devs;
 end
@@ -93,4 +93,4 @@ function configure(deviceName, usedaq)
     end
   end
 
-end
+end

alyx-matlab

@@ -8,7 +8,7 @@
 
 % 2014-02 CB created
 
-defIdx = find(cellfun(@(a) isequal(a, name), args), 1);
+defIdx = find(cellfun(@(a) strcmpi(a, name), args), 1);
 if ~isempty(defIdx)
   present = true;
   value = args{defIdx + 1};