change implementation to more efficient way. adapt signature

This commit is contained in:
a.ott
2020-03-02 16:37:37 +01:00
parent 8997e56618
commit 7e65ebae4e
5 changed files with 28 additions and 14 deletions

View File

@@ -163,7 +163,7 @@ class LifacNoiseModel(AbstractModel):
base_stimulus = SinusAmplitudeModulationStimulus(base_stimulus_freq, 0, 0)
_, spiketimes = self.simulate_fast(base_stimulus, 30)
time_x = 5
baseline_freq = hF.mean_freq_of_spiketimes_after_time_x(spiketimes, self.get_sampling_interval(), time_x)
baseline_freq = hF.mean_freq_of_spiketimes_after_time_x(spiketimes, time_x)
relative_spiketimes = np.array([s % (1 / base_stimulus_freq) for s in spiketimes])
eod_durations = np.full((len(spiketimes)), 1 / base_stimulus_freq)
@@ -184,7 +184,7 @@ class LifacNoiseModel(AbstractModel):
stimulus = SinusAmplitudeModulationStimulus(base_freq, contrast, modulation_frequency)
_, spiketimes = self.simulate_fast(stimulus, 1)
f_infinity = hF.mean_freq_of_spiketimes_after_time_x(spiketimes, self.get_sampling_interval(), 0.3)
f_infinity = hF.mean_freq_of_spiketimes_after_time_x(spiketimes, 0.3)
f_infinities.append(f_infinity)
popt, pcov = curve_fit(fu.line, contrasts, f_infinities, maxfev=10000)
@@ -239,7 +239,7 @@ def test_v_offset(model: LifacNoiseModel, v_offset, base_stimulus, simulation_le
model.set_variable("v_offset", v_offset)
_, spiketimes = model.simulate_fast(base_stimulus, simulation_length)
freq = hF.mean_freq_of_spiketimes_after_time_x(spiketimes, 0.0005, simulation_length/3)
freq = hF.mean_freq_of_spiketimes_after_time_x(spiketimes, simulation_length / 3)
return freq