Skip to content
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

PSF measurement, simulation, and deconvolution #130

Merged
merged 61 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
ef8872e
Create measure_psf.py
ieivanov Jan 25, 2024
6b944e4
partial psf analysis report
ieivanov Jan 27, 2024
62b7567
update psf analysis report
ieivanov Jan 29, 2024
9be0c1a
refactor psf analysis
ieivanov Jan 30, 2024
e445374
refactor psf analysis report
ieivanov Jan 31, 2024
2f271b0
add report on deskewed data
ieivanov Feb 3, 2024
0323047
initial psf simulations
talonchandler Feb 3, 2024
5f274cf
GPU peak detection with torch (#129)
ziw-liu Feb 8, 2024
05673e7
ignore psf analysis warnings
ieivanov Feb 8, 2024
dcb977a
update script with acquisition settings
ieivanov Feb 14, 2024
a212579
better paths formatting
ieivanov Feb 14, 2024
77149b3
better paths formatting
ieivanov Feb 14, 2024
8c36deb
update measurement script
ieivanov Feb 16, 2024
822428c
add html report title
ieivanov Feb 28, 2024
52c6f3b
update psf analysis scripts
ieivanov Mar 20, 2024
9ec7cb8
Merge branch 'measure_psf' into simulate-psf
talonchandler May 5, 2024
4a8161c
typo
talonchandler May 6, 2024
5ebe58c
update dependencies
talonchandler May 6, 2024
5fe793f
larger PSF area
talonchandler May 6, 2024
b8623fd
main fitting script
talonchandler May 6, 2024
97c7968
simple_psf iteration
talonchandler May 7, 2024
15d2f59
deconvolution prototype
talonchandler May 7, 2024
fb4cc72
settings
talonchandler May 7, 2024
ea6acdb
cutsom patch size
talonchandler May 7, 2024
2b84fb9
deconvolve CLI
talonchandler May 7, 2024
74024e0
psf-from-beads CLI
talonchandler May 7, 2024
8a0377f
cli boilerplate
talonchandler May 7, 2024
ec20b03
update psf measurement scripts
ieivanov May 15, 2024
be0c637
first-pass characterize
talonchandler May 17, 2024
6af9092
fix css issue
talonchandler May 17, 2024
1f2ca03
Merge branch 'main' into measure_psf
ieivanov May 21, 2024
892337f
napari-psf-analysis is breaking fresh installations
talonchandler May 29, 2024
9cf4992
auto-open webbrowser
talonchandler May 29, 2024
b85b9a8
handle negative with ints and clips
talonchandler May 29, 2024
af1d36a
pass in axis labels
talonchandler May 29, 2024
952d222
average beads over multiple FOVs
talonchandler May 30, 2024
1e42da7
adding WIP changes, used for most recent deconvolutions
talonchandler Jul 2, 2024
a0491f0
Merge branch 'measure_psf' into simulate-psf
ieivanov Jul 2, 2024
a87f41b
style
ieivanov Jul 31, 2024
964d731
Merge branch 'main' into simulate-psf
ieivanov Jul 31, 2024
b599c6b
add napari-psf-analysis dependency
ieivanov Jul 31, 2024
638245a
refactor characterize cli
ieivanov Aug 1, 2024
ebde1cd
more characterize refactor
ieivanov Aug 1, 2024
7b29171
use characterize_peaks in measure_psf
ieivanov Aug 1, 2024
5e3c751
clean up measure_psf analysis portion
ieivanov Aug 1, 2024
2c2bf89
bugfix
ieivanov Aug 1, 2024
7058227
delete unused scripts
talonchandler Aug 5, 2024
01e8ddb
remove unused _deskew_matrix
talonchandler Aug 5, 2024
8ccfe65
test for incorrectlyt shifted deskew
talonchandler Aug 5, 2024
40ec608
correct typo in test
talonchandler Aug 5, 2024
b2010d7
fix deskew regression
talonchandler Aug 6, 2024
df51f2c
style
talonchandler Aug 6, 2024
3b27fde
extend O3 scan range
ieivanov Aug 7, 2024
6126d2c
Update measure_psf.py
ieivanov Aug 7, 2024
7a7da95
fix overflow bug
ieivanov Aug 7, 2024
b99eafd
Update measure_psf.py
ieivanov Aug 7, 2024
9a7a4ef
style
ieivanov Aug 7, 2024
9e7533e
cleanup
ieivanov Aug 7, 2024
d4d35ac
rename psf functions
ieivanov Aug 8, 2024
2be6600
Update mantis/cli/characterize_psf.py
ieivanov Aug 13, 2024
cd0a8af
Update mantis/cli/estimate_psf.py
ieivanov Aug 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ exclude =
ignore,
legacy,
examples,
scripts
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: ^(docs|notebooks|ignore|/tests/artifacts|examples)/
exclude: ^(docs|notebooks|ignore|/tests/artifacts|examples|scripts)/
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ uninstall:

.PHONY: check-format
check-format:
black --check -S -t py39 .
black --check -S -t py310 .
isort --check .

.PHONY: format
format:
black -S -t py39 .
black -S -t py310 .
isort .

.PHONY: lint
Expand Down
4 changes: 2 additions & 2 deletions mantis/acquisition/acq_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -807,8 +807,8 @@ def refocus_ls_path(self):
# Define relative travel limits, in steps
o3_z_stage = self.ls_acq.o3_stage
target_z_position = o3_z_stage.true_position + o3_z_range
max_z_position = 500 # O3 is allowed to travel ~10 um towards O2
min_z_position = -1000 # O3 is allowed to travel ~20 um away from O2
max_z_position = 750 # O3 is allowed to travel ~15 um towards O2
min_z_position = -1500 # O3 is allowed to travel ~30 um away from O2
if np.any(target_z_position > max_z_position) or np.any(
target_z_position < min_z_position
):
Expand Down
Loading
Loading