ENH - 20Hz, wait for ppt to start

rMtS_multiblock.py

@@ -117,7 +117,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] #,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
@@ -300,8 +300,9 @@ if __name__ == '__main__':
         img = visual.ImageStim(win, image=infoImg[i], pos=[0, -325], size=[int(i*0.7) for i in [1280, 530]])
         img.draw()
         win.flip()
-        if not(EMUL_BUTTONS): SSO.wait_for_button(timeout=inf)
-        else: sleep(2)
+        SSO.wait_for_button(timeout=inf)
+#        if not(EMUL_BUTTONS): SSO.wait_for_button(timeout=inf)
+ #       else: sleep(2)
         
     ######## WAIT FOR SYNCH ########
     msg = visual.TextStim(win, text="Wait for scanner...", height=gridSize*0.1, wrapWidth=win.size[0], autoLog=False)