Commit 55a8aecd authored by Julian Kirkeby Lysvik's avatar Julian Kirkeby Lysvik

First commit

parent a82b133d
trials.thisRepN,trials.thisTrialN,trials.thisN,trials.thisIndex,trig,targ,type,trig_img,targ_img,final_c,new,num,instr,a,k,corr,lang,phase,key_resp_1.keys,key_resp_1.rt,gender,age,participant,language,date,expName,psychopyVersion,frameRate,
,,,,,,,,,,,,,,,,,,space,0.9918117343097492,,,001,,2019_Feb_25_0753,experiment2_b,3.0.4,60.04990572219967,
This diff is collapsed.
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
This experiment was created using PsychoPy3 Experiment Builder (v3.0.3),
on februar 14, 2019, at 14:43
This experiment was created using PsychoPy3 Experiment Builder (v3.0.4),
on februar 25, 2019, at 07:53
If you publish work using this script please cite the PsychoPy publications:
Peirce, JW (2007) PsychoPy - Psychophysics software in Python.
Journal of Neuroscience Methods, 162(1-2), 8-13.
......@@ -27,7 +27,7 @@ _thisDir = os.path.dirname(os.path.abspath(__file__))
os.chdir(_thisDir)
# Store info about the experiment session
psychopyVersion = '3.0.3'
psychopyVersion = '3.0.4'
expName = 'experiment2_b' # from the Builder filename that created this script
expInfo = {'gender': '', 'age': '', 'participant': '001', 'language': ''}
expInfo['date'] = data.getDateStr() # add a simple timestamp
......
......@@ -2,13 +2,13 @@
* Experiment2_B Test *
**********************/
import { PsychoJS } from './lib/core-3.0.5.js';
import * as core from './lib/core-3.0.5.js';
import { TrialHandler } from './lib/data-3.0.5.js';
import { Scheduler } from './lib/util-3.0.5.js';
import * as util from './lib/util-3.0.5.js';
import * as visual from './lib/visual-3.0.5.js';
import { Sound } from './lib/sound-3.0.5.js';
import { PsychoJS } from './lib/core-3.0.4.js';
import * as core from './lib/core-3.0.4.js';
import { TrialHandler } from './lib/data-3.0.4.js';
import { Scheduler } from './lib/util-3.0.4.js';
import * as util from './lib/util-3.0.4.js';
import * as visual from './lib/visual-3.0.4.js';
import { Sound } from './lib/sound-3.0.4.js';
// init psychoJS:
var psychoJS = new PsychoJS({
......@@ -83,7 +83,7 @@ var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '3.0.5';
expInfo['psychopyVersion'] = '3.0.4';
// store frame rate of monitor if we can measure it successfully
expInfo['frameRate'] = psychoJS.window.getActualFrameRate();
......
......@@ -75,7 +75,7 @@ var frameDur;
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '3.0.5';
expInfo['psychopyVersion'] = '3.0.4';
// store frame rate of monitor if we can measure it successfully
expInfo['frameRate'] = psychoJS.window.getActualFrameRate();
......
......@@ -27,7 +27,7 @@
<div id="root"/>
<script type='module' src='./experiment2_b.js'></script>
<script nomodule type="text/javascript" src="lib/psychojs-3.0.5.js"></script>
<script nomodule type="text/javascript" src="lib/psychojs-3.0.4.js"></script>
<script nomodule type="text/javascript" src="./experiment2_bNoModule.js"></script>
</body>
......
Markdown is supported
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