@@ -260,7 +260,7 @@ def find_estimators(*, layout, subject, fmapless=True, force_fmapless=False):
260
260
261
261
b0_ids = tuple ()
262
262
with suppress (BIDSEntityError ):
263
- b0_ids = layout .get_B0FieldIdentifiers ()
263
+ b0_ids = layout .get_B0FieldIdentifiers (** base_entities )
264
264
265
265
for b0_id in b0_ids :
266
266
# Found B0FieldIdentifier metadata entries
@@ -283,9 +283,9 @@ def find_estimators(*, layout, subject, fmapless=True, force_fmapless=False):
283
283
estimators .append (e )
284
284
285
285
# A bunch of heuristics to select EPI fieldmaps
286
- sessions = layout .get_sessions ()
287
- acqs = tuple (layout .get_acquisitions (suffix = "epi" ) + [None ])
288
- contrasts = tuple (layout .get_ceagents (suffix = "epi" ) + [None ])
286
+ sessions = layout .get_sessions (subject = subject )
287
+ acqs = tuple (layout .get_acquisitions (subject = subject , suffix = "epi" ) + [None ])
288
+ contrasts = tuple (layout .get_ceagents (subject = subject , suffix = "epi" ) + [None ])
289
289
290
290
for ses , acq , ce in product (sessions or (None ,), acqs , contrasts ):
291
291
entities = base_entities .copy ()
@@ -339,7 +339,7 @@ def find_estimators(*, layout, subject, fmapless=True, force_fmapless=False):
339
339
from .epimanip import get_trt
340
340
341
341
# Sessions may not be defined at this point if some id was found.
342
- sessions = layout .get_sessions ()
342
+ sessions = layout .get_sessions (subject = subject )
343
343
for ses , suffix in sorted (product (sessions or (None ,), fmapless )):
344
344
candidates = layout .get (suffix = suffix , session = ses , ** base_entities )
345
345
0 commit comments