Skip to content
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.

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

remove some ._filenames uses in favor of .filenames #12996

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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 mne/io/ant/ant.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def _read_segment_file(self, data, idx, fi, start, stop, cals, mult):
i_start = max(start, first_samp)
i_stop = min(stop, this_n_times + first_samp)
# read and scale data array
cnt = read_cnt(self._filenames[fi])
cnt = read_cnt(self.filenames[fi])
one = read_data(cnt, i_start, i_stop)
_scale_data(one, ch_units)
data_view = data[:, i_start - start : i_stop - start]
Expand Down
2 changes: 1 addition & 1 deletion mne/io/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2629,7 +2629,7 @@ class _ReadSegmentFileProtector:
def __init__(self, raw):
self.__raw = raw
assert hasattr(raw, "_projector")
self._filenames = raw._filenames
self.filenames = raw.filenames
sappelhoff marked this conversation as resolved.
Show resolved Hide resolved
self._raw_extras = raw._raw_extras

def _read_segment_file(self, data, idx, fi, start, stop, cals, mult):
Expand Down
2 changes: 1 addition & 1 deletion mne/io/kit/kit.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ def __init__(
)
kit_info.update(input_fname=input_fname)
self._raw_extras = [kit_info]
self._filenames = []
self.filenames = []
if len(events) != self._raw_extras[0]["n_epochs"]:
raise ValueError("Event list does not match number of epochs.")

Expand Down
2 changes: 1 addition & 1 deletion mne/io/snirf/_snirf.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def _read_segment_file(self, data, idx, fi, start, stop, cals, mult):
"""Read a segment of data from a file."""
import h5py

with h5py.File(self._filenames[0], "r") as dat:
with h5py.File(self.filenames[0], "r") as dat:
one = dat["/nirs/data1/dataTimeSeries"][start:stop].T

_mult_cal_one(data, one, idx, cals, mult)
Expand Down
8 changes: 4 additions & 4 deletions mne/io/tests/test_raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -543,12 +543,12 @@ def _test_raw_crop(reader, t_prop, kwargs):
raw_2, raw_3 = raw_1.copy(), raw_1.copy()
t_tot = raw_1.times[-1] * 3 + 2.0 / raw_1.info["sfreq"]
raw_concat = concatenate_raws([raw_1, raw_2, raw_3])
assert len(raw_concat._filenames) == 3
assert len(raw_concat.filenames) == 3
assert_allclose(raw_concat.times[-1], t_tot)
assert_allclose(raw_concat.first_time, first_time)
# keep all instances, but crop to t_start at the beginning
raw_concat.crop(t_start, None)
assert len(raw_concat._filenames) == 3
assert len(raw_concat.filenames) == 3
assert_allclose(raw_concat.times[-1], t_tot - t_start, atol=atol)
assert_allclose(
raw_concat.first_time,
Expand All @@ -558,7 +558,7 @@ def _test_raw_crop(reader, t_prop, kwargs):
)
# drop the first instance
raw_concat.crop(crop_t, None)
assert len(raw_concat._filenames) == 2
assert len(raw_concat.filenames) == 2
assert_allclose(raw_concat.times[-1], t_tot - t_start - crop_t, atol=atol)
assert_allclose(
raw_concat.first_time,
Expand All @@ -568,7 +568,7 @@ def _test_raw_crop(reader, t_prop, kwargs):
)
# drop the second instance, leaving just one
raw_concat.crop(crop_t, None)
assert len(raw_concat._filenames) == 1
assert len(raw_concat.filenames) == 1
assert_allclose(raw_concat.times[-1], t_tot - t_start - 2 * crop_t, atol=atol)
assert_allclose(
raw_concat.first_time,
Expand Down
2 changes: 1 addition & 1 deletion mne/preprocessing/ica.py
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@ def _sources_as_raw(self, raw, add_channels, start, stop):
out._data = data_
out._first_samps = [out.first_samp]
out._last_samps = [out.last_samp]
out._filenames = [None]
out.filenames = [None]
out.preload = True
out._projector = None
self._export_info(out.info, raw, add_channels)
Expand Down
4 changes: 2 additions & 2 deletions mne/preprocessing/tests/test_ica.py
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ def test_ica_core(method, n_components, noise_cov, n_pca_components, browser_bac

raw_sources = ica.get_sources(raw)
# test for #3804
assert_equal(raw_sources._filenames, [None])
assert_equal(raw_sources.filenames, (None,))
print(raw_sources)

# test for gh-6271 (scaling of ICA traces)
Expand Down Expand Up @@ -973,7 +973,7 @@ def f(x, y):
assert ica_raw.n_times == 100
assert ica_raw.last_samp - ica_raw.first_samp + 1 == 100
assert ica_raw._data.shape[1] == 100
assert_equal(len(ica_raw._filenames), 1) # API consistency
assert_equal(len(ica_raw.filenames), 1) # API consistency
ica_chans = [ch for ch in ica_raw.ch_names if "ICA" in ch]
assert ica.n_components_ == len(ica_chans)
test_ica_fname = Path.cwd() / "test-ica_raw.fif"
Expand Down
2 changes: 1 addition & 1 deletion mne/viz/raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def plot_raw(
# generate window title; allow instances without a filename (e.g., ICA)
if title is None:
title = "<unknown>"
fnames = raw._filenames.copy() # use the private attribute to get a list
fnames = list(tuple(raw.filenames)) # get a list of a copy of the filenames
if len(fnames):
title = fnames.pop(0)
extra = f" ... (+ {len(fnames)} more)" if len(fnames) else ""
Expand Down
Loading