From fa495ccc4056157b6d47e38f92f52e8dab125570 Mon Sep 17 00:00:00 2001 From: tiborauer <tibor.auer@gmail.com> Date: Mon, 25 Apr 2022 18:15:09 +0100 Subject: [PATCH] FIX - MULTIBLOCK: stimulation duration --- rMtS_multiblock.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rMtS_multiblock.py b/rMtS_multiblock.py index 215e77e..42466f7 100644 --- a/rMtS_multiblock.py +++ b/rMtS_multiblock.py @@ -61,9 +61,9 @@ if __name__ == '__main__': doSTIMULATION = expInfo['stimulation'] # Run tES # - timings - nDummies = 5 + nDummies = 5 # [5] conditionBlockJitterRange = [9, 11]# duration of rest between condition blocks - nConditionBlock = 12 # number of condition blocks + nConditionBlock = 12 # number of condition blocks [12] trialBlockJitterRange = [5, 7] # duration of rest between trialblocks nTrialBlock = 3 # number of trial blocks per condition block @@ -245,6 +245,8 @@ if __name__ == '__main__': wave1 = Waveform(**defWave) defWave['phase'] = phaseDiff wave2 = Waveform(**defWave) + initDurationWave1 = wave1.duration + initDurationWave2 = wave2.duration # Trigger doTrigger = False @@ -376,12 +378,12 @@ if __name__ == '__main__': 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 + wave1.duration = initDurationWave1 - thisTrialBlock['onsetTrialBlock'] # do not stimulate during first ISI_trialBlock + wave2.duration = initDurationWave2 - thisTrialBlock['onsetTrialBlock'] # do not stimulate during first ISI_trialBlock BSO.initialize() BSO.loadWaveform([wave1, wave2]) BSO.stimulate() - logging.log(level=logging.DATA, msg='Stimulation - {:.3f} - Frequency: {}'.format(SSO.clock,BSO.waves[0].frequency)) + logging.log(level=logging.DATA, msg='Stimulation - {:.3f} - Frequency: {} - Duration: {:.3f}'.format(SSO.clock,BSO.waves[0].frequency,BSO.waves[0].duration)) else: logging.log(level=logging.DATA, msg='Stimulation - {:.3f} - Frequency: {}'.format(SSO.clock,0)) -- GitLab