Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Jesse Heckman
pbtoolbox
Commits
0f166b54
Commit
0f166b54
authored
Jun 13, 2019
by
Jesse Heckman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implement wait for trigger
parent
f766f961
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
setups/vestibular chair/vPrime/core/experiment/block/trial/pb_vSetupTrial.m
...chair/vPrime/core/experiment/block/trial/pb_vSetupTrial.m
+1
-1
setups/vestibular chair/vPrime/core/experiment/pb_vReadExp.m
setups/vestibular chair/vPrime/core/experiment/pb_vReadExp.m
+1
-1
setups/vestibular chair/vPrime/core/experiment/pb_vRunExp.m
setups/vestibular chair/vPrime/core/experiment/pb_vRunExp.m
+10
-6
No files found.
setups/vestibular chair/vPrime/core/experiment/block/trial/pb_vSetupTrial.m
View file @
0f166b54
...
...
@@ -11,7 +11,7 @@ function [stim, cfg] = pb_vSetupTrial(stim,cfg)
%% SET TDT PARAMETERS
selled
=
strcmpi
({
stim
.
modality
},
'LED'
);
selsnd
=
strcmpi
({
stim
.
modality
},
'sound'
);
seltrg
=
strcmpi
({
stim
.
modality
},
'
TRG0
'
);
seltrg
=
strcmpi
({
stim
.
modality
},
'
trigger
'
);
%% LED
if
any
(
selled
)
...
...
setups/vestibular chair/vPrime/core/experiment/pb_vReadExp.m
View file @
0f166b54
...
...
@@ -93,7 +93,7 @@ function [block,cfg] = pb_vReadExp(cfg)
block
(
bn
)
.
trial
(
tn
)
.
stim
(
sn
)
.
modality
=
'trigger'
;
if
par
(
1
)
==
1
block
(
bn
)
.
trial
(
tn
)
.
stim
(
sn
)
.
detect
=
'rise'
;
elseif
par
==
2
elseif
par
(
1
)
==
2
block
(
bn
)
.
trial
(
tn
)
.
stim
(
sn
)
.
detect
=
'fall'
;
end
block
(
bn
)
.
trial
(
tn
)
.
stim
(
sn
)
.
channel
=
par
(
2
);
...
...
setups/vestibular chair/vPrime/core/experiment/pb_vRunExp.m
View file @
0f166b54
...
...
@@ -14,7 +14,7 @@ function pb_vRunExp(handles)
% load & read experiment
% set debug mode
debug
=
fals
e
;
debug
=
tru
e
;
% set handles
pb_setupShow
(
handles
);
...
...
@@ -24,13 +24,17 @@ function pb_vRunExp(handles)
handles
=
pb_vInitialize
(
handles
,
true
);
% set block information
block
=
handles
.
block
;
nblocks
=
handles
.
cfg
.
Blocks
;
Dat
=
pb_dataobj
(
nblocks
);
if
~
debug
block
=
handles
.
block
;
nblocks
=
handles
.
cfg
.
Blocks
;
Dat
=
pb_dataobj
(
nblocks
);
end
% initialize recordings
rc
=
pb_runPupil
;
[
ses
,
str
]
=
pb_runLSL
;
if
~
debug
rc
=
pb_runPupil
;
[
ses
,
str
]
=
pb_runLSL
;
end
expTime
=
tic
;
%% START BLOCK
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment