Skip to content

Commit 1cb6143

Browse files
committed
PVCamera: default again to TriggerMode.ONCE (fixup 35173b0)
When we subclassed from TriggerTargetMixin we messed up the correct mapping of trigger modes. The PVCAM trigger mode strobed is not the same as Microscope's strobed mode and is actually similar to our once. Fix the mapping which effectively fixes the default.
1 parent 10ac358 commit 1cb6143

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

NEWS.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ Version 0.7.0 (upcoming)
1717

1818
* Toptica iChrome MLE
1919

20+
* Device specific changes:
21+
22+
* `PVCamera`: in version 0.6.0 the default PVCAM trigger mode was
23+
accidentally changed from "strobed" to "trig. first". This has
24+
now been reversed.
25+
2026
* The device server logging was broken in version 0.6.0 for Windows
2127
and macOS (systems not using fork for multiprocessing). This
2228
version fixes that issue.

microscope/cameras/pvcam.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,13 +1172,19 @@ def __repr__(self):
11721172

11731173
PV_MODE_TO_TRIGGER = {
11741174
TRIG_SOFT: (microscope.TriggerType.SOFTWARE, microscope.TriggerMode.ONCE),
1175+
# Microscope and PVCam use mode strobe for very different things,
1176+
# check with the PVCam manual carefully. PVCam's STROBED_MODE
1177+
# means that one external trigger starts *each* exposure in a
1178+
# sequence, which maps to Microscope trigger mode ONCE. PVCam's
1179+
# TRIGGER_FIRST_MODE means that one external trigger signals the
1180+
# start of a sequence.
11751181
TRIG_FIRST: (
11761182
microscope.TriggerType.RISING_EDGE,
1177-
microscope.TriggerMode.ONCE,
1183+
microscope.TriggerMode.START,
11781184
),
11791185
TRIG_STROBED: (
11801186
microscope.TriggerType.RISING_EDGE,
1181-
microscope.TriggerMode.STROBE,
1187+
microscope.TriggerMode.ONCE,
11821188
),
11831189
TRIG_BULB: (
11841190
microscope.TriggerType.RISING_EDGE,

0 commit comments

Comments
 (0)