Skip to content

Fix remaining header Corr/RT swaps #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix remaining header Corr/RT swaps #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b6c56c
Fixed remaining Corr/RT header bugs
christiangnrd Sep 5, 2023
8a13664
Fixed Respkeys log output
christiangnrd Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions MST_Continuous_PsychoPy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@


6/1/23 (CELS): Updated for current PsychoPy / Python3

9/1/23: Fixed Corr/RT header bug
Fixed Respkeys log output
"""

"""
Expand Down Expand Up @@ -340,7 +343,7 @@ def show_task(params,fnames,type_code,lag,set_bins):
lure_bin_matrix = np.zeros((4,5)) # Rows: O,S,N,NR Cols=Lure bins

log.write('Task started at {0}\n'.format(str(datetime.now())))
log.write('Trial,Stim,Cond,Lag,LBin,StartT,Resp,RT,Corr\n')
log.write('Trial,Stim,Cond,Lag,LBin,StartT,Resp,Corr,RT\n')
local_timer = core.MonotonicClock()
duration = params['Duration']
isi = params['ISI']
Expand Down Expand Up @@ -527,7 +530,7 @@ def show_task(params,fnames,type_code,lag,set_bins):
log.write('Set: {0}\n'.format(params['Set']))
log.write('Lag set: {0}\n'.format(params['LagSet']))
log.write('Order: {0}\n'.format(params['Order']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp1Keys'],params['Resp1Keys']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp2Keys'],params['Resp3Keys']))
log.write('Self-paced: {0}\n'.format(params['SelfPaced']))
log.write('Two-choice: {0}\n'.format(params['TwoChoice']))
log.write('Rnd-mode: {0} with seed {1}\n'.format(params['Randomization'],seed))
Expand Down
4 changes: 3 additions & 1 deletion MST_Continuous_PsychoPy_320.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
- Also, set the default timing to 3 + 0.5s
6/19/23 (CELS): Fixed to allow 100 lures rather than 99.
- Fixed Corr/RT header bug

9/1/23: Fixed Respkeys log output
"""

"""
Expand Down Expand Up @@ -542,7 +544,7 @@ def show_task(params,fnames,type_code,lag,set_bins):
log.write('Set: {0}\n'.format(params['Set']))
log.write('Lag set: {0}\n'.format(params['LagSet']))
log.write('Order: {0}\n'.format(params['Order']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp1Keys'],params['Resp1Keys']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp2Keys'],params['Resp3Keys']))
log.write('Self-paced: {0}\n'.format(params['SelfPaced']))
log.write('Two-choice: {0}\n'.format(params['TwoChoice']))
log.write('Rnd-mode: {0} with seed {1}\n'.format(params['Randomization'],seed))
Expand Down
4 changes: 3 additions & 1 deletion MST_Continuous_PsychoPy_80x4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
6/19/23 (CELS): Fixed to allow 100 lures rather than 99.
- Fixed Corr/RT header bug
6/26/23 (CELS): Set to split into 4 blocks

9/1/23: Fixed Respkeys log output
"""

"""
Expand Down Expand Up @@ -553,7 +555,7 @@ def show_task(params,fnames,type_code,lag,set_bins,nblocks=4):
log.write('Set: {0}\n'.format(params['Set']))
log.write('Lag set: {0}\n'.format(params['LagSet']))
log.write('Order: {0}\n'.format(params['Order']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp1Keys'],params['Resp1Keys']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp2Keys'],params['Resp3Keys']))
log.write('Self-paced: {0}\n'.format(params['SelfPaced']))
log.write('Two-choice: {0}\n'.format(params['TwoChoice']))
log.write('Rnd-mode: {0} with seed {1}\n'.format(params['Randomization'],seed))
Expand Down
6 changes: 4 additions & 2 deletions MST_PsychoPy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
Self-paced mode added
Instructions now stay up all the time the image is up

9/1/23: Fixed Corr/RT header bug
Fixed Respkeys log output
"""

"""
Expand Down Expand Up @@ -376,7 +378,7 @@ def show_test(params,test_list,test_cond,set_bins):
lure_bin_matrix = np.zeros((4,5)) # Rows: O,S,N,NR Cols=Lure bins

log.write('Test phase started at {0}\n'.format(str(datetime.now())))
log.write('Trial,Stim,Cond,LBin,StartT,Resp,RT,Corr\n')
log.write('Trial,Stim,Cond,LBin,StartT,Resp,Corr,RT\n')
local_timer = core.MonotonicClock()
duration = params['Duration']
isi = params['ISI']
Expand Down Expand Up @@ -553,7 +555,7 @@ def show_test(params,test_list,test_cond,set_bins):
log.write('ISI: {0}\n'.format(params['ISI']))
log.write('Phase: {0}\n'.format(params['Phase']))
log.write('Set: {0}\n'.format(params['Set']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp1Keys'],params['Resp1Keys']))
log.write('Respkeys: {0} {1} {2}\n'.format(params['Resp1Keys'],params['Resp2Keys'],params['Resp3Keys']))
log.write('Self-paced: {0}\n'.format(params['SelfPaced']))
log.write('Two-choice: {0}\n'.format(params['TwoChoice']))
log.write('NStimPerSet: {0}\n'.format(params['NStimPerSet']))
Expand Down