Skip to content

PSWF FPSWF Cleanup #515

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 7 commits into from
Nov 29, 2021
Merged

PSWF FPSWF Cleanup #515

merged 7 commits into from
Nov 29, 2021

Conversation

garrettwrong
Copy link
Collaborator

  • evaluate and evaluate_t should speak Image
  • FPSWF evaluate_t was not using a many NUFFT. It also had a lot of vestigial code I eviscerated.

@garrettwrong garrettwrong self-assigned this Nov 10, 2021
@codecov
Copy link

codecov bot commented Nov 10, 2021

Codecov Report

Merging #515 (78f1ef3) into develop (993df09) will increase coverage by 0.11%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #515      +/-   ##
===========================================
+ Coverage    87.15%   87.26%   +0.11%     
===========================================
  Files          106      106              
  Lines         7608     7674      +66     
===========================================
+ Hits          6631     6697      +66     
  Misses         977      977              
Impacted Files Coverage Δ
src/aspire/reconstruction/estimator.py 92.50% <ø> (-0.10%) ⬇️
src/aspire/source/image.py 95.60% <ø> (ø)
src/aspire/basis/fpswf_2d.py 98.70% <100.00%> (+0.97%) ⬆️
src/aspire/basis/pswf_2d.py 98.61% <100.00%> (+0.62%) ⬆️
src/aspire/volume/__init__.py 93.58% <0.00%> (+2.16%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 993df09...78f1ef3. Read the comment docs.

Copy link
Collaborator

@j-c-c j-c-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple small things/questions.

@garrettwrong garrettwrong requested a review from j-c-c November 15, 2021 20:52
Copy link
Collaborator

@j-c-c j-c-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks for the clarification on my questions/comments.

@garrettwrong
Copy link
Collaborator Author

There are still a lot of opportunities for improvement is the (F)PSWF codes, but I think this addresses some immediate concerns.

@garrettwrong garrettwrong marked this pull request as ready for review November 24, 2021 14:44
@garrettwrong garrettwrong requested a review from janden as a code owner November 24, 2021 14:44
Copy link
Collaborator

@janden janden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More of a mess than I remembered. This is gonna be fun…

@garrettwrong garrettwrong requested a review from janden November 29, 2021 13:27
janden
janden previously approved these changes Nov 29, 2021
@garrettwrong
Copy link
Collaborator Author

Looks like the linter must have upgraded recently. Caught two misplaced docstrings. Sorry for the extra noise, didn't trip check locally.

@garrettwrong garrettwrong requested a review from janden November 29, 2021 13:37
Copy link
Collaborator

@janden janden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries.

@garrettwrong garrettwrong merged commit 27ea010 into develop Nov 29, 2021
@garrettwrong garrettwrong deleted the aspire_pswf_patches branch November 29, 2021 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants