RF: Simplify high-pass filtering in algorithms.confounds #3651
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Legendre and cosine detrending are implemented almost identically, although with several minor variations. Here I separate regressor creation from detrending to unify the implementations. This now uses `np.linalg.pinv(X)` to estimate the betas in both cases, rather than using `np.linalg.lstsq` in the cosine filter. lstsq uses SVD and can thus fail to converge in rare cases. Under no circumstances should (X.T @ X) be singular, so the pseudoinverse is unique and precisely what we want.
effigies
force-pushed
the
rf/simplify_detrend
branch
from
4dde564 to
4717e23
Compare
|
@jhlegarreta I wonder if I could bug you for a review. I suspect this would be a quick one for you, but let me know if it's not. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3651 +/- ##
==========================================
- Coverage 70.83% 70.47% -0.36%
==========================================
Files 1276 1276
Lines 59314 59305 -9
Branches 9824 9822 -2
==========================================
- Hits 42013 41797 -216
- Misses 16125 16353 +228
+ Partials 1176 1155 -21 ☔ View full report in Codecov by Sentry. |
For Legendre regressors, the ith column is the ith-order polynomial, so the constant column is 0. For the cosine regressors, a constant column was appended to the end, in contradiction of the docstring. This brings both into alignment so columns are sorted from lowest to highest frequency and aligns the DCT behavior with its docstring.
jhlegarreta
approved these changes
May 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Legendre and cosine detrending are implemented almost identically, although with several minor variations. Here I separate regressor creation from detrending to unify the implementations.
This now uses
np.linalg.pinv(X)to estimate the betas in both cases, rather than usingnp.linalg.lstsqin the cosine filter. lstsq uses SVD and can thus fail to converge in rare cases. Under no circumstances should (X.T @ X) be singular, so the pseudoinverse is unique and precisely what we want.Issue raised in https://neurostars.org/t/fmriprep-numpy-linalg-linalg-linalgerror-svd-did-not-converge/29525.