diff --git a/csaxs_bec/device_configs/smargon.yaml b/csaxs_bec/device_configs/smargon.yaml index 1a562bd9..a7c9bcb0 100644 --- a/csaxs_bec/device_configs/smargon.yaml +++ b/csaxs_bec/device_configs/smargon.yaml @@ -75,36 +75,35 @@ sgphi: onFailure: retry readoutPriority: baseline -# --- O-vector (SCS offset vector OX/OY/OZ, mm) ------------------------------------ -# Drivable like any SCS axis and recorded in the baseline. No soft limits by default -# (smargopolo enforces the real ones) -- add `limits: [low, high]` per experiment. sgox: - description: SmarGon OX (offset vector) + description: SmarGon OX deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor - deviceConfig: {scs_axis: OX, host: tt-smargopolo, port: 3000, tolerance: 0.001} + deviceConfig: {scs_axis: OX, host: tt-smargopolo, port: 3000, limits: [-2, 2], tolerance: 0.001} deviceTags: [goniometer, smargon] enabled: true onFailure: retry readoutPriority: baseline sgoy: - description: SmarGon OY (offset vector) + description: SmarGon OY deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor - deviceConfig: {scs_axis: OY, host: tt-smargopolo, port: 3000, tolerance: 0.001} + deviceConfig: {scs_axis: OY, host: tt-smargopolo, port: 3000, limits: [-2, 2], tolerance: 0.001} deviceTags: [goniometer, smargon] enabled: true onFailure: retry readoutPriority: baseline sgoz: - description: SmarGon OZ (offset vector) + description: SmarGon OZ deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor - deviceConfig: {scs_axis: OZ, host: tt-smargopolo, port: 3000, tolerance: 0.001} + deviceConfig: {scs_axis: OZ, host: tt-smargopolo, port: 3000, limits: [-2, 2], tolerance: 0.001} deviceTags: [goniometer, smargon] enabled: true onFailure: retry readoutPriority: baseline + + # --- Optional OMEGA rotation drive (only on builds that have it) ------------------- # sgomega: # description: SmarGon OMEGA (rotation drive) diff --git a/csaxs_bec/devices/smargon/README.md b/csaxs_bec/devices/smargon/README.md index a067bd75..0037b993 100644 --- a/csaxs_bec/devices/smargon/README.md +++ b/csaxs_bec/devices/smargon/README.md @@ -38,7 +38,7 @@ poll-to-tolerance moves), since both wrap a non-EPICS, poll-to-confirm HTTP back only on builds that have it. - **O-vector motors** `sgox/sgoy/sgoz` drive the SCS offset vector `OX/OY/OZ` (all mm). They are ordinary motors (`umv`, scans, baseline readout), so the offset is recorded - with every scan. They have no soft limits by default; set `limits` per experiment. + with every scan. The beamline config gives them `limits: [-2, 2]`; adjust per experiment. `nudge_beamline(modify_offset=True)` (`/nudgeOBCS`) also changes them; their readback catches up on the next read. - **`dev.smargon`** — the coordinator: `reference()`, `get_mode()`, `is_ready()`,