Skip to content

Commit 487c904

Browse files
committed
change load_recording to load_analog_signal
1 parent 658c839 commit 487c904

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

neo/io/mearecio.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ class MEArecIO(MEArecRawIO, BaseFromRaw):
66
__doc__ = MEArecRawIO.__doc__
77
mode = 'file'
88

9-
def __init__(self, filename, load_spiketrains=True, load_recordings=True):
10-
MEArecRawIO.__init__(self, filename=filename)
9+
def __init__(self, filename, load_spiketrains=True, load_analogsignal=True):
10+
MEArecRawIO.__init__(self,
11+
filename=filename,
12+
load_spiketrains=load_spiketrains,
13+
load_analogsignal=load_analogsignal
14+
)
1115
BaseFromRaw.__init__(self, filename)

neo/rawio/mearecrawio.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MEArecRawIO(BaseRawIO):
2828
The filename of the MEArec file to read.
2929
load_spiketrains : bool, optional
3030
Whether or not to load spike train data. Defaults to `True`.
31-
load_recordings : bool, optional
31+
load_analogsignal : bool, optional
3232
Whether or not to load continuous recording data. Defaults to `True`.
3333
3434
@@ -48,18 +48,18 @@ class MEArecRawIO(BaseRawIO):
4848
extensions = ['h5']
4949
rawmode = 'one-file'
5050

51-
def __init__(self, filename='', load_spiketrains=True, load_recordings=True):
51+
def __init__(self, filename='', load_spiketrains=True, load_analogsignal=True):
5252
BaseRawIO.__init__(self)
5353
self.filename = filename
5454
self.load_spiketrains = load_spiketrains
55-
self.load_recordings = load_recordings
55+
self.load_analogsignal = load_analogsignal
5656

5757
def _source_name(self):
5858
return self.filename
5959

6060
def _parse_header(self):
6161
load = ["channel_positions"]
62-
if self.load_recordings:
62+
if self.load_analogsignal:
6363
load.append("recordings")
6464
if self.load_spiketrains:
6565
load.append("spiketrains")
@@ -72,7 +72,7 @@ def _parse_header(self):
7272

7373
self.info_dict = deepcopy(self._recgen.info)
7474
self.channel_positions = self._recgen.channel_positions
75-
if self.load_recordings:
75+
if self.load_analogsignal:
7676
self._recordings = self._recgen.recordings
7777
if self.load_spiketrains:
7878
self._spiketrains = self._recgen.spiketrains
@@ -154,8 +154,8 @@ def _get_signal_t_start(self, block_index, seg_index, stream_index):
154154
def _get_analogsignal_chunk(self, block_index, seg_index, i_start, i_stop,
155155
stream_index, channel_indexes):
156156

157-
if not self.load_recordings:
158-
raise AttributeError("Recordings not loaded. Set load_recordings=True in MEArecRawIO constructor")
157+
if not self.load_analogsignal:
158+
raise AttributeError("Recordings not loaded. Set load_analogsignal=True in MEArecRawIO constructor")
159159

160160
if i_start is None:
161161
i_start = 0

0 commit comments

Comments
 (0)