update stimulus development figur + fix Bug in sinusoidalStepStim class

This commit is contained in:
a.ott
2020-09-05 11:25:05 +02:00
parent 6f83f3b171
commit ad1ddbb041
6 changed files with 14 additions and 13 deletions

View File

@@ -45,7 +45,9 @@ class SinusoidalStepStimulus(AbstractStimulus):
def convert_to_array(frequency, amplitude, contrast, start_time, duration, time_start, total_time, step_size_s):
full_time = np.arange(time_start, time_start + total_time, step_size_s)
full_carrier = np.sin(2 * np.pi * frequency * full_time)
if start_time > time_start+duration or start_time+duration < time_start:
if start_time > time_start+total_time or start_time+duration < time_start:
if contrast != 0:
print("SinusoidalStepStimulus: converted to array in a range outside of step!")
return full_carrier * amplitude
else:
if start_time >= time_start: