Add logic for EXT/EN to DDG and MCS for flOMNI #136

Merged
appel_c merged 12 commits from feat/add_flomni_ext_en into main 2026-02-16 10:41:35 +01:00
Owner

PR to extend the logic on the DDG and the MCS card for operation with flOMNI. THe implementation now supports flOMNI fly scans, for which the mcs card is setup in a different fashion. We also configure the DDG differently in that scenario. In addition, we added the logic to the two devices to be able to cope with EXT/EN signals configured on the DDG. This is a first working version, but should be crosschecked for other built-in fly scans to make sure that they still work as expected.

PR to extend the logic on the DDG and the MCS card for operation with flOMNI. THe implementation now supports flOMNI fly scans, for which the mcs card is setup in a different fashion. We also configure the DDG differently in that scenario. In addition, we added the logic to the two devices to be able to cope with EXT/EN signals configured on the DDG. This is a first working version, but should be crosschecked for other built-in fly scans to make sure that they still work as expected.
appel_c added 1 commit 2026-02-02 10:34:22 +01:00
feat: add logic for ext/en in ddg, mcs and flomni
Some checks failed
CI for csaxs_bec / test (push) Failing after 1m24s
CI for csaxs_bec / test (pull_request) Failing after 1m33s
ed8d012632
appel_c added 1 commit 2026-02-09 08:29:13 +01:00
fix(fast-shutter): Fix cSAXS fast shutter device
Some checks failed
CI for csaxs_bec / test (push) Failing after 1m30s
CI for csaxs_bec / test (pull_request) Failing after 1m30s
6fad4f2034
appel_c added 1 commit 2026-02-09 08:39:23 +01:00
fix(configs): add connectionTimeout=20s defaults to devices with SocketController
Some checks failed
CI for csaxs_bec / test (push) Failing after 1m28s
CI for csaxs_bec / test (pull_request) Failing after 1m28s
c3aa882b1d
appel_c added 2 commits 2026-02-09 14:11:04 +01:00
refactor(ddg): Add fsh signal to ddg, improve trigger logic.
Some checks failed
CI for csaxs_bec / test (push) Failing after 1m26s
CI for csaxs_bec / test (pull_request) Failing after 1m27s
32b4c39659
bec_bl_push-gitea added 1 commit 2026-02-10 10:59:32 +01:00
fixes at beamline
Some checks failed
CI for csaxs_bec / test (push) Failing after 3m23s
CI for csaxs_bec / test (pull_request) Failing after 3m25s
2814add2de
appel_c added 2 commits 2026-02-11 08:53:06 +01:00
fix(fast-shutter): Add close shutter on 'stop' call.
Some checks failed
CI for csaxs_bec / test (push) Failing after 1m25s
CI for csaxs_bec / test (pull_request) Failing after 1m26s
8195c12a35
appel_c added 1 commit 2026-02-11 09:45:46 +01:00
fix(ddg1): revert to shutter signal as mcs status signal is too slow
Some checks failed
CI for csaxs_bec / test (push) Failing after 1m27s
CI for csaxs_bec / test (pull_request) Failing after 1m31s
f8d2af4c5b
appel_c added 1 commit 2026-02-11 11:22:14 +01:00
fix(ddg): fix logic to resolve trigger on ddg1.
Some checks failed
CI for csaxs_bec / test (pull_request) Failing after 1m26s
CI for csaxs_bec / test (push) Failing after 1m28s
67ef20cfc8
appel_c added 1 commit 2026-02-11 11:50:25 +01:00
tests: fix tests for ddg1
All checks were successful
CI for csaxs_bec / test (push) Successful in 1m32s
CI for csaxs_bec / test (pull_request) Successful in 1m31s
75cc672f08
appel_c requested review from holler 2026-02-11 11:53:50 +01:00
appel_c requested review from wakonig_k 2026-02-11 11:53:50 +01:00
holler approved these changes 2026-02-11 13:11:45 +01:00
holler left a comment
Member

Looks great to me. One thing I am currently wondering is the DDG line where we removed the shutter close time.
d = a + exp_time * burst_count + 1ms (to allow the shutter to close)
Removing the 1 ms makes sense because the shutter shall start closing immediately after the exposure ends.
Having some additional delay on another channel to account for the close time could be used to block the delay generator for the full shutter close time of 2 ms. Then the entire setup would be in a clean state for opening the shutter again.
With the new fast shutter system, I actually execute the full close movement before starting the open movement. If the trigger signal for opening comes to early, the shutter will still open, but then it will not take 2 ms but the full close open cycle of 2+2 ms.

Looks great to me. One thing I am currently wondering is the DDG line where we removed the shutter close time. d = a + exp_time * burst_count + 1ms (to allow the shutter to close) Removing the 1 ms makes sense because the shutter shall start closing immediately after the exposure ends. Having some additional delay on another channel to account for the close time could be used to block the delay generator for the full shutter close time of 2 ms. Then the entire setup would be in a clean state for opening the shutter again. With the new fast shutter system, I actually execute the full close movement before starting the open movement. If the trigger signal for opening comes to early, the shutter will still open, but then it will not take 2 ms but the full close open cycle of 2+2 ms.
bec_bl_push-gitea added 1 commit 2026-02-16 10:18:57 +01:00
refactor: add gh signal for ddg1 with TTL for full acquisition
All checks were successful
CI for csaxs_bec / test (pull_request) Successful in 1m31s
CI for csaxs_bec / test (push) Successful in 1m33s
7a2c6629f7
appel_c merged commit 7a2c6629f7 into main 2026-02-16 10:41:35 +01:00
Sign in to join this conversation.
No Reviewers
No Label
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#136