scanning SAXS, e23738

csaxs_bec/bec_widgets/widgets/saxs_widget/saxs_widget.py

@@ -229,6 +229,7 @@ class SAXSWidget(BECWidget, QWidget):
                     "step_size",
                     "readback",
                     "device_box",
+                    "setpoint",
                 }:
                     widget.hide()
 

csaxs_bec/device_configs/bl_detectors.yaml

@@ -1,25 +1,25 @@
-eiger_1_5:
-  description: Eiger 1.5M in-vacuum detector 
-  deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M
-  deviceConfig:
-    detector_distance: 2150
-    beam_center: [860, 1219]
-  onFailure: raise
-  enabled: True
-  readoutPriority: async
-  softwareTrigger: False
-
-# eiger_9:
-#   description: Eiger 9M detector 
-#   deviceClass: csaxs_bec.devices.jungfraujoch.eiger_9m.Eiger9M
+# eiger_1_5:
+#   description: Eiger 1.5M in-vacuum detector 
+#   deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M
 #   deviceConfig:
-#     detector_distance: 2200
-#     beam_center: [870, 1203]
+#     detector_distance: 2150
+#     beam_center: [860, 1219]
 #   onFailure: raise
 #   enabled: True
 #   readoutPriority: async
 #   softwareTrigger: False
 
+eiger_9:
+  description: Eiger 9M detector 
+  deviceClass: csaxs_bec.devices.jungfraujoch.eiger_9m.Eiger9M
+  deviceConfig:
+    detector_distance: 2200
+    beam_center: [870, 1203]
+  onFailure: raise
+  enabled: True
+  readoutPriority: async
+  softwareTrigger: False
+
 # ids_cam:
 #   description: IDS camera for live image acquisition
 #   deviceClass: csaxs_bec.devices.ids_cameras.IDSCamera

csaxs_bec/device_configs/main.yaml

@@ -16,11 +16,17 @@ endstation:
 detectors:
   - !include ./bl_detectors.yaml
 
+xeye:
+  - !include ./xeye.yaml
+
+ssaxs:
+  - !include ./ssaxs.yaml
+
 #sastt:
 #  - !include ./sastt.yaml
 
-flomni:
- - !include ./ptycho_flomni.yaml
+# flomni:
+#  - !include ./ptycho_flomni.yaml
 
 #omny:
 #  - !include ./ptycho_omny.yaml

csaxs_bec/device_configs/ssaxs.yaml

@@ -0,0 +1,75 @@
+samx:
+  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
+
+
+samy:
+  description: Owis motor stage samy
+  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_samy
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+
+micz:
+  description: Owis motor stage micz
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES2-ES03
+    motor_resolution: 0.000125
+    base_velocity: 0.00625
+    velocity: 1
+    backlash_distance: 0.0125
+    acceleration: 0.2
+    user_offset_dir: 0
+  deviceTags:
+  - cSAXS
+  - owis_micz
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+cam_sample:
+  description: Camera sample
+  deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera
+  deviceConfig:
+    camera_id: 5
+    bits_per_pixel: 24
+    num_rotation_90: 3
+    transpose: false 
+    force_monochrome: false
+    m_n_colormode: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: async
+#  userParameter:
+#    pixel_calibration: 0.00044247787610619477   # mm/pixel (= 0.05 / 113)

csaxs_bec/device_configs/xeye.yaml

@@ -0,0 +1,56 @@
+eyex:
+  description: Owis motor stage eyex
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES2-ES04
+    motor_resolution: 0.00125
+    base_velocity: 0.0625
+    velocity: 1
+    backlash_distance: 0.125
+    acceleration: 0.2
+    user_offset_dir: 0
+  deviceTags:
+  - cSAXS
+  - owis_eyex
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+
+eyey:
+  description: Owis motor stage eyey
+  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
+  deviceConfig:
+    prefix: X12SA-ES2-ES05
+    motor_resolution: 0.00125
+    base_velocity: 0.0625
+    velocity: 1
+    backlash_distance: 0.125
+    acceleration: 0.2
+    user_offset_dir: 0
+  deviceTags:
+  - cSAXS
+  - owis_eyey
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  softwareTrigger: false
+
+
+cam_xeye:
+  description: Camera Xray eye ID1
+  deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera
+  deviceConfig:
+    camera_id: 1
+    bits_per_pixel: 24
+    num_rotation_90: 2
+    transpose: true 
+    force_monochrome: true
+    m_n_colormode: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: async
+#  userParameter:
+#    pixel_calibration: 0.00044247787610619477   # mm/pixel (= 0.05 / 113)