Skip to content

Commit

Permalink
Merge branch 'main' into r/0.39
Browse files Browse the repository at this point in the history
  • Loading branch information
@christianbrodbeck
christianbrodbeck committed Jun 14, 2023
2 parents ae16900 + 2426cce commit 3ebaa79
Show file tree
Hide file tree
Showing 9 changed files with 207 additions and 144 deletions.
22 changes: 22 additions & 0 deletions doc/publications.bib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -942,3 +942,25 @@ @article{u537bJgIDkkJ
doi = "10.1101/2023.03.14.23287194",
google_result_id = "u537bJgIDkkJ"
}

@article{aADnZp0CBmAJ,
author = "Karunathilake, IM Dushyanthi and Kulasingham, Joshua P and Simon, Jonathan Z",
title = "Neural Tracking Measures of Speech Intelligibility: Manipulating Intelligibility while Keeping Acoustics Unchanged",
journal = "bioRxiv",
pages = "2023--05",
year = "2023",
publisher = "Cold Spring Harbor Laboratory",
doi = "10.1101/2023.05.18.541269",
google_result_id = "aADnZp0CBmAJ"
}

@article{cNSSor0KzSwJ,
author = "Haider, Chandra Leon and Park, Hyojin and Hauswald, Anne and Weisz, Nathan",
title = "Lip movements and lexical features improve speech tracking differently for clear and multi-speaker speech",
journal = "bioRxiv",
pages = "2023--05",
year = "2023",
publisher = "Cold Spring Harbor Laboratory",
doi = "10.1101/2023.05.15.540818",
google_result_id = "cNSSor0KzSwJ"
}
Binary file modified doc/scripts/bibtex.pickle
View file
Binary file not shown.
103 changes: 62 additions & 41 deletions doc/scripts/cache.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,36 +410,6 @@
]
}
},
"A7PzHd0HsK4J": {
"title": "Neural Tracking Measures of Speech Intelligibility: Manipulating Intelligibility while Keeping Acoustics Unchanged",
"result_id": "A7PzHd0HsK4J",
"type": "Pdf",
"link": "http://cansl.isr.umd.edu/simonlab/pubs/ARO2023NeuralIntelligibiiity.pdf",
"snippet": "Neural speech tracking has advanced our understanding of how our brains rapidly map an acoustic speech signal onto linguistic representations and ultimately meaning [1]. However, it \u2026",
"publication_info": {
"summary": "IMD Karunathilake, JP Kulasingham, JZ Simon - cansl.isr.umd.edu",
"authors": [
{
"name": "IMD Karunathilake",
"link": "https://scholar.google.com/citations?user=yif4EIoAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=yif4EIoAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "yif4EIoAAAAJ"
},
{
"name": "JP Kulasingham",
"link": "https://scholar.google.com/citations?user=IApEm-QAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=IApEm-QAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "IApEm-QAAAAJ"
},
{
"name": "JZ Simon",
"link": "https://scholar.google.com/citations?user=pr8YcVIAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=pr8YcVIAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "pr8YcVIAAAAJ"
}
]
}
},
"B-pQP7xth8QJ": {
"title": "Bilingual language switching in the laboratory versus in the wild: The spatiotemporal dynamics of adaptive language control",
"result_id": "B-pQP7xth8QJ",
Expand Down Expand Up @@ -1527,6 +1497,35 @@
]
}
},
"aADnZp0CBmAJ": {
"title": "Neural Tracking Measures of Speech Intelligibility: Manipulating Intelligibility while Keeping Acoustics Unchanged",
"result_id": "aADnZp0CBmAJ",
"link": "https://www.biorxiv.org/content/10.1101/2023.05.18.541269.abstract",
"snippet": "Neural speech tracking has advanced our understanding of how our brains rapidly map an acoustic speech signal onto linguistic representations and ultimately meaning. It remains \u2026",
"publication_info": {
"summary": "IMD Karunathilake, JP Kulasingham, JZ Simon - bioRxiv, 2023 - biorxiv.org",
"authors": [
{
"name": "IMD Karunathilake",
"link": "https://scholar.google.com/citations?user=yif4EIoAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=yif4EIoAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "yif4EIoAAAAJ"
},
{
"name": "JP Kulasingham",
"link": "https://scholar.google.com/citations?user=IApEm-QAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=IApEm-QAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "IApEm-QAAAAJ"
},
{
"name": "JZ Simon",
"link": "https://scholar.google.com/citations?user=pr8YcVIAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=pr8YcVIAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "pr8YcVIAAAAJ"
}
]
}
},
"aPjEwTCwSEsJ": {
"title": "Rapid transformation from auditory to linguistic representations of continuous speech",
"result_id": "aPjEwTCwSEsJ",
Expand Down Expand Up @@ -1587,6 +1586,35 @@
]
}
},
"cNSSor0KzSwJ": {
"title": "Lip movements and lexical features improve speech tracking differently for clear and multi-speaker speech",
"result_id": "cNSSor0KzSwJ",
"link": "https://www.biorxiv.org/content/10.1101/2023.05.15.540818.abstract",
"snippet": "Visual speech plays a powerful role in facilitating auditory speech processing and has been a publicly noticed topic with the wide usage of face masks during the Covid-19 pandemic. In \u2026",
"publication_info": {
"summary": "CL Haider, H Park, A Hauswald, N Weisz - bioRxiv, 2023 - biorxiv.org",
"authors": [
{
"name": "CL Haider",
"link": "https://scholar.google.com/citations?user=IiWNABwAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=IiWNABwAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "IiWNABwAAAAJ"
},
{
"name": "H Park",
"link": "https://scholar.google.com/citations?user=Vyn8xRQAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=Vyn8xRQAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "Vyn8xRQAAAAJ"
},
{
"name": "N Weisz",
"link": "https://scholar.google.com/citations?user=C1ao7w4AAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=C1ao7w4AAAAJ&engine=google_scholar_author&hl=en",
"author_id": "C1ao7w4AAAAJ"
}
]
}
},
"cVICkj-gyZoJ": {
"title": "Composition within and between languages in the bilingual mind: MEG evidence from Korean/English bilinguals",
"result_id": "cVICkj-gyZoJ",
Expand Down Expand Up @@ -2224,13 +2252,12 @@
}
},
"r6sxXEpjc44J": {
"title": "Daytime Affect and Sleep EEG Activity: A Data-Driven Exploration",
"title": "Daytime affect and sleep EEG activity: A data\u2010driven exploration",
"result_id": "r6sxXEpjc44J",
"type": "Pdf",
"link": "https://psyarxiv.com/aufbz/download?format=pdf",
"snippet": "It has long been thought that links between affect and sleep are bidirectional. However, few studies have directly assessed the relationships between (1) pre-sleep affect and sleep EEG \u2026",
"link": "https://onlinelibrary.wiley.com/doi/abs/10.1111/jsr.13916",
"snippet": "It has long been thought that links between affect and sleep are bidirectional. However, few studies have directly assessed the relationships between: (1) pre\u2010sleep affect and sleep \u2026",
"publication_info": {
"summary": "JX Zhang, M Ten Brink, Y Yan, A Goldstein-Piekarski\u2026 - 2023 - psyarxiv.com",
"summary": "JX Zhang, M Ten Brink, Y Yan\u2026 - Journal of Sleep \u2026, 2023 - Wiley Online Library",
"authors": [
{
"name": "JX Zhang",
Expand All @@ -2249,12 +2276,6 @@
"link": "https://scholar.google.com/citations?user=ER1DHXcAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=ER1DHXcAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "ER1DHXcAAAAJ"
},
{
"name": "A Goldstein-Piekarski",
"link": "https://scholar.google.com/citations?user=G7jKPfQAAAAJ&hl=en&num=20&oi=sra",
"serpapi_scholar_link": "https://serpapi.com/search.json?author_id=G7jKPfQAAAAJ&engine=google_scholar_author&hl=en",
"author_id": "G7jKPfQAAAAJ"
}
]
}
Expand Down
5 changes: 3 additions & 2 deletions doc/scripts/selection.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
"ixMq9TJ_SpYJ": false,
"p2rj0jGLdrYJ": true,
"qEvyUQDFZkIJ": false,
"A7PzHd0HsK4J": false,
"64laWGKnWJgJ": false,
"9bdfwPAvY8IJ": true,
"CdlM0PaoRKgJ": true,
Expand All @@ -104,5 +103,7 @@
"nGawSpsaeXsJ": true,
"r6sxXEpjc44J": true,
"sbu-V1MdbqcJ": true,
"u537bJgIDkkJ": true
"u537bJgIDkkJ": true,
"aADnZp0CBmAJ": true,
"cNSSor0KzSwJ": true
}
41 changes: 21 additions & 20 deletions eelbrain/_experiment/experiment.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -910,41 +910,42 @@ def _eval_root(root):
root = os.path.normpath(root)
return root

def get(self, temp, fmatch=False, vmatch=True, match=True, mkdir=False,
make=False, **kwargs):
def get(
self,
temp: str,
fmatch: bool = False,
vmatch: bool = True,
match: bool = True,
mkdir: bool = False,
make: bool = False,
**state,
):
"""
Retrieve a formatted template
With match=True, '*' are expanded to match a file,
and if there is not a unique match, an error is raised. With
mkdir=True, the directory containing the file is created if it does not
exist.
Parameters
----------
temp : str
temp
Name of the requested template.
fmatch : bool
"File-match": If the template contains asterisk ('*'), use glob to
fill it in. An IOError is raised if the pattern does not match
fmatch
"File-match": If the template contains asterisk (``*``), use ``glob`` to
expand it. An IOError is raised if the pattern does not match
exactly one file.
vmatch : bool
vmatch
"Value match": Require existence of the assigned value (only
applies for fields with stored values).
match : bool
Do any matching (i.e., match=False sets fmatch as well as vmatch
to False).
mkdir : bool
match
Do any matching (i.e., ``match=False`` sets ``fmatch`` as well as
``vmatch`` to ``False``).
mkdir
If the directory containing the file does not exist, create it.
make : bool
make
If a requested file does not exists, make it if possible.
kwargs :
Set any state values.
"""
if not match:
fmatch = vmatch = False

path = TreeModel.get(self, temp, vmatch=vmatch, **kwargs)
path = TreeModel.get(self, temp, vmatch=vmatch, **state)
path = os.path.expanduser(path)

# assert the presence of the file
Expand Down

0 comments on commit 3ebaa79

Please sign in to comment.