Surface detection and faster z-stacks #188
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
refactored the ImageSequencerThread along the way to make it possible to use it without the Ctrl
this way, we can more easily wait for results
- restore the driver-supported frame acqisition to its previous glory - fix Future.wrap to not clobber "self" - muck about with at fair few other things that got in the way
Stage.positionUpdatesPerSecond implemented for Sensapex and MockStage only, so far
- put Number in typing - minor cleanups in all files touched
Conflicts: acq4/devices/PatchPipette/statemanager.py - fixing the same problem
campagnola
reviewed
Jan 25, 2024
acq4/devices/Camera/Camera.py
Outdated
| def acquireFrames(self, n=1, stack=True): | ||
| """Immediately acquire and return a specific number of frames. | ||
| @contextmanager | ||
| def run(self, ensureFreshFrames=False): |
campagnola
reviewed
Jan 25, 2024
acq4/devices/Camera/Camera.py
Outdated
| def getEstimatedFrameRate(self, _future: Future): | ||
| """Return the estimated frame rate of the camera. | ||
| """ | ||
| if not self.isRunning(): |
There was a problem hiding this comment.
Shouldn't be necessary? Just:
with self.ensureRunning():
...
campagnola
reviewed
Jan 25, 2024
acq4/devices/Pipette/pipette.py
Outdated
| @@ -434,9 +434,9 @@ def _solveGlobalStagePosition(self, pos): | |||
| spos = np.asarray(stage.globalPosition()) | |||
| return spos + dif | |||
|
|
|||
| def _moveToLocal(self, pos, speed, linear=False): | |||
| def moveToLocal(self, pos, speed, linear=False): | |||
There was a problem hiding this comment.
consider reverting this
campagnola
reviewed
Jan 25, 2024
acq4/devices/Scanner/DeviceGui.py
Outdated
| @@ -365,7 +365,8 @@ def sample(self): | |||
| xRange = (self.ui.xMinSpin.value(), self.ui.xMaxSpin.value()) | |||
| yRange = (self.ui.yMinSpin.value(), self.ui.yMaxSpin.value()) | |||
|
|
|||
| background = camera.acquireFrames(1) | |||
| with camera.run(ensureFreshFrames=True): | |||
| background = camera.acquireFrames(1).getResult()[0] | |||
There was a problem hiding this comment.
Can this be camera.acquireFrames(1, ensureFresh=True)?
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.
closes #166
closes #171