Skip to content

Issue 671 #1001

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

Merged
David-Baddeley merged 1 commit into from
Apr 12, 2021
Merged

Issue 671 #1001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions PYME/Acquire/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ def __init__(self, taskList, startFrame, dwellTime, metadataEntries=[], prefligh
"""

# add a check to ensure that dwell times are sensible
preflightList.append(C('(self.dwellTime*scope.cam.GetIntegTime() > .1) or not scope.cam.contMode',
pf = list(preflightList)
pf.append(C('(self.dwellTime*scope.cam.GetIntegTime() > .1) or not scope.cam.contMode',
'Z step dwell time too short - increase either dwell time or integration time, or set camera mode to single shot / software triggered'))

TaskListProtocol.__init__(self, taskList, metadataEntries, preflightList,
filename)
TaskListProtocol.__init__(self, taskList, metadataEntries, preflightList=pf,filename=filename)

self.startFrame = startFrame
self.dwellTime = dwellTime
Expand Down