diff --git a/N-back-1.xlsx b/N-back-1.xlsx index 2e37337bf1e6a34968ac1ef350135d93af87e81c..a00f991e2f4b488d7e26fddf21c8f3dbe7ec9b31 100644 Binary files a/N-back-1.xlsx and b/N-back-1.xlsx differ diff --git a/N-back.py b/N-back.py index f5ba345127b11fe36c46d6027554e75c4bc5d7cd..b7ef03ffd82bd1a292263881d01e742ceeb47ae2 100644 --- a/N-back.py +++ b/N-back.py @@ -1,8 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python # -*- coding: utf-8 -*- """ This experiment was created using PsychoPy3 Experiment Builder (v2020.1.3), - on May 13, 2020, at 13:38 + on May 13, 2020, at 14:12 If you publish work using this script the most relevant publication is: Peirce J, Gray JR, Simpson S, MacAskill M, Höchenberger R, Sogo H, Kastman E, Lindeløv JK. (2019) @@ -96,7 +96,7 @@ FixationClock = core.Clock() fixation_1 = visual.TextStim(win=win, name='fixation_1', text='+', font='Arial', - pos=(0, 0), height=0.05, wrapWidth=None, ori=0.0, + pos=(0, 0), height=0.05, wrapWidth=None, ori=0, color='white', colorSpace='rgb', opacity=1, languageStyle='LTR', depth=0.0); @@ -108,20 +108,20 @@ grid_lines = visual.ImageStim( name='grid_lines', image='grid.png', mask=None, ori=0.0, pos=[0, 0], size=[0.6, 0.6], - color=[1,1,1], colorSpace='rgb', opacity=1.0, + color=[1,1,1], colorSpace='rgb', opacity=1, flipHoriz=False, flipVert=False, texRes=128, interpolate=True, depth=0.0) target_square = visual.Rect( win=win, name='target_square', width=[0.15, 0.15][0], height=[0.15, 0.15][1], ori=0.0, pos=[0,0], - lineWidth=1.0, lineColor=None, lineColorSpace='rgb', + lineWidth=1, lineColor=None, lineColorSpace='rgb', fillColor=[1.000,1.000,1.000], fillColorSpace='rgb', - opacity=1.0, depth=-1.0, interpolate=True) + opacity=1, depth=-1.0, interpolate=True) fixation_2 = visual.TextStim(win=win, name='fixation_2', text='+', font='Arial', - pos=[0, 0], height=0.05, wrapWidth=None, ori=0.0, + pos=[0, 0], height=0.05, wrapWidth=None, ori=0, color='white', colorSpace='rgb', opacity=1, languageStyle='LTR', depth=-2.0); @@ -414,7 +414,7 @@ for thisTrial in trials: grid_lines.setAutoDraw(True) if grid_lines.status == STARTED: # is it time to stop? (based on global clock, using actual start) - if tThisFlipGlobal > grid_lines.tStartRefresh + 2.0-frameTolerance: + if tThisFlipGlobal > grid_lines.tStartRefresh + 2-frameTolerance: # keep track of stop time/frame for later grid_lines.tStop = t # not accounting for scr refresh grid_lines.frameNStop = frameN # exact frame index @@ -431,7 +431,7 @@ for thisTrial in trials: target_square.setAutoDraw(True) if target_square.status == STARTED: # is it time to stop? (based on global clock, using actual start) - if tThisFlipGlobal > target_square.tStartRefresh + 1.0-frameTolerance: + if tThisFlipGlobal > target_square.tStartRefresh + 1-frameTolerance: # keep track of stop time/frame for later target_square.tStop = t # not accounting for scr refresh target_square.frameNStop = frameN # exact frame index @@ -439,7 +439,7 @@ for thisTrial in trials: target_square.setAutoDraw(False) # *fixation_2* updates - if fixation_2.status == NOT_STARTED and tThisFlip >= 1.0-frameTolerance: + if fixation_2.status == NOT_STARTED and tThisFlip >= 1-frameTolerance: # keep track of start time/frame for later fixation_2.frameNStart = frameN # exact frame index fixation_2.tStart = t # local t and not account for scr refresh diff --git a/html/resources/N-back-1.xlsx b/html/resources/N-back-1.xlsx index 2e37337bf1e6a34968ac1ef350135d93af87e81c..a00f991e2f4b488d7e26fddf21c8f3dbe7ec9b31 100644 Binary files a/html/resources/N-back-1.xlsx and b/html/resources/N-back-1.xlsx differ