2 step soundcat arpit

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,25 @@
+### Description
+
+Please include a summary of the changes made. Include any relevant context, screenshots, or details.
+
+### Type of Change
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Documentation update
+- [ ] Breaking change
+- [ ] Other (please specify):
+
+### Checklist
+
+- [ ] I have tested the changes locally.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have added necessary tests to cover the changes.
+- [ ] I have followed the code style guidelines.
+- [ ] I have verified that the code works in all target environments.
+- [ ] I have made sure the technicians are comfortable using the new feature (if applicable).
+
+### Related Issues
+
+Closes # (issue number)
+

.gitignore

@@ -1,10 +1,15 @@
 .svn/
 SoloData/
 Bonsai/
+training_videos/
 ExperPort/Settings/Settings_Custom_v0_789.conf
 ExperPort/Settings/Settings_Custom_v2_0.conf
 ExperPort/Settings/Settings_Custom.conf
 ExperPort/sendsummary_error_log.txt
+/ExperPort/settings_@*.mat
 PASSWORD_CONFIG-DO_NOT_VERSIONCONTROL.mat
+.gitattributes
+.DS_Store
+Screenshot 2025-01-22 at 11.22.30.png
 
 

ExperPort/Modules/@StateMachineAssembler/StateMachineAssembler.m

@@ -17,7 +17,7 @@
 %
 
 % Written by Carlos Brody October 2006; edited by Sebastien Awwad 2007,2008
-
+% Additional Input lines added December 2012 CDB
 
 function [sma] = StateMachineAssembler(varargin)
 
@@ -36,30 +36,13 @@
       sma_struct = [];
    end;
 
-
-   fnames = {'name', 'detectorFunctionName', 'inputNumber', 'happId'};
-   hs = {
-      'Cin',  'line_in',    1,  1   ; ...
-      'Cout', 'line_out',   1,  2   ; ...
-      'Lin',  'line_in',    2,  3   ; ...
-      'Lout', 'line_out',   2,  4   ; ...
-      'Rin',  'line_in',    3,  5   ; ...
-      'Rout', 'line_out',   3,  6   ; ...
-      'Chi',  'line_high',  1,  7   ; ...
-      'Clo',  'line_low',   1,  8   ; ...
-      'Lhi',  'line_high',  2,  9   ; ...
-      'Llo',  'line_low',   2,  10  ; ...
-      'Rhi',  'line_high',  3,  11  ; ...
-      'Rlo',  'line_low',   3,  12  ; ...
-      };
-
-   default_happSpec = cell2struct(hs, fnames, 2);
-
-
+
    pairs = { ...
      'default_DOut'     0                 ; ...
-     'default_happSpec' default_happSpec  ; ...
+     'default_happSpec' []                ; ...
      'use_happenings'   0                 ; ...
+     'n_input_lines'    3                 ; ...
+     'line_names'       'CLRABDEFGHIJKL'  ; ...
      }; 
    singles = { ...
      'no_dead_time_technology',     'inputarg', 'no_dead_time_technology',     '' ; ...
@@ -68,48 +51,115 @@
      };
    parseargs(varargin, pairs, singles);
 
+   if n_input_lines ~= 3 && ~use_happenings,
+       error('Can use n_input_lines different to 3 only if using happenings');   
+   end;
+
+   if isempty(default_happSpec) %#ok<*NODEF>
+	   fnames     = {'name', 'detectorFunctionName', 'inputNumber', 'happId'};
+	   happnames  = {'line_in', 'line_out', 'line_high', 'line_low'};
+	   happabbrev = {'in', 'out', 'hi', 'lo'};
+	   hid        = 0;
+	   hs = {};
+
+	   for li = 1:3,
+		   for hni = 1:2,
+			   hid = hid + 1;
+			   hs = [hs ; ...
+				   {[line_names(li) happabbrev{hni}], happnames{hni}, li, hid}];
+		   end;
+	   end;
+	   for li = 1:3,
+		   for hni = 1:2,
+			   hid = hid + 1;
+			   hs = [hs ; ...
+				   {[line_names(li) happabbrev{hni+2}], happnames{hni+2}, li, hid}];
+		   end;
+	   end;
+
+	   for li=4:n_input_lines,
+		   for hni = 1:4,
+			   hid = hid + 1;
+			   hs = [hs ; ...
+				   {[line_names(li) happabbrev{hni}], happnames{hni}, li, hid}];
+		   end;	   
+	   end;
+
+       %Chuck's code to try to remap inputs
+        inputs = bSettings('get','INPUTLINES','all');
+        for i = 1:size(hs,1)
+            inputnum = find(strcmp(inputs(:,1),hs{i,1}(1)) == 1,1,'first');
+            if isempty(inputnum)
+                error(['can''t find input channel ',hs{i,1}(1),' in INPUTLINES ']);
+            elseif numel(inputnum) > 1
+                error(['found more than one instance of input channel ',hs{i,1}(1),' in INPUTLINES ']);
+            end
+
+            hs{i,3} = inputs{inputnum,2};
+        end
+       %end Chuck's code
+
+	   default_happSpec = cell2struct(hs, fnames, 2);
+   end;
+
+
    if isempty(default_DOut),
      error('you passed in an empty matrix as a default_DOut -- can''t do that');
    end;
    if numel(default_DOut) ~= 1 || default_DOut ~= 0,
      % error('sorry, default_DOut different to zero not yet supported');
    end;
 
-   default_input_map = { ...
-     'Cin'    1   ; ...
-     'Cout'   2   ; ...
-     'Lin'    3   ; ...in
-     'Lout'   4   ; ...
-     'Rin'    5   ; ...
-     'Rout'   6   ; ...
-     'Tup'    7   ; ...
-   };
+   ncols = 7;  % Keeping track of total number of state matrix columns
+   input_line_names = line_names;
+   default_input_map = cell(0, 2);
+  for k=1:n_input_lines,
+      if k > numel(input_line_names),
+          error('Sorry, trying to have more input lines than I can handle!');
+      end;
+      default_input_map = [default_input_map ; ...
+          {[input_line_names(k) 'in']  k*2-1     ; ...
+           [input_line_names(k) 'out'] k*2       ; ...
+           }];
+   end;
+   ncols = n_input_lines*2+1;
+   default_input_map = [default_input_map ; {'Tup' ncols}];
+
 
+   % default_input_map = { ...
+%      'Cin'    1   ; ...
+%      'Cout'   2   ; ...
+%      'Lin'    3   ; ...
+%      'Lout'   4   ; ...
+%      'Rin'    5   ; ...
+%      'Rout'   6   ; ...
+%      'Tup'    ncols   ; ...
+%    };
+
    default_self_timer_map = { ...
-     'Timer'  8   ; ...
+     'Timer'  ncols+1   ; ...
    };
 
    default_output_map = { ...
-     'DOut'        9 ; ...
-     'SoundOut'   10 ; ...
+     'DOut'       ncols+2 ; ...
+     'SoundOut'   ncols+3 ; ...
    };
-
+   ncols = ncols+3;
 
-   sma = struct( ...     
+   sma = struct( ...
+	 'n_input_lines',       n_input_lines, ...
      'input_map',           {default_input_map},  ...
      'self_timer_map',      {default_self_timer_map},  ...
      'output_map',          {default_output_map}, ...
-     'use_happenings',      1, ... % added by Viktor
-     'n_input_lines',       3, ... % added by Viktor
-     ...%'use_happenings',      use_happenings, ...
+     'use_happenings',      use_happenings, ...
      'happSpec',            default_happSpec, ...
      'happList',            {cell(0, 1)},  ...
      'state_name_list',     {cell(0,3)},   ...
      'current_state',       0,             ...
-     'states',              zeros(0, 10),  ...
+     'states',              zeros(0, ncols),  ...
      'default_actions',     {cell(0, 1)},  ...
      'current_iti_state',   0,             ...
-     'iti_states',          zeros(0, 10),  ...
+     'iti_states',          zeros(0, ncols),  ...
      'default_iti_actions', {cell(0, 1)},  ...
      'dio_sched_wave_cols', 8, ... 
      'sched_waves',         struct('name', {}, 'id', {}, 'in_column', {}, ...
@@ -150,7 +200,6 @@
       sma = class(sma, 'StateMachineAssembler');
       return;
    end;
-   %clear classes %mod by Viktor
 
 
    sma = class(sma, 'StateMachineAssembler');

ExperPort/Modules/@dispatcher/RunningSection.m

@@ -31,6 +31,7 @@
         SoloParamHandle(obj, 'stop_after_next_update', 'value', 0);
         SoloParamHandle(obj, 'stopping_process_completed', 'value', 1);
         SoloFunctionAddVars('runrats','func_owner','@runrats','ro_args','stopping_process_completed'); %     This is a bit unpleasant. We give ro access to the flag denoting the stop process as complete to runrats so that runrats can wait on it using a timer. :P
+        SoloFunctionAddVars('NeuropixelNeuroblueprint','func_owner','@NeuropixelNeuroblueprint','ro_args','stopping_process_completed'); %     This is a bit unpleasant. We give ro access to the flag denoting the stop process as complete so that NeuropixelNeuropblueprint can wait on it using a timer. :P
         SoloFunctionAddVars('TowerWaterDelivery','func_owner','@TowerWaterDelivery','ro_args','stopping_process_completed'); %     This is a bit unpleasant. We give ro access to the flag denoting the stop process as complete to runrats so that runrats can wait on it using a timer. :P
 
         set(get_ghandle(RunButton), 'FontSize', 20); % (defined by GetSoloFunctionArgs)
@@ -283,6 +284,9 @@
                     if runrats('is_running');
                         runrats('crashed',me);
                         Running.value = 0;
+                    elseif NeuropixelNeuroblueprint('is_running')
+                        NeuropixelNeuroblueprint('crash_detected');
+                        Running.value = 0;    
                     else
                         rethrow(me);
                     end