Skip to content

Commit

Permalink
Merge pull request #488 from BCDA-APS/485-trigger_mode-value
Browse files Browse the repository at this point in the history
use first camera trigger mode when priming AD plugin
  • Loading branch information
prjemian authored Jan 19, 2021
2 parents d3f7973 + b045c20 commit be88065
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Change History

:1.4.1: release expected by 2021-01-22

* `#488 <https://github.com/BCDA-APS/apstools/pull/488>`_
use first trigger_mode when priming AD plugin

* `#487 <https://github.com/BCDA-APS/apstools/pull/487>`_
ensure spec2ophyd code is packaged

Expand Down
7 changes: 5 additions & 2 deletions apstools/devices.py
Original file line number Diff line number Diff line change
Expand Up @@ -1915,8 +1915,11 @@ def AD_prime_plugin2(plugin):
[
(plugin.enable, 1),
(plugin.parent.cam.array_callbacks, 1), # set by number
(plugin.parent.cam.image_mode, "Single"),
(plugin.parent.cam.trigger_mode, "Internal"),
(plugin.parent.cam.image_mode, 0), # Single, set by number
# Trigger mode names are not identical for every camera.
# Assume here that the first item in the list is
# the best default choice to prime the plugin.
(plugin.parent.cam.trigger_mode, 0), # set by number
# just in case the acquisition time is set very long...
(plugin.parent.cam.acquire_time, 1),
(plugin.parent.cam.acquire_period, 1),
Expand Down

0 comments on commit be88065

Please sign in to comment.