Commit b1dd056e authored by Jesse Heckman's avatar Jesse Heckman
Browse files

edit

parent 34b63a4b
......@@ -11,7 +11,7 @@ function pb_vRunExp(handles)
%% INITIALIZE
% load & read experiment
debug = true;
debug = false;
experimentTime = tic;
pb_setupShow(handles);
......@@ -24,10 +24,10 @@ function pb_vRunExp(handles)
nblocks = handles.cfg.Blocks;
bDat(nblocks) = struct('v',[],'h',[]);
rc = pb_runPupil;
pb_startPupil(rc);
% rc = pb_runPupil;
% pb_startPupil(rc);
ses = pb_runLSL;
% ses = pb_runLSL;
%% CORE BODY
% iterate experiment
......@@ -35,7 +35,7 @@ function pb_vRunExp(handles)
for iBlck = 1:nblocks
% Runs blocks of trials with a vestibular condition
ses.start();
%ses.start();
nTrials = length(block(iBlck).trial);
handles = updateCount(handles,'trial','reset');
......@@ -86,7 +86,7 @@ function pb_vRunExp(handles)
handles = updateCount(handles,'block','count');
end
%% CHECK OUT
pb_stopPupil(rc);
%pb_stopPupil(rc);
pb_vEndExp(handles.cfg);
pb_vInitialize(handles,false);
toc(experimentTime)
......
%
%% Experiment: C:\DATA\JJH/
%
%% HEADER
ITI 0 0
Blocks 1
Trials 5
Repeats 1
Random 0 % 0=no, 1=per set, 2=all trials
Motor n
Lab 5
% AX SIG AMP DUR
% edg bit Event Time Event Time
% MOD X Y ID INT On On Off Off Event
% edg bit Event Time Event Time
%% BODY
~~~
% Block: 1
==>
HOR 1 20 30 .1
VER 1 0 30 .1
% Trial: 1
==>
TRG0 1 2 0 0 1
LED -45 0 5 0 500 0 750
% Trial: 2
==>
TRG0 1 2 0 0 1
LED -40 0 5 0 500 0 750
% Trial: 3
==>
TRG0 1 2 0 0 1
LED -35 0 5 0 500 0 750
% Trial: 4
==>
TRG0 1 2 0 0 1
LED -30 0 5 0 500 0 750
% Trial: 5
==>
TRG0 1 2 0 0 1
LED -25 0 5 0 500 0 750
......@@ -21,8 +21,8 @@ Lab 5
~~~
% Block: 1
==>
HOR 2 15 15 .1
VER 1 25 15 .1
HOR 2 15 30 .1
VER 1 25 30 .1
% Trial: 1
==>
......
%
%% Experiment: C:\DATA\JJH/
%
%% HEADER
ITI 0 0
Blocks 1
Trials 5
Repeats 1
Random 0 % 0=no, 1=per set, 2=all trials
Motor n
Lab 5
% AX SIG AMP DUR
% edg bit Event Time Event Time
% MOD X Y ID INT On On Off Off Event
% edg bit Event Time Event Time
%% BODY
~~~
% Block: 1
==>
HOR 1 0 30 .1
VER 1 25 30 .1
% Trial: 1
==>
TRG0 1 2 0 0 1
LED -45 0 5 0 500 0 750
% Trial: 2
==>
TRG0 1 2 0 0 1
LED -40 0 5 0 500 0 750
% Trial: 3
==>
TRG0 1 2 0 0 1
LED -35 0 5 0 500 0 750
% Trial: 4
==>
TRG0 1 2 0 0 1
LED -30 0 5 0 500 0 750
% Trial: 5
==>
TRG0 1 2 0 0 1
LED -25 0 5 0 500 0 750
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