diff --git a/rMtS_multiblock.py b/rMtS_multiblock.py index 303cdec304b6ab75a06654b363658edc6110f8cb..63a6e350ba097c6522ca275907cbe6ea3d7e472e 100644 --- a/rMtS_multiblock.py +++ b/rMtS_multiblock.py @@ -117,7 +117,7 @@ if __name__ == '__main__': 'samplingRate': 2000, } phaseDiff = 0 # phase of thes second channel - frequencies = [0,5,10,20] #,20,60] # x5 frequencies + frequencies = [0,5,10,20] #,60] # x5 frequencies gridSize = 600 # width and height of the grid gridXY = expInfo['grid size'] # number of cells per axis -> number of cells = gridXY**2 @@ -276,7 +276,7 @@ if __name__ == '__main__': # - for multimonitor: # - set the external screen to primary # - set screen=1 - win = visual.Window([1280,1024],winType='pyglet',screen=1,monitor=mon,units='pix',fullscr=True, autoLog=False, gammaErrorPolicy='ignore') + win = visual.Window([1280,1024],winType='pyglet',screen=1,monitor=mon,units='pix',fullscr=False, autoLog=False, gammaErrorPolicy='ignore') win.mouseVisible = False gridForm = visual.ElementArrayStim(win=win, name='gridForm', nElements=(gridXY+1)*2, sizes=[gridSize,2], xys = gridCoordinates, oris=gridAngles, units='pix', elementTex=ones([16,16]), elementMask=ones([16,16]), colors=colour, colorSpace='rgb', autoLog=False) @@ -605,6 +605,11 @@ if __name__ == '__main__': from numpy import fromstring import csv + if expInfo['dedicated response period "?"']: + respEvent = 'Response' + else: + respEvent = 'Match' + eventFile = filename + '_events.tsv' fOut = open(eventFile,'w',newline='') ev = csv.writer(fOut, delimiter='\t') @@ -632,14 +637,17 @@ if __name__ == '__main__': elif item[2].find('Match') >= 0: match = fromstring(item[2].split(' - ')[2][1:-1],sep=' ') nTrial += 1 - nMatch += 1 - itemToWrite[2] += str(nMatch) + if expInfo['match number'] > 1: + nMatch += 1 + itemToWrite[2] += str(nMatch) else: itemToWrite[1] = round(float(item[0]) - itemToWrite[0],4) - if item[2].find('Response') >= 0: - itemToWrite[2] += str(nMatch) + if item[2].find(respEvent) >= 0: + if expInfo['match number']: itemToWrite[2] += str(nMatch) if len(button): - button[0] = round(thisExp.entries[nTrial]['resp.rt'],4) + rt = round(thisExp.entries[nTrial]['resp.rt'],4) + if rt > 1: rt = round(button[0]-itemToWrite[0],4) # for erroneous RTs default to + button[0] = rt else: button = ['n/a','miss'] itemToWrite[3:5] = button @@ -647,7 +655,7 @@ if __name__ == '__main__': ev.writerow(itemToWrite) itemToWrite = [None]*5 # 5 columns elif item[2].find('Button') >= 0: - button += [float(item[2].split(' - ')[1])] + button += [float(item[0])] #[float(item[2].split(' - ')[1])] if not(isin(match,sample) ^ (item[2].split(' - ')[2] == str(bYes))): button += ['hit'] else: button += ['false']