diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fb0927f2..1d70b91e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -80,9 +80,10 @@ jobs: run: | python - <<'PY' import whobpyt - from whobpyt.datasets.fetchers import fetch_egmomi2023, fetch_egmomi2025,fetch_egtmseeg, fetch_egismail2025 + from whobpyt.datasets.fetchers import fetch_egmomi2023, fetch_egmomi2025, fetch_egtmseeg, fetch_egismail2025 fetch_egmomi2023() fetch_egmomi2025() + fetch_egtmseeg() fetch_egismail2025() PY diff --git a/examples/eg__tmseeg.py b/examples/eg__tmseeg.py index 2f2fea3a..5c00aa09 100644 --- a/examples/eg__tmseeg.py +++ b/examples/eg__tmseeg.py @@ -25,7 +25,7 @@ from whobpyt.models.jansen_rit import JansenRitModel,JansenRitParams from whobpyt.run import ModelFitting from whobpyt.optimization.custom_cost_JR import CostsJR -from whobpyt.datasets.fetchers import fetch_momi2023 +from whobpyt.datasets.fetchers import fetch_egtmseeg # Python Packages used for processing and displaying given analytical data (supported for .mat and Google Drive files) import numpy as np @@ -43,7 +43,7 @@ # %% # Download and load example data -data_dir = fetch_momi2023() +data_dir = fetch_egtmseeg() # %% # Load EEG data diff --git a/whobpyt/datasets/fetchers.py b/whobpyt/datasets/fetchers.py index 3321d390..3433e37b 100644 --- a/whobpyt/datasets/fetchers.py +++ b/whobpyt/datasets/fetchers.py @@ -173,15 +173,12 @@ def fetch_egtmseeg(dest_folder=None, redownload=False): # If the folder does not exist, create it and download the files if not os.path.isdir(dest_folder): - - os.makedirs(dest_folder) - + os.makedirs(dest_folder) os.chdir(dest_folder) - - dlcode = osf_folder_url - pull_file(dlcode, file_name, download_method='wget') - - os.chdir(cwd) + for file_code, file_name in files_dict.items(): + dlcode = osf_url_pfx + '/' + file_code + pull_file(dlcode, file_name, download_method='wget') + os.chdir(cwd) # go back to where we started return dest_folder