diff --git a/MST_Continuous_PsychoPy.py b/MST_Continuous_PsychoPy.py index f84d939..c75e776 100644 --- a/MST_Continuous_PsychoPy.py +++ b/MST_Continuous_PsychoPy.py @@ -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 """ """ @@ -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'] @@ -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)) diff --git a/MST_Continuous_PsychoPy_320.py b/MST_Continuous_PsychoPy_320.py index 60b7efa..ccd2e8a 100644 --- a/MST_Continuous_PsychoPy_320.py +++ b/MST_Continuous_PsychoPy_320.py @@ -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 """ """ @@ -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)) diff --git a/MST_Continuous_PsychoPy_80x4.py b/MST_Continuous_PsychoPy_80x4.py index 89618c3..b4b878e 100644 --- a/MST_Continuous_PsychoPy_80x4.py +++ b/MST_Continuous_PsychoPy_80x4.py @@ -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 """ """ @@ -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)) diff --git a/MST_PsychoPy.py b/MST_PsychoPy.py index 692471c..8255b91 100644 --- a/MST_PsychoPy.py +++ b/MST_PsychoPy.py @@ -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 """ """ @@ -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'] @@ -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']))