Merge pull request #1120 from JuliaSprenger/bug/proxynix

[nixio] save waveforms of SpikeTrainProxy objects if available.

Author: samuelgarcia

neo/io/nixio.py

@@ -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)

neo/test/iotest/test_nixio.py

@@ -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)