bec/csaxs_bec
0
0
Fork 2
Code Issues 17 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Feature/mcs2 #287

Merged
holler merged 2 commits from feature/mcs2 into main 2026-07-30 13:11:40 +02:00
Conversation 0 Commits 2 Files Changed 8
+1538 -61
holler commented 2026-07-30 12:05:58 +02:00
Member
Copy Link
Copy Source
No description provided.
holler added 2 commits 2026-07-30 12:05:58 +02:00
feat: add SmarAct MCS2 device driver
CI for csaxs_bec / test (push) Successful in 1m54s
Details
a65ab6cbdd 
Adds a new driver for the SmarAct MCS2 controller (MCS2-C-0008, 9 channels),
parallel to the existing MCS1 (SCU) implementation. Uses the MCS2's raw
ASCII/SCPI interface over TCP (port 55551), which differs from MCS1 in units
(picometers), message termination (\r\n), and error handling (a polled error
queue instead of inline echoes).

- csaxs_bec/devices/mcs2: Mcs2Controller/Mcs2Motor and errors
- csaxs_bec/devices/sim/sim_mcs2.py: simulated backend for testing
- tests/tests_devices/test_mcs2.py: unit tests + sim end-to-end test
- device_configs: commented example stage in bl_optics_hutch.yaml, and a
  standalone single-axis mcs2_config_test.yaml

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
feat: migrate optics-hutch SmarAct stages to MCS2, align cross-controller compat
CI for csaxs_bec / test (pull_request) Successful in 3m48s
Details
Read the Docs Deploy Trigger / trigger-rtd-webhook (push) Successful in 2s
Details
CI for csaxs_bec / test (push) Successful in 2m7s
Details
771ee01a57 
- Switch xbpm2x/xbpm2y/polrot/poly/scinx in bl_optics_hutch.yaml from the
  legacy MCS1 controller to the new MCS2 controller (mcs2-00029056.psi.ch),
  re-enabling polrot/poly with corrected axis assignments from the updated
  wiring table to avoid colliding with xbpm2x/xbpm2y on the same channel.
- Remove mcs2_config_test.yaml now that MCS2 is live on real stages.
- Give Mcs2Controller.find_reference_mark an unused hold_time parameter so
  shared call sites (smaract.py, flomni.py, omny.py, lamni_optics_mixin.py)
  that pass MCS1-style (axis, direction, holdTime, autoZero) args work
  unchanged against MCS2 devices too.
- Rename smaract_show_all/mcs2_show_all to a common show_all on both
  controllers, and have each list describe() from every registered MCS1 and
  MCS2 controller instead of only its own type.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UfjGm8MQrhCV8VaC9Tf4qx
holler merged commit 771ee01a57 into main 2026-07-30 13:11:40 +02:00
holler deleted branch feature/mcs2 2026-07-30 13:11:40 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
issue::not confirmed
Used if an issue has not yet been confirmed by a developer
 issue::not reproducible
Used if an issue is not reproducible
 issue::reproducible
Used if a developer was able to reproduce the issue
 priority::critical
Should be done as soon as possible
 priority::needed
An important update to the code base
 priority::nice to have
Not really needed but a good improvement
 scope::backend
An issue regarding the backend services
 scope::frontend
An issue regarding the user-facing services
 stage::in development
This issue is currently being worked on
 stage::on hold
Something is blocking the development
 stage::pre_release
For issues that have been merged into a pre-release branch and are waiting for their release.
stage::ready for review
For issues that have been resolved and are ready for review
 stage::selected for development
This issue has been selected for development but has not been scheduled yet
 stage::weekly backlog
This issue has been selected for development for the next development cycle
 type::bug
It's a bug!
 type::discussion
A discussion is wanted/needed
 type::doc
Improvements to the documentation
 type::feature
A new feature
 type::improvement
Neither a feature nor a bug but an improvement to the code base
 type::test
Missing tests or improvements to the test suite
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
acerbo_a (acerbo_a) bec-gitea celcer_t (celcer_t) debenjak_l (debenjak_l) diaz (diaz) divall_e (divall_e) guizar_m (guizar_m) haghta_s (haghta_s) holler (holler) lombosi_c (lombosi_c) menzel (menzel) perl_d (perl_d) usov_i (usov_i) wakonig_k (wakonig_k) wang_x1 (wang_x1) wyzula_j (wyzula_j) zamofing_t (zamofing_t)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#287