fix(config-main): move devices from main to user_setup.yaml

2026-06-16 15:57:37 +02:00
parent efcf9b3f3e
commit 36536eefc4
2 changed files with 131 additions and 141 deletions
@@ -25,136 +25,7 @@ detectors:
 #lamni:
 #  - !include ./ptycho_lamni.yaml

-#user setup:
-#  - !include ./user_setup.yaml
+user setup:
+  - !include ./user_setup.yaml
+

-eyex:
-  description: Owis motor stage samx
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES2-ES01
-    motor_resolution: 0.00125
-    base_velocity: 0.0625
-    velocity: 10
-    backlash_distance: 0.125
-    acceleration: 0.2
-    user_offset_dir: 0
-  deviceTags:
-  - cSAXS
-  - owis_samx
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-eyey:
-  description: Owis motor stage samx
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES2-ES02
-    motor_resolution: 0.00125
-    base_velocity: 0.0625
-    velocity: 10
-    backlash_distance: 0.125
-    acceleration: 0.2
-    user_offset_dir: 0
-  deviceTags:
-  - cSAXS
-  - owis_samx
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-samx:
-  description: Owis motor stage samx
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES2-ES18
-    motor_resolution: 0.000125
-    base_velocity: 0.00625
-    velocity: 1
-    backlash_distance: 0.0125
-    acceleration: 0.2
-    user_offset_dir: 0
-  deviceTags:
-  - cSAXS
-  - owis_samx
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-samy:
-  description: Owis motor stage samx
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES2-ES19
-    motor_resolution: 0.000125
-    base_velocity: 0.00625
-    velocity: 1
-    backlash_distance: 0.0125
-    acceleration: 0.2
-    user_offset_dir: 0
-  deviceTags:
-  - cSAXS
-  - owis_samx
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-# eye_cam:
-#   description: Camera Microscope
-#   deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera
-#   deviceConfig:
-#     camera_id: 1
-#     bits_per_pixel: 8
-#     num_rotation_90: 1
-#     transpose: false
-#     force_monochrome: false
-#     m_n_colormode: 1
-#   enabled: true
-#   onFailure: buffer
-#   readOnly: false
-#   readoutPriority: async
-smarx:
-  description: sample position x with smaract
-  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-  deviceConfig:
-    axis_Id: G
-    host: x12sa-eb-smaract-mcs-05.psi.ch
-    limits:
-    - -200
-    - 200
-    port: 5000
-    sign: 1
-    # precision: 3
-    # tolerance: 0.005
-  enabled: true
-  onFailure: retry
-  readOnly: false
-  readoutPriority: baseline
-  connectionTimeout: 20
-  userParameter:
-    #init_position: 0
-    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-    bl_smar_stage: 6 
-smary:
-  description: sample position y with smaract
-  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-  deviceConfig:
-    axis_Id: H
-    host: x12sa-eb-smaract-mcs-05.psi.ch
-    limits:
-    - -200
-    - 200
-    port: 5000
-    sign: 1
-    # precision: 3
-    # tolerance: 0.005
-  enabled: true
-  onFailure: retry
-  readOnly: false
-  readoutPriority: baseline
-  connectionTimeout: 20
-  userParameter:
-    #init_position: 0
-    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-    bl_smar_stage: 7 
@@ -2,14 +2,133 @@



-############################################################
-##################### EPS ##################################
-############################################################
-x12saEPS:
-  description: X12SA EPS info and control
-  deviceClass: csaxs_bec.devices.epics.eps.EPS
-  deviceConfig: {}
-  enabled: true
+eyex:
+  description: Owis motor stage samx
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES2-ES01
+    motor_resolution: 0.00125
+    base_velocity: 0.0625
+    velocity: 10
+    backlash_distance: 0.125
+    acceleration: 0.2
+    user_offset_dir: 0
+  deviceTags:
+  - cSAXS
+  - owis_samx
  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+eyey:
+  description: Owis motor stage samx
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES2-ES02
+    motor_resolution: 0.00125
+    base_velocity: 0.0625
+    velocity: 10
+    backlash_distance: 0.125
+    acceleration: 0.2
+    user_offset_dir: 0
+  deviceTags:
+  - cSAXS
+  - owis_samx
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+samx:
+  description: Owis motor stage samx
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES2-ES18
+    motor_resolution: 0.000125
+    base_velocity: 0.00625
+    velocity: 1
+    backlash_distance: 0.0125
+    acceleration: 0.2
+    user_offset_dir: 0
+  deviceTags:
+  - cSAXS
+  - owis_samx
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+samy:
+  description: Owis motor stage samx
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES2-ES19
+    motor_resolution: 0.000125
+    base_velocity: 0.00625
+    velocity: 1
+    backlash_distance: 0.0125
+    acceleration: 0.2
+    user_offset_dir: 0
+  deviceTags:
+  - cSAXS
+  - owis_samx
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+# eye_cam:
+#   description: Camera Microscope
+#   deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera
+#   deviceConfig:
+#     camera_id: 1
+#     bits_per_pixel: 8
+#     num_rotation_90: 1
+#     transpose: false
+#     force_monochrome: false
+#     m_n_colormode: 1
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: async
+smarx:
+  description: sample position x with smaract
+  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+  deviceConfig:
+    axis_Id: G
+    host: x12sa-eb-smaract-mcs-05.psi.ch
+    limits:
+    - -200
+    - 200
+    port: 5000
+    sign: 1
+    # precision: 3
+    # tolerance: 0.005
+  enabled: true
+  onFailure: retry
  readOnly: false
-  readoutPriority: baseline
+  readoutPriority: baseline
+  connectionTimeout: 20
+  userParameter:
+    #init_position: 0
+    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+    bl_smar_stage: 6 
+smary:
+  description: sample position y with smaract
+  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+  deviceConfig:
+    axis_Id: H
+    host: x12sa-eb-smaract-mcs-05.psi.ch
+    limits:
+    - -200
+    - 200
+    port: 5000
+    sign: 1
+    # precision: 3
+    # tolerance: 0.005
+  enabled: true
+  onFailure: retry
+  readOnly: false
+  readoutPriority: baseline
+  connectionTimeout: 20
+  userParameter:
+    #init_position: 0
+    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+    bl_smar_stage: 7