8000 FIX: Handle correct contrasts and intercepts being passed from PyBIDS by effigies · Pull Request #387 · poldracklab/fitlins · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

FIX: Handle correct contrasts and intercepts being passed from PyBIDS #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 8, 2022

Conversation

effigies
Copy link
Collaborator

No description provided.

@codecov-commenter
Copy link
codecov-commenter commented Sep 12, 2022

Codecov Report

Base: 64.45% // Head: 64.18% // Decreases project coverage by -0.26% ⚠️

Coverage data is based on head (7ee441f) compared to base (d0c0dee).
Patch coverage: 44.44% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #387      +/-   ##
==========================================
- Coverage   64.45%   64.18%   -0.27%     
==========================================
  Files          23       23              
  Lines        1820     1829       +9     
  Branches      345      298      -47     
==========================================
+ Hits         1173     1174       +1     
- Misses        565      570       +5     
- Partials       82       85       +3     
Impacted Files Coverage Δ
fitlins/cli/run.py 0.00% <0.00%> (ø)
fitlins/conftest.py 100.00% <ø> (ø)
fitlins/interfaces/visualizations.py 57.59% <ø> (-1.27%) ⬇️
fitlins/interfaces/afni.py 86.13% <50.00%> (-0.58%) ⬇️
fitlins/interfaces/nistats.py 71.78% <75.00%> (+0.05%) ⬆️

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
Copy link
Collaborator Author

@adelavega @jmumford @jdkent Looks like 0.15.3 runs, but now we're getting different values in our results. Suggests we're now using different design matrices, as nilearn and AFNI aren't changing, and neither are the input masks.

Do any of you remember changes that we would have expected to improve design matrix construction?

@jmumford
Copy link

Could it be a change in the smoothing or highpass filtering options?

@effigies
Copy link
Collaborator Author

Did we change those in PyBIDS? The only difference between this and the failing tests on the dev branch is that this is using pybids 0.15.1 and not 0.15.3.

@adelavega
Copy link
Collaborator

Hmm. I guess I'd like to see a diff between the two DMs.

The only thing I can think of is that we were not modeling an intercept is some situations, and possibly we are adding an intercept where we shouldn't be?

Unless there is a major bug (i.e. dropped columns), not sure where else the DMs would differ

@effigies
Copy link
Collaborator Author

@adelavega Yes, the difference is that now there's an explicit intercept column. This didn't get overridden by nistats, which produced a constant column instead.

@effigies
Copy link
Collaborator Author

FWIW I did write up my method for reproducing, since I wanted to get it set up on another system. https://github.com/poldracklab/fitlins/wiki/Testing-FitLins-regressions-on-example-data

@adelavega
Copy link
Collaborator

Awesome, so that should be a fitlins issue then, correct?

@effigies effigies force-pushed the dx/pybids branch 5 times, most recently from 53e2c57 to 2ed5e36 Compare September 19, 2022 20:24
@effigies effigies force-pushed the dx/pybids branch 2 times, most recently from a403640 to 6bb846f Compare October 7, 2022 20:26
@effigies
Copy link
Collaborator Author
effigies commented Oct 7, 2022

Well, it fixes the regression test, so that's good. Might have revealed other bugs in FitLins, though...

@effigies effigies changed the title DX: Will reverting to pybids 0.15.1 fix bugs? FIX: Handle correct contrasts and intercepts being passed from PyBIDS Oct 8, 2022
@effigies effigies merged commit 63fcc78 into poldracklab:dev Oct 8, 2022
@effigies effigies deleted the dx/pybids branch October 8, 2022 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
0