-
Notifications
You must be signed in to change notification settings - Fork 4
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
alg-dev
branch merge to main
#121
Merged
Merged
Conversation
This file contains 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
* Initial fwd and inv w/ tests * Add A-matrix and mueller-from-projection functions * Debug AR_mueller * Add convenience functions * Make 4d transposes nd with moveaxis * Add documentation * Improve module docstring * Change `KeyError` to `ValueError` * Improved docs * Remove unnecessary test * Removed "float" from docs * Revert "Removed "float" from docs" This reverts commit d9dd7e3. * Use `assert_almost_equal` * fixed couple of typos * `A` -> `I2S` & new `S2I` * comprehensive renaming * copy `s0` <-> `tra` * `np.array(s0)` so that it always has `.copy()` * Set default to "inverse" --------- Co-authored-by: Shalin Mehta <[email protected]>
* black formatting * move 2D-to-3D phase recon to phase.py * convert gen_HZ_stack to ZYX * keep existing gpu handling * add 3D_to_3D phase OTF * improve naming consistency in phase_2D_to_3D_OTF * Add kwargs to recon params * change axes for 2D recon preparation * simplify 2D_to_3D recon with kwargs * handle padding and simplify OTFs * add 3D_to_3D recon with kwargs * temporarily remove docs for rewriting * first dependence on torch * move gen_Hz_stack to torch * convert 2d wotf to torch * move gen_Greens_function_z to torch * move important utils to torch * phase3Dto3D complete overhaul * refactor * optics.py to torch * high-level tests * splitt phase.py into models * clean up 3D script * cleaning and notes * phase2Dto3D placeholders * clean tests * use napari in tests * better skipping * reduce dependencies * update tests * maintiain PTI simulation's compatibility revised optics functions * drop pdb * Preserve birefringence recon * fix transpose bug * transpose bug * phase2Dto3D.py example * support padding * empty model for planaraniso * improved names * broad renaming of phase2D_3D and phase3D_3D * updated 2D phase and absorption recon Return the 2D absorption along with phase. Viewing OTFs in napari is very nice. I changed the axis order to be able to compare phase and absorption OTFs at focal plane. * display OTFs with Z-axis as a slider * changes to 2D phase/absorption simulation I suggest changing this example to be simulation and reconstruction of 2D specimens, thinner than the depth of field of the microscope. * rename models to <object-type>_<object-thickness>_<data_shape> * fix isotropic_thin_3d example, include absorption * 2D -> 2d, 3D -> 3d --------- Co-authored-by: Shalin Mehta <[email protected]>
* black formatting * move 2D-to-3D phase recon to phase.py * convert gen_HZ_stack to ZYX * keep existing gpu handling * add 3D_to_3D phase OTF * improve naming consistency in phase_2D_to_3D_OTF * Add kwargs to recon params * change axes for 2D recon preparation * simplify 2D_to_3D recon with kwargs * handle padding and simplify OTFs * add 3D_to_3D recon with kwargs * temporarily remove docs for rewriting * first dependence on torch * move gen_Hz_stack to torch * convert 2d wotf to torch * move gen_Greens_function_z to torch * move important utils to torch * phase3Dto3D complete overhaul * refactor * optics.py to torch * high-level tests * splitt phase.py into models * clean up 3D script * cleaning and notes * phase2Dto3D placeholders * clean tests * use napari in tests * better skipping * reduce dependencies * update tests * maintiain PTI simulation's compatibility revised optics functions * drop pdb * Preserve birefringence recon * fix transpose bug * transpose bug * phase2Dto3D.py example * support padding * empty model for planaraniso * improved names * broad renaming of phase2D_3D and phase3D_3D * Rename variables in `stokes.py`. * updated 2D phase and absorption recon Return the 2D absorption along with phase. Viewing OTFs in napari is very nice. I changed the axis order to be able to compare phase and absorption OTFs at focal plane. * display OTFs with Z-axis as a slider * changes to 2D phase/absorption simulation I suggest changing this example to be simulation and reconstruction of 2D specimens, thinner than the depth of field of the microscope. * convert stokes to torch * initial draft of planaraniso model * rename models to <object-type>_<object-thickness>_<data_shape> * fix isotropic_thin_3d example, include absorption * 2D -> 2d, 3D -> 3d * calculate background corrections with transfer function * rearrange examples folder * rearrange examples folder * rearrange `isotropic` and `phase` examples * add `inplane_anisotropic` model and example * fix inplane tests * fix maintenance scripts * remove deprecated * use `np.meshgrid` for consistency * minor bug * integration changes --------- Co-authored-by: Shalin Mehta <[email protected]>
* remove kwargs * fix estimated background bug
ziw-liu
previously approved these changes
Jun 8, 2023
I'm now planning to solve #122 before merging this. |
remove duplicate test
* `illumination_wavelength` -> `wavelength_illumination` * add option for axial flip of transfer function * test axial flip --------- Co-authored-by: Ziwen Liu <[email protected]>
`anisotropic_thin` -> `oriented_thick`
* typo * model outline * prototype transfer function * 3d phantom + visualize transfer function * refactor apply_transfer_function * typo * refactor padding (with gpt docs + tests) * complete example * test apply_inverse_transfer_function * TV reconstructions raise NotImplementedError * `pad_zyx` -> `pad_zyx_along_z` * Simplify `data += 10` * Update tests/test_util.py Co-authored-by: Ziwen Liu <[email protected]> --------- Co-authored-by: Ziwen Liu <[email protected]>
edyoshikun
reviewed
Jun 21, 2023
* add axial_flip to `isotropic_thin_3d` * `illumination` -> `emission` for fluorescence * simplify parameters for usage with recOrder * fix test
I think this is ready to merge now. The highest priority fluorescence reconstructions have now moved to torch (see #122), and I now have a working implementation on the |
ziw-liu
reviewed
Jul 11, 2023
ziw-liu
approved these changes
Jul 12, 2023
This was
linked to
issues
Jul 24, 2023
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.
The
alg-dev
branch has been the de-factomain
branch for the last ~2 months, so I think it's a good idea for us to merge.The major changes (discussed in their individual PRs to
alg-dev
) are:recOrder
)models
-based reconstructions with precalculation of transfer functionsexamples
folder