|
@@ -2,7 +2,7 @@
|
|
|
# -*- coding: utf-8 -*-
|
|
|
"""
|
|
|
This experiment was created using PsychoPy3 Experiment Builder (v2023.2.3),
|
|
|
- on Tue Nov 28 19:17:09 2023
|
|
|
+ on Wed Dec 6 17:54:49 2023
|
|
|
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)
|
|
@@ -600,7 +600,7 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
|
|
|
|
|
|
# --- Run Routine "decision" ---
|
|
|
routineForceEnded = not continueRoutine
|
|
|
- while continueRoutine and routineTimer.getTime() < 0.1:
|
|
|
+ while continueRoutine:
|
|
|
# get current time
|
|
|
t = routineTimer.getTime()
|
|
|
tThisFlip = win.getFutureFlipTime(clock=routineTimer)
|
|
@@ -631,7 +631,7 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
|
|
|
# if feedback_bar is stopping this frame...
|
|
|
if feedback_bar.status == STARTED:
|
|
|
# is it time to stop? (based on global clock, using actual start)
|
|
|
- if tThisFlipGlobal > feedback_bar.tStartRefresh + 0.1-frameTolerance:
|
|
|
+ if tThisFlipGlobal > feedback_bar.tStartRefresh + config_info['buffer_length']-frameTolerance:
|
|
|
# keep track of stop time/frame for later
|
|
|
feedback_bar.tStop = t # not accounting for scr refresh
|
|
|
feedback_bar.frameNStop = frameN # exact frame index
|
|
@@ -667,11 +667,8 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
|
|
|
if hasattr(thisComponent, "setAutoDraw"):
|
|
|
thisComponent.setAutoDraw(False)
|
|
|
thisExp.addData('decision.stopped', globalClock.getTime())
|
|
|
- # using non-slip timing so subtract the expected duration of this Routine (unless ended on request)
|
|
|
- if routineForceEnded:
|
|
|
- routineTimer.reset()
|
|
|
- else:
|
|
|
- routineTimer.addTime(-0.100000)
|
|
|
+ # the Routine "decision" was not non-slip safe, so reset the non-slip timer
|
|
|
+ routineTimer.reset()
|
|
|
|
|
|
# --- Prepare to start Routine "feedback" ---
|
|
|
continueRoutine = True
|
|
@@ -681,7 +678,7 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
|
|
|
# state changed
|
|
|
feedback_bar1.progress = force
|
|
|
if decision != -1:
|
|
|
- feedback_time = 5
|
|
|
+ feedback_time = 3
|
|
|
if not decision:
|
|
|
trigger.send_trigger(0)
|
|
|
hand_device.extend()
|