Merge pull request #141 from nipreps/fix/pet-model-did-have-a-mask

FIX: Roll back removal of brainmask in #139

Author: oesteban

src/nifreeze/model/pet.py

@@ -87,9 +87,10 @@ def _fit(self, n_jobs=None, **kwargs):
         x = (np.array(timepoints, dtype="float32") / self._xlim) * self._n_ctrl
 
         data = self._dataset.dataobj
+        brainmask = self._dataset.brainmask
 
         # Convert data into V (voxels) x T (timepoints)
-        data = data.reshape((-1, data.shape[-1])) if self._mask is None else data[self._mask]
+        data = data.reshape((-1, data.shape[-1])) if brainmask is None else data[brainmask]
 
         # A.shape = (T, K - 4); T= n. timepoints, K= n. knots (with padding)
         A = BSpline.design_matrix(x, self._t, k=self._order)
@@ -121,5 +122,12 @@ def fit_predict(self, index: int | None = None, **kwargs):
         # self._coeff is V (num. voxels) x K - 4
         predicted = np.squeeze(A @ self._coeff.T)
 
+        brainmask = self._dataset.brainmask
         datashape = self._dataset.dataobj.shape[:3]
-        return predicted.reshape(datashape)
+
+        if brainmask is None:
+            return predicted.reshape(datashape)
+
+        retval = np.zeros_like(self._dataset.dataobj[..., 0])
+        retval[brainmask] = predicted
+        return retval