Merge DiskData updates

Resolved conflicts with `feature/DiskDataChanges` after `bugfix/subsref` merge into `dev`.

Author: m053m716

+nigeLab/+defaults/Block.m

@@ -134,7 +134,7 @@
    pars.Delimiter 'Stream.mat'];
 TAG.Videos = ... % Videos: behavioral videos
    [pars.Delimiter '%s', ...
-    pars.Delimiter '%g.%s']; % "Video_Left-A_0.mp4" "Video_Left-A_1.mp4"
+    pars.Delimiter '%s.%s']; % "Video_Left-A_0.mp4" "Video_Left-A_1.mp4"
 
 Fields =  { ...
    'Raw';            % 1  - hard-coded for extraction

+nigeLab/+defaults/Event.m

@@ -33,9 +33,9 @@
 %    'Complete';        % 16)
 %    };        
 pars.Name = {...    % Example B (RHD)
-   'trialrunning';    % 1) Trial running "HIGH" events
-   'beambreak';       % 2) Beam break events
-   'nosepoke';        % 3) Nose-poke beam break
+   'trial-running';    % 1) Trial running "HIGH" events
+   'beam-break';       % 2) Beam break events
+   'nose-poke';        % 3) Nose-poke beam break
    'Reach';           % 4) Reach scored onset
    'Grasp';           % 5) Grasp scored onset
    'Support';         % 6) Support scored onset
@@ -138,18 +138,37 @@
 %    'Falling';   % 11)
 %    'Level';     % 12) (skip 13-16 because not 'auto' field)
 %    };
+% pars.EventSource = {... % Example A (RHS)
+%    'Channels';   % 1) 'Stim' is associated with channels
+%    'Streams';    % 2) 
+%    'Streams';    % 3)
+%    'Streams';    % 4)
+%    'Streams';    % 5)
+%    'Streams';    % 6)
+%    'Streams';    % 7)
+%    'Streams';    % 8)
+%    'Streams';    % 9)
+%    'Streams';    % 10)
+%    'Streams';    % 11)
+%    'Streams';    % 12) (skip 13-16 because not 'auto' field)
+%    };
 pars.TrialDetectionInfo = struct(... % For sync using LED (Example B)
    'Field','DigIO',...
-   'Name','trialrunning',...
+   'Name','trial-running',...
    'Source',[],...
-   'Debounce',0.250,...
-   'Threshold',0.5,...
+   'Debounce',0.100,...% Used in parsing other 'auto' events as well
+   'Threshold',0.5,... % Used in parsing other 'auto' events as well
    'Type','Rising');
 pars.EventDetectionType = {... % Example B (RHD)
    'Rising';    % 1)
    'Rising';    % 2) 
    'Rising';    % 3) (skip 4-7 because not 'auto' fields)
    };
+pars.EventSource = {...
+   'Streams';    % 1)
+   'Streams';    % 2) 
+   'Streams';    % 3) (skip 4-7 because not 'auto' fields)
+   };
 
 %% Error parsing (do not change)
 % Check that number of elements of Name matches that of Fields

+nigeLab/+defaults/Queue.m

@@ -25,7 +25,8 @@
 pars.Remote.RecRoot = 'P:/Recorded_Data'; 
 pars.Remote.SaveRoot = 'P:/Processed_Data';
 
-pars.ClusterList = {'CPLMJS'; 'CPLMJS2'; 'CPLMJS3'};
+% pars.ClusterList = {'CPLMJS';'CPLMJS2';'CPLMJS3'};
+pars.ClusterList = {'CPLMJS';'CPLMJS2'};
 pars.NWorkerMinMax = [1,1]; % Min & Max # workers to assign to a job
 pars.WaitTimeSec = 1; % Time to wait between checking for new cluster
 pars.InitTimeSec = 5; % Time to wait when initializing cluster

+nigeLab/+defaults/Video.m

@@ -78,8 +78,9 @@
 % videos, not for things like "beam-break" etc. that are in the separate
 % FieldType of Streams.
 pars = struct;
-pars.HasVideo = false;
-pars.HasVidStreams = false;
+pars.HasVideo = true;
+pars.HasVidStreams = true;
+pars.UseVideoPromptOnEmpty = false;
 
 % % % -- For Video Scoring -- % % %
 
@@ -160,8 +161,8 @@
 % to toggle it.
 
 pars.VidFilePath    = { ... % "Includes" for where videos might be. Stops after first non-empty path.
-   'K:\Rat\Video\BilateralReach\Murphy'; 
-   'K:\Rat\Video\BilateralReach\RC';
+...   'K:\Rat\Video\BilateralReach\Murphy'; 
+...   'K:\Rat\Video\BilateralReach\RC';
    'K:\Rat\Video\Audio Discrimination Task\post-surg'
    };
 
@@ -172,12 +173,14 @@
                            '*_0.MP4','First Video Only';...
                            '*.MP4;*.mp4;*.avi','Video Files (*.mp4,*.avi)';...
                            '*.*','All Files (*.*)'};  
-pars.SelectionUITitle = 'No Videos Found - Select VIDEO associated with BLOCK';
-
 pars.FileExt = '.MP4';
-% For DynamicVars expressions, see 'Metadata parsing' below
-pars.DynamicVars = {'$AnimalID','$Year','$Month','$Day','$SessionID','$View','$MovieID'}; % KUMC: "Murphy"
-% pars.DynamicVars = {'$AnimalID','$Year','$Month','$Day','&MovieID'}; % KUMC: "RC"
+% For DynamicVars expressions, see 'Metadata parsing' below; main
+% difference here is that ALL variables (if there are enough tokens) are
+% included as metadata variables; '$' vs '~' only denotes whether to use
+% that particular variable in figuring out other videos belonging to a
+% given recording.
+pars.DynamicVars = {'$AnimalID','$Year','$Month','$Day','$SessionID','~View','~MovieID'}; % KUMC: "Murphy"
+% pars.DynamicVars = {'$AnimalID','$Year','$Month','$Day','~MovieID'}; % KUMC: "RC"
 pars.MovieIndexVar = 'MovieID'; % KUMC: "RC" (and in general)
 
 % Information about video scoring
@@ -197,14 +200,10 @@
 pars.Alignment_FS = struct('TDT',125,'RHD',100,'RHS',100);
 
 %% Less-likely to change these parameters
-% Paths information
-pars.File = [];
-
 % Metadata parsing
 pars.Delimiter = '_'; % Break filename "variables" by this
 pars.IncludeChar = '$'; % Include data from these variables
 pars.ExcludeChar = '~'; % Exclude data from these variables
-pars.Meta = [];
 
 pars.ValueShortcutFcn = @nigeLab.workflow.defaultVideoScoringShortcutFcn;
 pars.VideoScoringStringsFcn = @nigeLab.workflow.defaultVideoScoringStrings;
@@ -219,17 +218,35 @@
    (~isempty(pars.VidStreamName));
 
 if pars.HasVidStreams
+   dyVar = cellfun(@(x)x(2:end),pars.DynamicVars,'UniformOutput',false);
+   if ismember('Key',dyVar)
+      error(['nigeLab:' mfilename ':BadConfig'],...
+         '[DEFAULTS/VIDEO]: Invalid use of reserved meta variable (''Key'')');
+   end
+   
+   % Check that the CameraSourceVar and MovieIndexVar were added to `pars`
+   if ~isfield(pars,'CameraSourceVar')
+      error(['nigeLab:' mfilename ':BadConfig'],...
+         ['CameraSourceVar parameter field is missing\n' ...
+         '->\t(can be left as [] if unwanted)']);
+   end
+   if ~isfield(pars,'MovieIndexVar')
+      error(['nigeLab:' mfilename ':BadConfig'],...
+         ['MovieIndexVar parameter field is missing\n' ...
+         '->\t(can be left as [] if unwanted)']);
+   end
+   
    n = numel(pars.VidStreamName);
    if ~isempty(pars.CameraSourceVar)
       pars.VidStreamField = cell(n,1);
       pars.VidStreamFieldType = cell(n,1);
 
       % Check that the CameraSourceVar is good
-      dyVar = cellfun(@(x)x(2:end),pars.DynamicVars,'UniformOutput',false);
       idx = ismember(dyVar,pars.CameraSourceVar);
       if sum(idx) ~= 1
-         error('CameraSourceVar (%s) is not a member of pars.DynamicVars (%s)',...
-            pars.CameraSourceVar,dyVar);
+         error(['nigeLab:' mfilename ':BadConfig'],...
+            'CameraSourceVar (%s) is not a member of pars.DynamicVars',...
+            pars.CameraSourceVar);
       end
 
       % For each Cell corresponding to a different subset of markings,

+nigeLab/+defaults/doActions.m

@@ -18,16 +18,16 @@
 %% Set "dependencies" for checking that stages are valid for `doMethods`
 pars = struct;
 pars.doAutoClustering = doAction({'Spikes'},true);
-pars.doBehaviorSync= doAction({'Video'});
-pars.doEventDetection = doAction();
-pars.doEventHeaderExtraction = doAction({'Video'});
+pars.doBehaviorSync= doAction({},false,{'Raw','Video'});
+pars.doEventDetection = doAction({'Raw'},true);
+pars.doEventHeaderExtraction = doAction({},false,{'Raw','Video'});
 pars.doLFPExtraction = doAction({'Raw'},true);
 pars.doRawExtraction = doAction({},true);
 pars.doReReference = doAction({'Filt'},true);
 pars.doSD = doAction({'CAR'},true);
 pars.doUnitFilter = doAction({'Raw'},true);
-pars.doVidInfoExtraction = doAction({'Video'});
-pars.doVidSyncExtraction = doAction({'Video'});
+pars.doVidInfoExtraction = doAction({},true,{});
+pars.doVidSyncExtraction = doAction({},false,{'Raw','Video'});
 
 %% Parse output
 if nargin < 1
@@ -44,7 +44,7 @@
 end
 
 % Helper function to make `doAction` param struct
-   function doStruct = doAction(required,en)
+   function doStruct = doAction(required,en,to_check_on_batch_run)
       %DOACTION  Helper function to create doAction struct
       %
       %  doStruct = doAction({'field1',...,'fieldk'}); Sets required fields
@@ -58,9 +58,20 @@
          en = false;
       end
 
+      if nargin < 3
+         to_check_on_batch_run = {};
+      end
+      
+      if ~isempty(to_check_on_batch_run) && ~isempty(required)
+         error(['nigeLab:' mfilename ':BadConfig'],...
+            '[DOACTIONS]: If .batch has members, .required should be empty.');
+      end
+      
       doStruct = struct;
       doStruct.required = required;
       doStruct.enabled = en;
+      doStruct.batch = to_check_on_batch_run;
+      
    end
 
 end