Merge remote-tracking branch 'upstream/maint/2.4.x'

Author: effigies

CHANGES.rst

@@ -1,3 +1,12 @@
+2.4.2 (April 20, 2023)
+======================
+Bug-fix release in the 2.4.x series.
+
+Same fixes as 2.4.1, but this time for phase-difference and direct fieldmaps
+we missed last time.
+
+* FIX: Capture and report partial fieldmaps (#351)
+
 2.4.1 (March 20, 2023)
 ======================
 Bug-fix release in the 2.4.x series.

sdcflows/utils/wrangler.py

@@ -343,11 +343,17 @@ def find_estimators(
                 **{'suffix': ["fieldmap", "phasediff", "phase1"], 'session': sessions}
             }
         ):
-            e = fm.FieldmapEstimation(
-                fm.FieldmapFile(fmap.path, metadata=fmap.get_metadata())
-            )
-            _log_debug_estimation(logger, e, layout.root)
-            estimators.append(e)
+            try:
+                e = fm.FieldmapEstimation(
+                    fm.FieldmapFile(fmap.path, metadata=fmap.get_metadata())
+                )
+            except (ValueError, TypeError) as err:
+                _log_debug_estimator_fail(
+                    logger, "unnamed fieldmap", [fmap], layout.root, str(err)
+                )
+            else:
+                _log_debug_estimation(logger, e, layout.root)
+                estimators.append(e)
 
         # A bunch of heuristics to select EPI fieldmaps
         acqs = (