Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
stroop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Bartosz Maćkiewicz
stroop
Commits
ac975591
Commit
ac975591
authored
Jul 20, 2018
by
Jonathan Peirce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes to exp code
parent
118cce6a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
78 deletions
+79
-78
stroop.js
html/stroop.js
+3
-2
stroop.psyexp
stroop.psyexp
+76
-76
No files found.
html/stroop.js
View file @
ac975591
...
...
@@ -17,7 +17,7 @@ psychoJS.openWindow({
// store info about the experiment session:
my
.
expName
=
'stroop'
;
// from the Builder filename that created this script
my
.
expInfo
=
{
'session'
:
'01'
,
'participant'
:
''
};
my
.
expInfo
=
{
b
'session'
:
b
'01'
,
b
'participant'
:
b
''
};
// set up the experiment:
...
...
@@ -388,7 +388,8 @@ function trialRoutineEnd() {
my
.
experiment
.
addData
(
'my.resp.corr'
,
my
.
resp
.
corr
);
if
(
my
.
resp
.
keys
!=
undefined
)
{
// we had a response
my
.
experiment
.
addData
(
'my.resp.rt'
,
my
.
resp
.
rt
);
}
my
.
routineTimer
.
reset
();
}
// the Routine "trial" was not non-slip safe, so reset the non-slip timer
my
.
routineTimer
.
reset
();
...
...
stroop.psyexp
View file @
ac975591
This diff is collapsed.
Click to expand it.
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