config(smargon): point beamline config at tt-smargopolo:8080
The cSAXS beamline smargopolo server is http://tt-smargopolo:8080 (port 8080, not the MX-lab reference's :3000). Set host/port on the coordinator and all axis motors so smargon.yaml loads as-is at the beamline. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
committed by
x12sa
co-authored by
Claude Opus 4.8
parent
7b06bc48df
commit
8733d2e6e6
@@ -16,8 +16,8 @@ smargon:
|
||||
description: SmarGon coordinator (referencing, mode, coordinated moves)
|
||||
deviceClass: csaxs_bec.devices.smargon.smargon.SmarGon
|
||||
deviceConfig:
|
||||
host: smargopolo # SET to the actual server (ref client used "mxlab1-smargopolo")
|
||||
port: 3000
|
||||
host: tt-smargopolo # cSAXS beamline smargopolo server
|
||||
port: 8080 # note: 8080 here (the MX-lab reference used :3000)
|
||||
timeout: 5.0
|
||||
deviceTags: [goniometer, smargon]
|
||||
enabled: true
|
||||
@@ -33,7 +33,7 @@ smargon:
|
||||
sgx:
|
||||
description: SmarGon SHX (sample X)
|
||||
deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor
|
||||
deviceConfig: {scs_axis: SHX, host: smargopolo, port: 3000, limits: [-2, 2], tolerance: 0.001}
|
||||
deviceConfig: {scs_axis: SHX, host: tt-smargopolo, port: 8080, limits: [-2, 2], tolerance: 0.001}
|
||||
deviceTags: [goniometer, smargon]
|
||||
enabled: true
|
||||
onFailure: retry
|
||||
@@ -42,7 +42,7 @@ sgx:
|
||||
sgy:
|
||||
description: SmarGon SHY (sample Y)
|
||||
deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor
|
||||
deviceConfig: {scs_axis: SHY, host: smargopolo, port: 3000, limits: [-2, 2], tolerance: 0.001}
|
||||
deviceConfig: {scs_axis: SHY, host: tt-smargopolo, port: 8080, limits: [-2, 2], tolerance: 0.001}
|
||||
deviceTags: [goniometer, smargon]
|
||||
enabled: true
|
||||
onFailure: retry
|
||||
@@ -51,7 +51,7 @@ sgy:
|
||||
sgz:
|
||||
description: SmarGon SHZ (sample Z)
|
||||
deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor
|
||||
deviceConfig: {scs_axis: SHZ, host: smargopolo, port: 3000, limits: [10, 22], tolerance: 0.001}
|
||||
deviceConfig: {scs_axis: SHZ, host: tt-smargopolo, port: 8080, limits: [10, 22], tolerance: 0.001}
|
||||
deviceTags: [goniometer, smargon]
|
||||
enabled: true
|
||||
onFailure: retry
|
||||
@@ -60,7 +60,7 @@ sgz:
|
||||
sgchi:
|
||||
description: SmarGon CHI (goniometer tilt)
|
||||
deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor
|
||||
deviceConfig: {scs_axis: CHI, host: smargopolo, port: 3000, limits: [0, 65], tolerance: 0.01}
|
||||
deviceConfig: {scs_axis: CHI, host: tt-smargopolo, port: 8080, limits: [0, 65], tolerance: 0.01}
|
||||
deviceTags: [goniometer, smargon]
|
||||
enabled: true
|
||||
onFailure: retry
|
||||
@@ -69,7 +69,7 @@ sgchi:
|
||||
sgphi:
|
||||
description: SmarGon PHI (goniometer rotation)
|
||||
deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor
|
||||
deviceConfig: {scs_axis: PHI, host: smargopolo, port: 3000, limits: [-180, 180], tolerance: 0.01}
|
||||
deviceConfig: {scs_axis: PHI, host: tt-smargopolo, port: 8080, limits: [-180, 180], tolerance: 0.01}
|
||||
deviceTags: [goniometer, smargon]
|
||||
enabled: true
|
||||
onFailure: retry
|
||||
@@ -79,7 +79,7 @@ sgphi:
|
||||
# sgomega:
|
||||
# description: SmarGon OMEGA (rotation drive)
|
||||
# deviceClass: csaxs_bec.devices.smargon.positioner.SmargopoloMotor
|
||||
# deviceConfig: {scs_axis: OMEGA, host: smargopolo, port: 3000, tolerance: 0.01}
|
||||
# deviceConfig: {scs_axis: OMEGA, host: tt-smargopolo, port: 8080, tolerance: 0.01}
|
||||
# deviceTags: [goniometer, smargon]
|
||||
# enabled: true
|
||||
# onFailure: retry
|
||||
|
||||
Reference in New Issue
Block a user