ENH: Find B0FieldIdentifiers when one image contributes to multiple

[bpinsard]

Attempt at fixing/hacking #266

[codecov-commenter]

Codecov Report

Base: 85.38% // Head: 90.13% // Increases project coverage by +4.74% 🎉

Coverage data is based on head (68585e3) compared to base (83b064e).
Patch coverage: 90.47% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #298      +/-   ##
==========================================
+ Coverage   85.38%   90.13%   +4.74%     
==========================================
  Files          24       25       +1     
  Lines        1930     2372     +442     
  Branches      221      381     +160     
==========================================
+ Hits         1648     2138     +490     
+ Misses        246      189      -57     
- Partials       36       45       +9     

Flag	Coverage Δ
travis	83.87% <90.00%> (-1.52%)	⬇️
unittests	90.13% <86.66%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
sdcflows/fieldmaps.py	98.25% <81.81%> (-1.16%)	⬇️
sdcflows/utils/wrangler.py	98.17% <100.00%> (+1.08%)	⬆️
sdcflows/utils/tools.py	90.81% <0.00%> (-9.19%)	⬇️
sdcflows/workflows/apply/correction.py	100.00% <0.00%> (ø)
sdcflows/conftest.py	0.00% <0.00%> (ø)
sdcflows/workflows/apply/registration.py	92.59% <0.00%> (+0.59%)	⬆️
sdcflows/workflows/outputs.py	92.72% <0.00%> (+0.79%)	⬆️
sdcflows/interfaces/reportlets.py	89.83% <0.00%> (+1.69%)	⬆️
sdcflows/transform.py	93.03% <0.00%> (+3.20%)	⬆️
... and 6 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

[effigies]

@bpinsard Spent a bit of time on this logic today, and fixed the tests. Please check it on your use case.

[effigies]

Just a bump. If this is good to go, it would be nice to get in for a release.

[bpinsard]

Great. will test it asap.

[bpinsard]

B0FieldIdentifier=f'"{b0_id}"' works but repr(b0_id) gives single quote that are not matched, so if we want to use an existing function json.dumps is maybe a better choice?

[effigies]

Oh, are we doing json.dumps somewhere in pybids to store B0FieldIdentifier? I didn't see it. What does layout.get_B0FieldIdentifiers() look like on your data?

Will push f'"{b0_id}"' for now, though.

[bpinsard]

layout.get_B0FieldIdentifiers() will return string and tuples

In [10]: layout.get_B0FieldIdentifiers()
Out[10]: 
['sub_emotion_ses_002_task_emotion_run_01_part_mag_bold',
 'sub_emotion_ses_001_task_emotion_run_02',
 ('sub_emotion_ses_002_task_emotion_run_01_part_mag_bold',
  'sub_emotion_ses_002_task_emotion_run_02_part_mag_bold',
  'sub_emotion_ses_002_task_emotion_run_03_part_mag_bold'),
 'sub_emotion_ses_001_task_emotion_run_03_part_mag_bold',
 'sub_emotion_ses_002_task_emotion_run_04',
 'sub_emotion_ses_002_task_emotion_run_02_part_mag_bold',
 'sub_emotion_ses_002_task_emotion_run_03_part_mag_bold',
 'sub_emotion_ses_001_task_emotion_run_01_part_mag_bold',
 'sub_emotion_ses_001_task_emotion_run_04']

But the regexp matching is likely run on the json serialized string in pybids if I remember well (digged into code and sqlite database a while ago).

[effigies]

Okay. This should be working. @bpinsard Would you mind giving it one more try while we're waiting on the CI?

[bpinsard]

That works! 🎉

In [7]: sdcflows.utils.wrangler.find_estimators(layout=layout, subject='emotion')
Out[7]: 
[FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_001_task_emotion_run_02'),
 FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_001_task_emotion_run_01_part_mag_bold'),
 FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_001_task_emotion_run_04'),
 FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_001_task_emotion_run_03_part_mag_bold'),
 FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_002_task_emotion_run_04'),
 FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_002_task_emotion_run_03_part_mag_bold'),
 FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_002_task_emotion_run_01_part_mag_bold'),
 FieldmapEstimation(sources=<2 files>, method=<EstimatorType.PEPOLAR: 2>, bids_id='sub_emotion_ses_002_task_emotion_run_02_part_mag_bold')]