Skip to content

Commit

Permalink
FIX: Fix for updated naming
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner committed Aug 18, 2023
1 parent 71a44f4 commit d811653
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 9 deletions.
1 change: 1 addition & 0 deletions mne_bids_pipeline/steps/preprocessing/_07a_apply_ica.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def get_input_fnames_apply_ica(
processing="ica", suffix="components", extension=".tsv"
)
in_files["epochs"] = bids_basename.copy().update(suffix="epo", extension=".fif")
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down
1 change: 1 addition & 0 deletions mne_bids_pipeline/steps/preprocessing/_07b_apply_ssp.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def get_input_fnames_apply_ssp(
)
in_files = dict()
in_files["epochs"] = bids_basename.copy().update(suffix="epo", check=False)
_update_for_splits(in_files, "epochs", single=True)
in_files["proj"] = bids_basename.copy().update(suffix="proj", check=False)
return in_files

Expand Down
1 change: 1 addition & 0 deletions mne_bids_pipeline/steps/preprocessing/_08_ptp_reject.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def get_input_fnames_drop_ptp(
)
in_files = dict()
in_files["epochs"] = bids_path.copy().update(processing=cfg.spatial_filter)
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down
9 changes: 8 additions & 1 deletion mne_bids_pipeline/steps/sensor/_01_make_evoked.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
from ..._logging import gen_log_kwargs, logger
from ..._parallel import parallel_func, get_parallel_backend
from ..._report import _open_report, _sanitize_cond_tag, _all_conditions
from ..._run import failsafe_run, save_logs, _sanitize_callable, _prep_out_files
from ..._run import (
failsafe_run,
save_logs,
_sanitize_callable,
_prep_out_files,
_update_for_splits,
)


def get_input_fnames_evoked(
Expand All @@ -43,6 +49,7 @@ def get_input_fnames_evoked(
)
in_files = dict()
in_files["epochs"] = fname_epochs
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down
3 changes: 2 additions & 1 deletion mne_bids_pipeline/steps/sensor/_02_decoding_full_epochs.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from ..._logging import gen_log_kwargs, logger
from ..._decoding import LogReg
from ..._parallel import parallel_func, get_parallel_backend
from ..._run import failsafe_run, save_logs, _prep_out_files
from ..._run import failsafe_run, save_logs, _prep_out_files, _update_for_splits
from ..._report import (
_open_report,
_contrasts_to_names,
Expand Down Expand Up @@ -68,6 +68,7 @@ def get_input_fnames_epochs_decoding(
)
in_files = dict()
in_files["epochs"] = fname_epochs
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down
3 changes: 2 additions & 1 deletion mne_bids_pipeline/steps/sensor/_03_decoding_time_by_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
)
from ..._decoding import LogReg
from ..._logging import gen_log_kwargs, logger
from ..._run import failsafe_run, save_logs, _prep_out_files
from ..._run import failsafe_run, save_logs, _prep_out_files, _update_for_splits
from ..._parallel import get_parallel_backend, get_parallel_backend_name
from ..._report import (
_open_report,
Expand Down Expand Up @@ -73,6 +73,7 @@ def get_input_fnames_time_decoding(
)
in_files = dict()
in_files["epochs"] = fname_epochs
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down
3 changes: 2 additions & 1 deletion mne_bids_pipeline/steps/sensor/_04_time_frequency.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
_restrict_analyze_channels,
)
from ..._logging import gen_log_kwargs, logger
from ..._run import failsafe_run, save_logs, _prep_out_files
from ..._run import failsafe_run, save_logs, _prep_out_files, _update_for_splits
from ..._parallel import get_parallel_backend, parallel_func
from ..._report import _open_report, _sanitize_cond_tag

Expand Down Expand Up @@ -53,6 +53,7 @@ def get_input_fnames_time_frequency(
)
in_files = dict()
in_files["epochs"] = fname_epochs
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down
3 changes: 2 additions & 1 deletion mne_bids_pipeline/steps/sensor/_05_decoding_csp.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from ..._decoding import LogReg, _handle_csp_args
from ..._logging import logger, gen_log_kwargs
from ..._parallel import parallel_func, get_parallel_backend
from ..._run import failsafe_run, save_logs, _prep_out_files
from ..._run import failsafe_run, save_logs, _prep_out_files, _update_for_splits
from ..._report import (
_open_report,
_sanitize_cond_tag,
Expand Down Expand Up @@ -132,6 +132,7 @@ def get_input_fnames_csp(
)
in_files = dict()
in_files["epochs"] = fname_epochs
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down
14 changes: 10 additions & 4 deletions mne_bids_pipeline/steps/sensor/_06_make_cov.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
from ..._logging import gen_log_kwargs, logger
from ..._parallel import get_parallel_backend, parallel_func
from ..._report import _open_report, _sanitize_cond_tag, _all_conditions
from ..._run import failsafe_run, save_logs, _sanitize_callable, _prep_out_files
from ..._run import (
failsafe_run,
save_logs,
_sanitize_callable,
_prep_out_files,
_update_for_splits,
)


def get_input_fnames_cov(
Expand All @@ -47,9 +53,8 @@ def get_input_fnames_cov(
root=cfg.deriv_root,
check=False,
)
in_files["report_info"] = fname_epochs.copy().update(
processing="clean", suffix="epo"
)
in_files["report_info"] = fname_epochs.copy().update(processing="clean")
_update_for_splits(in_files, "report_info", single=True)
fname_evoked = fname_epochs.copy().update(
suffix="ave", processing=None, check=False
)
Expand Down Expand Up @@ -83,6 +88,7 @@ def get_input_fnames_cov(
else:
assert cov_type == "epochs", cov_type
in_files["epochs"] = fname_epochs
_update_for_splits(in_files, "epochs", single=True)
return in_files


Expand Down

0 comments on commit d811653

Please sign in to comment.