diff --git a/rMtS_multiblock.py b/rMtS_multiblock.py index fe66c4dd573747ca119539522f1df721bd1f412a..215e77e2f1996374a49be347dbed66939ffdc80e 100644 --- a/rMtS_multiblock.py +++ b/rMtS_multiblock.py @@ -90,7 +90,6 @@ if __name__ == '__main__': 'frequency': 10, 'phase': 0, 'duration': - -array(trialBlockJitterRange).mean()+ # do not stimulate during first ISI_trialBlock nTrialBlock*( array(trialBlockJitterRange).mean()-array(sampleJitterRange).mean()+ nSample*( @@ -109,7 +108,7 @@ if __name__ == '__main__': 'samplingRate': 2000, } phaseDiff = 0 # phase of thes second channel - frequencies = [0,5,10,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 @@ -259,7 +258,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) @@ -310,7 +309,7 @@ if __name__ == '__main__': for thisConditionBlock in loopConditionBlock: # Rest - if thisConditionBlock.thisTrialN == 0: trialClock.reset() + if loopConditionBlock.thisTrialN == 0: trialClock.reset() else: trialClock.reset(-interimClock.getTime()) restStim.status = NOT_STARTED @@ -373,10 +372,12 @@ if __name__ == '__main__': win.logOnFlip(level=logging.EXP, msg='Rest - STOPPED') # Stimulation - if doSTIMULATION and thisTrialBlock.thisTrialN == 0: + if doSTIMULATION and loopTrialBlock.thisTrialN == 0: if thisConditionBlock['frequency']: wave1.frequency = thisConditionBlock['frequency'] wave2.frequency = thisConditionBlock['frequency'] + wave1.duration = wave1.duration - thisTrialBlock['onsetTrialBlock'] # do not stimulate during first ISI_trialBlock + wave2.duration = wave2.duration - thisTrialBlock['onsetTrialBlock'] # do not stimulate during first ISI_trialBlock BSO.initialize() BSO.loadWaveform([wave1, wave2]) BSO.stimulate()