Skip to content

Commit 123ca04

Browse files
[Fix] neo v0.13.4 deprecated copy (#646)
* remove copy from conversion * remove copy from spike_train_correlation * fix surrogates * fix statistics
1 parent c6d047d commit 123ca04

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

elephant/conversion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ def to_spike_trains(self, spikes="random", as_array=False,
854854
array_ants = dict(bins=bin_indices)
855855
spiketrain = neo.SpikeTrain(spiketrain, t_start=self._t_start,
856856
t_stop=self._t_stop,
857-
units=self.units, copy=False,
857+
units=self.units,
858858
description=description,
859859
array_annotations=array_ants,
860860
bin_size=self.bin_size)

elephant/spike_train_correlation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ def cross_correlation_histogram(
809809
signal=np.expand_dims(cross_corr, axis=1),
810810
units=pq.dimensionless,
811811
t_start=t_start,
812-
sampling_period=binned_spiketrain_i.bin_size, copy=False,
812+
sampling_period=binned_spiketrain_i.bin_size,
813813
**annotations)
814814
return cch_result, lags
815815

elephant/spike_train_surrogates.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,6 @@ def _continuous_time_bin_shuffling(spiketrain, max_displacement, bin_size,
736736
units=units,
737737
t_start=t_start,
738738
t_stop=t_stop,
739-
copy=False,
740739
)
741740

742741
surrogate_spiketrains.append(surrogate_spiketrain)
@@ -1252,8 +1251,7 @@ def trial_shifting(spiketrains, dither, n_surrogates=1):
12521251
surrogate_spiketrain[trial_id] * pq.s,
12531252
t_start=t_starts[trial_id] * pq.s,
12541253
t_stop=t_stops[trial_id] * pq.s,
1255-
units=units,
1256-
sampling_rate=sampling_rates[trial_id])
1254+
sampling_rate=sampling_rates[trial_id]).rescale(units)
12571255
for trial_id in range(len(surrogate_spiketrain))]
12581256
for surrogate_spiketrain in surrogate_spiketrains]
12591257

@@ -1337,8 +1335,7 @@ def _trial_shifting_of_concatenated_spiketrain(
13371335
np.hstack(surrogate_spiketrain) * pq.s,
13381336
t_start=t_start * pq.s,
13391337
t_stop=t_stop * pq.s,
1340-
units=units,
1341-
sampling_rate=spiketrain.sampling_rate)
1338+
sampling_rate=spiketrain.sampling_rate).rescale(units)
13421339
for surrogate_spiketrain in surrogate_spiketrains]
13431340
return surrogate_spiketrains
13441341

elephant/statistics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ def _rate() -> pq.Quantity:
12011201
sampling_period=bin_size,
12021202
units=normalised_bin_hist.units,
12031203
t_start=binned_spiketrain.t_start,
1204-
normalization=output, copy=False)
1204+
normalization=output)
12051205

12061206

12071207
@deprecated_alias(binsize='bin_size')

0 commit comments

Comments
 (0)