Commit 1b1046fa authored by Jesse Heckman's avatar Jesse Heckman
Browse files

stuff it

parent 2a2a3a9a
...@@ -25,10 +25,9 @@ function pb_vRunExp(handles) ...@@ -25,10 +25,9 @@ function pb_vRunExp(handles)
bDat(nblocks) = struct('v',[],'h',[]); bDat(nblocks) = struct('v',[],'h',[]);
rc = pb_runPupil; rc = pb_runPupil;
pb_startPupil(rc);
[ses,str] = pb_runLSL('ot',false); [ses,str] = pb_runLSL('ot',false);
%% CORE BODY %% CORE BODY
% iterate experiment % iterate experiment
...@@ -36,6 +35,8 @@ function pb_vRunExp(handles) ...@@ -36,6 +35,8 @@ function pb_vRunExp(handles)
% Runs blocks of trials with a vestibular condition % Runs blocks of trials with a vestibular condition
ses.start; ses.start;
pb_startPupil(rc);
nTrials = length(block(iBlck).trial); nTrials = length(block(iBlck).trial);
handles = updateCount(handles,'trial','reset'); handles = updateCount(handles,'trial','reset');
...@@ -85,6 +86,7 @@ function pb_vRunExp(handles) ...@@ -85,6 +86,7 @@ function pb_vRunExp(handles)
end end
handles = updateCount(handles,'block','count'); handles = updateCount(handles,'block','count');
pb_stopPupil(rc);
% STOP LSL % STOP LSL
ses.stop; ses.stop;
...@@ -100,7 +102,7 @@ function pb_vRunExp(handles) ...@@ -100,7 +102,7 @@ function pb_vRunExp(handles)
end end
%% CHECK OUT %% CHECK OUT
pb_stopPupil(rc);
pb_vEndExp(handles.cfg); pb_vEndExp(handles.cfg);
pb_vInitialize(handles,false); pb_vInitialize(handles,false);
......
...@@ -54,17 +54,17 @@ end ...@@ -54,17 +54,17 @@ end
function ev_listener(~, event) function ev_listener(~, event)
disp('ev_listener called') disp('ev_listener called')
disp(event); %disp(event);
end end
function pl_listener(~, event) function pl_listener(~, event)
disp('pl_listener called'); disp('pl_listener called');
disp(event); %disp(event);
end end
function ot_listener(~, event) function ot_listener(~, event)
disp('ot_listener called'); disp('ot_listener called');
disp(event); %disp(event);
end end
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment