Skip to content

Commit 6fbc526

Browse files
committed
major refactoring of the scripts to change the stimulus selection and plot as well as new module for ephys to control both spikeglx and openephys. Work in progress and could see another big update
1 parent b7b36fe commit 6fbc526

File tree

13 files changed

+4946
-550
lines changed

13 files changed

+4946
-550
lines changed

ExperPort/Modules/@NeuropixelNeuroblueprint/NeuropixelNeuroblueprint.asv

Lines changed: 1256 additions & 0 deletions
Large diffs are not rendered by default.

ExperPort/Modules/@NeuropixelNeuroblueprint/NeuropixelNeuroblueprint.m

Lines changed: 1259 additions & 0 deletions
Large diffs are not rendered by default.

ExperPort/Modules/@OpenEphys_Neuroblueprint/OpenEphys_Neuroblueprint.m

Lines changed: 504 additions & 81 deletions
Large diffs are not rendered by default.

ExperPort/Modules/@dispatcher/RunningSection.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
SoloParamHandle(obj, 'stop_after_next_update', 'value', 0);
3232
SoloParamHandle(obj, 'stopping_process_completed', 'value', 1);
3333
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
34-
SoloFunctionAddVars('OpenEphys_Neuroblueprint','func_owner','@OpenEphys_Neuroblueprint','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 OpenEphys_Neuropblueprint can wait on it using a timer. :P
34+
SoloFunctionAddVars('OpenEphys_Neuroblueprint','func_owner','@OpenEphys_Neuroblueprint','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 OpenEphys_Neuropblueprint can wait on it using a timer. :P
35+
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
3536
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
3637

3738
set(get_ghandle(RunButton), 'FontSize', 20); % (defined by GetSoloFunctionArgs)
@@ -287,6 +288,9 @@
287288
elseif OpenEphys_Neuroblueprint('is_running')
288289
OpenEphys_Neuroblueprint('crash_detected');
289290
Running.value = 0;
291+
elseif NeuropixelNeuroblueprint('is_running')
292+
NeuropixelNeuroblueprint('crash_detected');
293+
Running.value = 0;
290294
else
291295
rethrow(me);
292296
end

ExperPort/Modules/@runrats/runrats.m

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@
4545
display('test');
4646
%If we are starting from a forced reboot from runrats itself we
4747
%need to make sure the do_on_reboot.bat file is set back to nothing
48-
try %#ok<TRYNC>
49-
p = pwd;
50-
cd('\ratter\Rigscripts')
51-
52-
!del do_on_reboot.bat
53-
!copy nothing.bat do_on_reboot.bat /Y
54-
cd(p);
55-
end
48+
49+
% try %#ok<TRYNC>
50+
% p = pwd;
51+
% cd('\ratter\Rigscripts')
52+
%
53+
% !del do_on_reboot.bat
54+
% !copy nothing.bat do_on_reboot.bat /Y
55+
% cd(p);
56+
% end
5657

5758
%If a dispatcher is already open, let's close it so we don't ever have
5859
%more than 1
@@ -115,7 +116,7 @@
115116
SoloParamHandle(obj,'myfig', 'value',fig);
116117

117118
try
118-
set(myfig, 'WindowStyle', 'modal');
119+
set(value(myfig), 'WindowStyle', 'modal');
119120
pause(0.1);
120121

121122
catch %#ok<CTCH>

Protocols/@ArpitSoundCatContinuous/ArpitSoundCatContinuous.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
% PokesPlotSection(obj, 'close');
206206
SideSection(obj, 'close');
207207
StimulusSection(obj,'close');
208-
BonsaiCameraInterface(obj,'close');
208+
BonsaiCameraInterface(obj,'close');
209209
if exist('myfig', 'var') && isa(myfig, 'SoloParamHandle') && ishandle(value(myfig)) %#ok<NODEF>
210210
delete(value(myfig));
211211
end

Protocols/@ArpitSoundCatContinuous/SideSection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219

220220
SoloFunctionAddVars('StimulusSection', 'ro_args', ...
221221
{'ThisTrial';'stimuli_on';'A1_time';'time_bet_aud1_gocue' ; ...
222-
'PreStim_time'});
222+
'PreStim_time';'LeftProb'});
223223

224224
SoloFunctionAddVars('StimulatorSection', 'ro_args', ...
225225
{'A1_time';'time_bet_aud1_gocue';'time_go_cue'; ...

Protocols/@ArpitSoundCatContinuous/StimulatorSection.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@
134134

135135
end
136136

137+
if strcmpi(value(StimLine),'Ephys') & n_done_trials == 0
138+
dispatcher('set_trialnum_indicator_flag');
139+
end
140+
137141

138142

139143
%% prepare_next_trial

Protocols/@ArpitSoundCatContinuous/StimulusSection.asv

Lines changed: 809 additions & 0 deletions
Large diffs are not rendered by default.

Protocols/@ArpitSoundCatContinuous/StimulusSection.m

Lines changed: 320 additions & 174 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)