Skip to content

[nixio] save waveforms of SpikeTrainProxy objects if available. #1120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samuelgarcia merged 2 commits into from
May 31, 2022
Merged

[nixio] save waveforms of SpikeTrainProxy objects if available. #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c82c301
[nixio] save also waveforms of SpikeTrainProxy objects if available.
JuliaSprenger May 18, 2022
6084740
[nixio] adjust test to match expected proxy loading behaviour
JuliaSprenger May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion neo/io/nixio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ def _write_spiketrain(self, spiketrain, nixblock, nixgroup):
return

if isinstance(spiketrain, BaseProxy):
spiketrain = spiketrain.load()
spiketrain = spiketrain.load(load_waveforms=True)

times = spiketrain.times.magnitude
tunits = units_to_string(spiketrain.times.units)
Expand Down
4 changes: 3 additions & 1 deletion neo/test/iotest/test_nixio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,10 @@ def compare_signal_dalist(self, neosig, nixdalist):
def compare_eests_mtags(self, eestlist, mtaglist):
self.assertEqual(len(eestlist), len(mtaglist))
for eest in eestlist:
if isinstance(eest, (EventProxy, EpochProxy, SpikeTrainProxy)):
if isinstance(eest, (EventProxy, EpochProxy)):
eest = eest.load()
elif isinstance(eest, SpikeTrainProxy):
eest = eest.load(load_waveforms=True)
mtag = mtaglist[eest.annotations["nix_name"]]
if isinstance(eest, Epoch):
self.compare_epoch_mtag(eest, mtag)
Expand Down