Commit 6e428e26 authored by Julian Kirkeby Lysvik's avatar Julian Kirkeby Lysvik

First commit

parent 0e8cb2f3
# Byte-compiled / optimized / DLL files
__pycache__/
*.pyc
*.pyo
*.pyd
*.so
# Backup files
*.bak
# Jupyter Notebook
.ipynb_checkpoints
# Virtual Environment files
.env
.venv
env/
venv/
ENV/
# Spyder project settings
.spyderproject
.spyproject
# OS generated files
.DS_Store
.directory
.gdb_history
ehthumbs.db
Icon?
*.orig
old
Thumbs.db
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,514.1637259469348,,,001,,2019_Feb_14_0958,experiment2_b,3.0.0,59.984031445775784,
This diff is collapsed.
trig,targ,type,trig_img,targ_img,final_c,new,num,instr,a,k,corr,lang,phase,trials.thisRepN,trials.thisTrialN,trials.thisN,trials.thisIndex,trials_2.thisRepN,trials_2.thisTrialN,trials_2.thisN,trials_2.thisIndex,key_resp_1.keys,key_resp_1.rt,key_resp_2.keys,key_resp_2.rt,inputText,text_resp.keys,text_resp.rt,key_resp_4.keys,key_resp_4.rt,gender,age,participant,language,date,expName,psychopyVersion,frameRate,
,,,,,,,,,,,,,,,,,,,,,,space,2.7696609703825743,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
mamad,mamadu,non_alt,Images/ice-cream.jpg,Images/ice-cream_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,0,0,10,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
sunag,sunaku,alt,Images/nose.jpg,Images/nose_pl.jpg,g,None,None,None,None,None,None,voicing,exposure,0,1,1,5,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
milud,milutu,alt,Images/banana.jpg,Images/banana_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,2,2,15,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
nirug,niruku,alt,Images/garbage_can.jpg,Images/garbage_can_pl.jpg,g,None,None,None,None,None,None,voicing,exposure,0,3,3,2,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
samug,samuku,alt,Images/sleigh.jpg,Images/sleigh_pl.jpg,g,None,None,None,None,None,None,voicing,exposure,0,4,4,7,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
sanub,sanupu,alt,Images/hammock.jpg,Images/hammock_pl.jpg,b,None,None,None,None,None,None,voicing,exposure,0,5,5,11,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
silud,silutu,alt,Images/moustache.jpg,Images/moustache_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,6,6,6,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
lunid,lunitu,alt,Images/ship.jpg,Images/ship_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,7,7,12,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
rumud,rumutu,alt,Images/river.jpg,Images/river_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,8,8,13,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
rimab,rimapu,alt,Images/bean.jpg,Images/bean_pl.jpg,b,None,None,None,None,None,None,voicing,exposure,0,9,9,17,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
milub,milupu,alt,Images/soap.jpg,Images/soap_pl.jpg,b,None,None,None,None,None,None,voicing,exposure,0,10,10,19,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
rumid,rumidu,non_alt,Images/mushroom.jpg,Images/mushroom_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,11,11,3,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
lirid,liritu,alt,Images/bridge.jpg,Images/bridge_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,12,12,8,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
rimag,rimaku,alt,Images/bottle.jpg,Images/bottle_pl.jpg,g,None,None,None,None,None,None,voicing,exposure,0,13,13,18,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
limig,limiku,alt,Images/screwdriver.jpg,Images/screwdriver_pl.jpg,g,None,None,None,None,None,None,voicing,exposure,0,14,14,14,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
larub,larupu,alt,Images/rock.jpg,Images/rock_pl.jpg,b,None,None,None,None,None,None,voicing,exposure,0,15,15,16,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
musad,musatu,alt,Images/foot.jpg,Images/foot_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,16,16,9,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
lisud,lisudu,non_alt,Images/statue.jpg,Images/statue_pl.jpg,d,None,None,None,None,None,None,voicing,exposure,0,17,17,0,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
runug,runuku,alt,Images/cup.jpg,Images/cup_pl.jpg,g,None,None,None,None,None,None,voicing,exposure,0,18,18,1,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
sumag,sumaku,alt,Images/basketball.jpg,Images/basketball_pl.jpg,g,None,None,None,None,None,None,voicing,exposure,0,19,19,4,,,,,,,,,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
,,,,,,,,,,,,,,,,,,,,,,,,space,10.629072126772371,,,,,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
rumutu,rumud,alt,Images/river_pl.jpg,Images/river.jpg,d,given,sg,Write the singular form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,0,0,2,,,,,rumud,"['r', 'u', 'm', 'u', 'd', 'return']","[0.6830302595926696, 0.8162035235736766, 1.0657679403957445, 1.348970385463872, 1.5155193038863217, 2.0481752435171074]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
nalib,nalipu,alt,Images/coin.jpg,Images/coin_pl.jpg,b,given,pl,Write the plural form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,1,1,0,,,,,nalipu,"['n', 'a', 'l', 'i', 'p', 'u', 'return']","[3.0472545887687374, 3.213988235414945, 3.8293665827068253, 3.9794542112913405, 7.575499235489588, 7.72551647110231, 10.456256953972115]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
lunitu,lunid,alt,Images/ship_pl.jpg,Images/ship.jpg,d,given,sg,Write the singular form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,2,2,1,,,,,lunid,"['l', 'u', 'n', 'i', 'd', 'return']","[0.849581311134898, 1.0157262165603242, 1.2324273544527387, 1.299121495709187, 1.4986557075471865, 1.6986805370679576]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
sunudu,sunud,non_alt,Images/flagpole_pl.jpg,Images/flagpole.jpg,d,given,sg,Write the singular form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,3,3,6,,,,,sunud,"['s', 'u', 'n', 'u', 'd', 'return']","[0.849708871733128, 1.9982858244766248, 2.3149509552968084, 2.814044805766571, 3.0308282821042667, 3.580038088997753]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
nunug,nunugu,non_alt,Images/zebra.jpg,Images/zebra_pl.jpg,g,new,pl,Write the plural form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,4,4,3,,,,,nunuku,"['n', 'u', 'n', 'u', 'k', 'u', 'return']","[0.5332224963985936, 0.8161126526456428, 1.0659181120690846, 1.3322927972203615, 1.5154800544714817, 1.6318443299951468, 2.164808292206544]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
larupu,larub,alt,Images/rock_pl.jpg,Images/rock.jpg,b,given,sg,Write the singular form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,5,5,8,,,,,larupu,"['l', 'a', 'r', 'u', 'p', 'u', 'return']","[7.026374753411801, 7.1430671028474535, 7.243237155202223, 7.559087434044159, 7.642794490065171, 8.10880918982366, 8.35833307735902]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
narab,narabu,non_alt,Images/watch.jpg,Images/watch_pl.jpg,b,given,pl,Write the plural form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,6,6,5,,,,,narupu,"['n', 'a', 'r', 'a', 'backspace', 'u', 'p', 'u', 'return']","[0.9993886477041087, 1.1493512754350377, 1.3158046300659407, 1.4656162328747087, 2.148149902046498, 2.5643332036397624, 2.7140505225288507, 2.8306596802704007, 3.0972545034437644]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
susaku,susag,alt,Images/box_pl.jpg,Images/box.jpg,g,new,sg,Write the singular form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,7,7,9,,,,,fa,"['f', 'return', 'a', 'return']","[5.1782239127906, 5.511067055064814, 5.9938446678816035, 6.310366453012648]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
nuragu,nurag,non_alt,Images/lion_pl.jpg,Images/lion.jpg,g,given,sg,Write the singular form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,8,8,7,,,,,asdf,"['a', 's', 'd', 'f', 'return']","[1.1827943364796738, 1.2158299715356407, 1.3159257913021065, 1.3393606782301504, 1.7150155461813483]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
saluku,salug,alt,Images/thistle_pl.jpg,Images/thistle.jpg,g,new,sg,Write the singular form on your keyboard - then press enter,None,None,None,voicing,prod,,,,,0,9,9,4,,,,,df,"['d', 'f', 'return']","[17.88214424671787, 17.998808012341215, 18.598065089181546]",,,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,space,2.228377838756387,,,001,,2019_Feb_14_1031,experiment2_b,3.0.0,60.186569367853416,
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -691,7 +691,7 @@
<Param name="startVal" updates="None" val="0.0" valType="code"/>
<Param name="stopType" updates="None" val="duration (s)" valType="str"/>
<Param name="stopVal" updates="constant" val="" valType="code"/>
<Param name="text" updates="constant" val="Thank you very much for participating!" valType="str"/>
<Param name="text" updates="constant" val="Thank you very much for participating!&amp;#10;&amp;#10;Press q to quit." valType="str"/>
<Param name="units" updates="None" val="from exp settings" valType="str"/>
<Param name="wrapWidth" updates="constant" val="" valType="code"/>
</TextComponent>
......@@ -717,7 +717,7 @@
<Routine name="Instruction_Intro"/>
<Routine name="ISI_Pre"/>
<LoopInitiator loopType="TrialHandler" name="trials">
<Param name="Selected rows" updates="None" val="1:11" valType="str"/>
<Param name="Selected rows" updates="None" val="np.random.choice(43, size = 20, replace = False)" valType="str"/>
<Param name="conditions" updates="None" val="None" valType="str"/>
<Param name="conditionsFile" updates="None" val="$&quot;Lists/Order&quot;+condition+&quot;.xlsx&quot;" valType="str"/>
<Param name="endPoints" updates="None" val="[0, 1]" valType="num"/>
......@@ -733,9 +733,9 @@
<Routine name="Instruction_Prod"/>
<Routine name="ISI_Pre"/>
<LoopInitiator loopType="TrialHandler" name="trials_2">
<Param name="Selected rows" updates="None" val="45:51" valType="str"/>
<Param name="Selected rows" updates="None" val="np.random.choice(31, size = 10, replace = False)" valType="str"/>
<Param name="conditions" updates="None" val="None" valType="str"/>
<Param name="conditionsFile" updates="None" val="$&quot;Lists/Order&quot;+condition+&quot;.xlsx&quot;" valType="str"/>
<Param name="conditionsFile" updates="None" val="$&quot;Lists/OrderProd&quot;+condition+&quot;.xlsx&quot;" valType="str"/>
<Param name="endPoints" updates="None" val="[0, 1]" valType="num"/>
<Param name="isTrials" updates="None" val="True" valType="bool"/>
<Param name="loopType" updates="None" val="random" valType="str"/>
......@@ -749,9 +749,9 @@
<Routine name="Instruction_FC"/>
<Routine name="ISI_Pre"/>
<LoopInitiator loopType="TrialHandler" name="trials_3">
<Param name="Selected rows" updates="None" val="75:101" valType="str"/>
<Param name="Selected rows" updates="None" val="np.random.choice(30, size = 10, replace = False)" valType="str"/>
<Param name="conditions" updates="None" val="None" valType="str"/>
<Param name="conditionsFile" updates="None" val="$&quot;Lists/Order&quot;+condition+&quot;.xlsx&quot;" valType="str"/>
<Param name="conditionsFile" updates="None" val="$&quot;Lists/OrderFC&quot;+condition+&quot;.xlsx&quot;" valType="str"/>
<Param name="endPoints" updates="None" val="[0, 1]" valType="num"/>
<Param name="isTrials" updates="None" val="True" valType="bool"/>
<Param name="loopType" updates="None" val="random" valType="str"/>
......
......@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
"""
This experiment was created using PsychoPy3 Experiment Builder (v3.0.0),
on februar 14, 2019, at 09:45
on februar 14, 2019, at 10:38
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.
......@@ -430,7 +430,7 @@ for thisComponent in ISI_PreComponents:
# set up handler to look after randomisation of conditions etc
trials = data.TrialHandler(nReps=1, method='random',
extraInfo=expInfo, originPath=-1,
trialList=data.importConditions("Lists/Order"+condition+".xlsx", selection='1:11'),
trialList=data.importConditions("Lists/Order"+condition+".xlsx", selection='np.random.choice(43, size = 20, replace = False)'),
seed=None, name='trials')
thisExp.addLoop(trials) # add the loop to the experiment
thisTrial = trials.trialList[0] # so we can initialise stimuli with some values
......@@ -729,7 +729,7 @@ for thisComponent in ISI_PreComponents:
# set up handler to look after randomisation of conditions etc
trials_2 = data.TrialHandler(nReps=1, method='random',
extraInfo=expInfo, originPath=-1,
trialList=data.importConditions("Lists/Order"+condition+".xlsx", selection='45:51'),
trialList=data.importConditions("Lists/OrderProd"+condition+".xlsx", selection='np.random.choice(31, size = 10, replace = False)'),
seed=None, name='trials_2')
thisExp.addLoop(trials_2) # add the loop to the experiment
thisTrial_2 = trials_2.trialList[0] # so we can initialise stimuli with some values
......@@ -1097,7 +1097,7 @@ for thisComponent in ISI_PreComponents:
# set up handler to look after randomisation of conditions etc
trials_3 = data.TrialHandler(nReps=1, method='random',
extraInfo=expInfo, originPath=-1,
trialList=data.importConditions("Lists/Order"+condition+".xlsx", selection='75:101'),
trialList=data.importConditions("Lists/OrderFC"+condition+".xlsx", selection='np.random.choice(30, size = 10, replace = False)'),
seed=None, name='trials_3')
thisExp.addLoop(trials_3) # add the loop to the experiment
thisTrial_3 = trials_3.trialList[0] # so we can initialise stimuli with some values
......
This diff is collapsed.
This diff is collapsed.
<!doctype html>
<html>
<head>
<title>experiment2_b [PsychoPy]</title>
<meta charset="UTF-8">
<!-- external libraries -->
<script type="text/javascript" src="lib/vendors/jquery-2.2.0.min.js"></script>
<script type="text/javascript" src="lib/vendors/jquery-ui-1.11.4.base/jquery-ui.min.js"></script>
<script type="text/javascript" src="lib/vendors/seedrandom.min.js"></script>
<script type="text/javascript" src="lib/vendors/pixi-4.8.1.min.js"></script>
<script type="text/javascript" src="lib/vendors/preloadjs.min.js"></script>
<script type="text/javascript" src="lib/vendors/moment-2.22.2.min.js"></script>
<script type="text/javascript" src="lib/vendors/xlsx.full.min.js"></script>
<script type="text/javascript" src="lib/vendors/log4javascript.min.js"></script>
<script type="text/javascript" src="lib/vendors/Tone.min.js"></script>
<script type="text/javascript" src="lib/vendors/howler.min.js"></script>
<!-- styles -->
<link href="lib/vendors/jquery-ui.min.css" rel="stylesheet">
<link href="lib/psychojs.css" rel="stylesheet">
</head>
<body>
<div id="root"/>
<script type='module' src='./experiment2_b.js'></script>
<script nomodule type="text/javascript" src="lib/psychojs-3.0.0.js"></script>
<script nomodule type="text/javascript" src="./experiment2_bNoModule.js"></script>
<body>
</html>
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