Sam s feedback

Author: h-mayorquin

neo/rawio/baserawio.py

@@ -550,6 +550,18 @@ def get_analogsignal_chunk(self, block_index=0, seg_index=0, i_start=None, i_sto
                               np.ndarray and are contiguous
         :return: array with raw signal samples
         """
+        
+        signal_streams = self.header['signal_streams']
+        signal_channels = self.header['signal_channels']
+        no_signal_streams = signal_streams.size == 0
+        no_channels = signal_channels.size == 0
+        if no_signal_streams or no_channels:
+            error_message = (
+                "get_analogsignal_chunk can't be called on a file with no signal streams or channels."
+                "Double check that your file contains signal streams and channels."
+            )
+            raise AttributeError(error_message)
+                
         stream_index = self._get_stream_index_from_arg(stream_index)
         channel_indexes = self._get_channel_indexes(stream_index, channel_indexes,
                                                     channel_names, channel_ids)
@@ -579,7 +591,7 @@ def rescale_signal_raw_to_float(self, raw_signal, dtype='float32', stream_index=
                                     channel_indexes=None, channel_names=None, channel_ids=None):
         """
         Rescale a chunk of raw signals which are provided as a Numpy array. These are normally
-        returned by a call to get_analog_signal_chunk. The channels are specified either by
+        returned by a call to get_analogsignal_chunk. The channels are specified either by
         channel_names, if provided, otherwise by channel_ids, if provided, otherwise by
         channel_indexes, if provided, otherwise all channels are selected.
 

neo/rawio/mearecrawio.py

@@ -83,21 +83,22 @@ def _parse_header(self):
         self._num_channels = self.channel_positions.shape[0]
         self._dtype = self.info_dict["recordings"]["dtype"]
 
-        signals = [('Signals', '0')] 
+        signals = [('Signals', '0')] if self.load_analogsignal else []
         signal_streams = np.array(signals, dtype=_signal_stream_dtype)
 
 
         sig_channels = []
-        for c in range(self._num_channels):
-            ch_name = 'ch{}'.format(c)
-            chan_id = str(c + 1)
-            sr = self._sampling_rate  # Hz
-            dtype = self._dtype
-            units = 'uV'
-            gain = 1.
-            offset = 0.
-            stream_id = '0'
-            sig_channels.append((ch_name, chan_id, sr, dtype, units, gain, offset, stream_id))
+        if self.load_analogsignal:
+            for c in range(self._num_channels):
+                ch_name = 'ch{}'.format(c)
+                chan_id = str(c + 1)
+                sr = self._sampling_rate  # Hz
+                dtype = self._dtype
+                units = 'uV'
+                gain = 1.
+                offset = 0.
+                stream_id = '0'
+                sig_channels.append((ch_name, chan_id, sr, dtype, units, gain, offset, stream_id))
 
         sig_channels = np.array(sig_channels, dtype=_signal_channel_dtype)
 
@@ -180,16 +181,10 @@ def _get_analogsignal_chunk(self, block_index, seg_index, i_start, i_stop,
 
     def _spike_count(self, block_index, seg_index, unit_index):
 
-        if not self.load_spiketrains:
-            raise AttributeError("Spiketrains not loaded. Set load_spiketrains=True in MEArecRawIO constructor")
-        
         return len(self._spiketrains[unit_index])
 
     def _get_spike_timestamps(self, block_index, seg_index, unit_index, t_start, t_stop):
 
-        if not self.load_spiketrains:
-            raise AttributeError("Spiketrains not loaded. Set load_spiketrains=True in MEArecRawIO constructor")
-        
         spike_timestamps = self._spiketrains[unit_index].times.magnitude
         if t_start is None:
             t_start = self._segment_t_start(block_index, seg_index)

neo/test/rawiotest/test_mearecrawio.py

@@ -41,8 +41,7 @@ def test_not_loading_recordings(self):
         rawio.get_spike_timestamps()
 
         # Test that caling anlogsignal chunk raises the right error
-        error_message = "Recordings not loaded. Set load_analogsignal=True in MEArecRawIO constructor"
-        with self.assertRaises(AttributeError, msg=error_message):
+        with self.assertRaises(AttributeError):
             rawio.get_analogsignal_chunk()
 
 
@@ -60,8 +59,7 @@ def test_not_loading_spiketrain(self):
         rawio.get_analogsignal_chunk()
 
         # Test that calling get_spike_timestamps raises an the right error
-        error_message = "Spiketrains not loaded. Set load_spiketrains=True in MEArecRawIO constructor"
-        with self.assertRaises(AttributeError, msg=error_message):
+        with self.assertRaises(AttributeError):
             rawio.get_spike_timestamps()
 
 if __name__ == "__main__":