Skip to content

add per-frame shift calculation for tiling-based multiview lateral registration #934

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.

Sign up for GitHub

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

Open
barentine wants to merge 10 commits into
base: master
Choose a base branch
from
Open

add per-frame shift calculation for tiling-based multiview lateral registration #934

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f239341
add per-frame shift calculation for multiview
barentine Mar 7, 2021
676fadf
whoops, parameter doc
barentine Mar 7, 2021
14960a9
Merge branch 'master' of https://github.com/python-microscopy/python-…
barentine Mar 8, 2021
281bec9
use findClumpsN with nFrames 1 to get same frame only
barentine Mar 8, 2021
799bd6d
use findclumpsN with nFrames 1 to get clumping only on same frame
barentine Mar 8, 2021
8b675ec
add rule chain for tiled bead shiftmap generation
barentine Mar 8, 2021
4828bbb
synt fix
barentine Mar 8, 2021
d3bc6ac
Merge branch 'master' of https://github.com/python-microscopy/python-…
barentine Mar 16, 2021
79e2566
Merge branch 'master' of https://github.com/python-microscopy/python-…
barentine Mar 22, 2021
a8c2e1a
use findclumps refactor
barentine Mar 22, 2021
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
Prev Previous commit
Next Next commit
use findclumpsN with nFrames 1 to get clumping only on same frame
  • Loading branch information
@barentine
barentine committed Mar 8, 2021
commit 799bd6d0daefb54166e3c43ae29b49095a5e6883
5 changes: 3 additions & 2 deletions PYME/Analysis/points/multiview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,9 @@ def raw_shifts_by_frame(x0, y0, t0, x0err, y0err, x1, y1, t1, x1err, y1err,
if np.isscalar(clump_distance):
clump_distance = clump_distance*np.ones_like(x)

# FIXME - findClumps should really work with nFrame gap 0, right?
assigned = deClump.findClumps(t.astype(np.int32), x, y, clump_distance, 1)
# TODO - update this call when we rework nFrames. 1 currently means same
# frame only, which is what we want here.
assigned = deClump.findClumpsN(t.astype(np.int32), x, y, clump_distance, 1)
ids, count = np.unique(assigned, return_counts=True)

# reorder by id (is this already done actually?)
Expand Down