From bc8c40907bde1761d9a754ec50327a82374e3b6f Mon Sep 17 00:00:00 2001 From: x12sa Date: Tue, 25 Aug 2026 11:42:14 +0200 Subject: [PATCH 1/6] update IDS camera ID --- csaxs_bec/device_configs/xeye.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csaxs_bec/device_configs/xeye.yaml b/csaxs_bec/device_configs/xeye.yaml index 2539bdd5..8b03f697 100644 --- a/csaxs_bec/device_configs/xeye.yaml +++ b/csaxs_bec/device_configs/xeye.yaml @@ -42,7 +42,7 @@ cam_xeye: description: Camera Xray eye ID1 deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera deviceConfig: - camera_id: 1 + camera_id: 2 bits_per_pixel: 24 num_rotation_90: 2 transpose: true -- 2.54.0 From 91273d50f0591be4ef75ac31c7b77117b1c8d68b Mon Sep 17 00:00:00 2001 From: x12sa Date: Thu, 27 Aug 2026 15:08:30 +0200 Subject: [PATCH 2/6] comment out X-ray eye --- csaxs_bec/device_configs/xeye.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/csaxs_bec/device_configs/xeye.yaml b/csaxs_bec/device_configs/xeye.yaml index 8b03f697..9efa615e 100644 --- a/csaxs_bec/device_configs/xeye.yaml +++ b/csaxs_bec/device_configs/xeye.yaml @@ -38,19 +38,19 @@ eyey: softwareTrigger: false -cam_xeye: - description: Camera Xray eye ID1 - deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera - deviceConfig: - camera_id: 2 - 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 +# cam_xeye: +# description: Camera Xray eye ID1 +# deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera +# deviceConfig: +# camera_id: 2 +# 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) -- 2.54.0 From bf51e40046db228d2604a958a80bb717fba09718 Mon Sep 17 00:00:00 2001 From: x12sa Date: Tue, 25 Aug 2026 11:43:06 +0200 Subject: [PATCH 3/6] added comment for settings of microstepping card --- csaxs_bec/device_configs/user_template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/csaxs_bec/device_configs/user_template.yaml b/csaxs_bec/device_configs/user_template.yaml index c279f293..122f9c51 100644 --- a/csaxs_bec/device_configs/user_template.yaml +++ b/csaxs_bec/device_configs/user_template.yaml @@ -21,6 +21,7 @@ samx: ############################################################ ########### OWIS LTM80 with micro-stepping ################# ############################################################ +# usually controller 18/19/20; Irun 1; Step F; both switches to the left (off); Adress 0 samy: description: Owis motor stage samx deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME -- 2.54.0 From 84e7c01235b2aa71489de926dd840caaaf3931dd Mon Sep 17 00:00:00 2001 From: x12sa Date: Tue, 25 Aug 2026 11:44:57 +0200 Subject: [PATCH 4/6] added comment for nominal xbpm2x position according to Excel file --- csaxs_bec/device_configs/bl_optics_hutch.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/csaxs_bec/device_configs/bl_optics_hutch.yaml b/csaxs_bec/device_configs/bl_optics_hutch.yaml index 1267244f..411b809c 100644 --- a/csaxs_bec/device_configs/bl_optics_hutch.yaml +++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml @@ -209,6 +209,7 @@ xbpm2x: userParameter: init_position: 22.5 in_position: -1.5 + # in_position: 0.5 (from Excel file) # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 0 deviceTags: -- 2.54.0 From 2de604c8043111e122a299c2bb0f4771987dce44 Mon Sep 17 00:00:00 2001 From: x12sa Date: Thu, 27 Aug 2026 15:07:49 +0200 Subject: [PATCH 5/6] add in position values and recommended gain for XBPM3 --- csaxs_bec/device_configs/bl_endstation.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml index 02785210..51e78567 100644 --- a/csaxs_bec/device_configs/bl_endstation.yaml +++ b/csaxs_bec/device_configs/bl_endstation.yaml @@ -104,6 +104,7 @@ xbpm3x: connectionTimeout: 20 userParameter: init_position: -22.5 + in_position: -0.18 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 0 deviceTags: @@ -129,6 +130,7 @@ xbpm3y: connectionTimeout: 20 userParameter: init_position: -2 + in_position: -0.485 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 1 deviceTags: @@ -1151,7 +1153,7 @@ gain_bpm_xbox2: - bl_endstation bpm_xbox2_slowrb: - description: BPM Xbox 2 (First Xbox in ES hutch) readback + description: BPM Xbox 2 (First Xbox in ES hutch) readback (recommended gain 1e8) deviceClass: csaxs_bec.devices.pseudo_devices.bpm.BPM deviceConfig: left_top_ref: galilrioesxbox.analog_in.ch0 -- 2.54.0 From 18dd3ffc3d8e45c0ac807467588c328f011a7f5d Mon Sep 17 00:00:00 2001 From: x12sa Date: Tue, 8 Sep 2026 15:31:16 +0200 Subject: [PATCH 6/6] increase velocity of Owis stages in xeye.yaml --- csaxs_bec/device_configs/xeye.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csaxs_bec/device_configs/xeye.yaml b/csaxs_bec/device_configs/xeye.yaml index 9efa615e..7f30b2b4 100644 --- a/csaxs_bec/device_configs/xeye.yaml +++ b/csaxs_bec/device_configs/xeye.yaml @@ -5,7 +5,7 @@ eyex: prefix: X12SA-ES2-ES04 motor_resolution: 0.00125 base_velocity: 0.0625 - velocity: 1 + velocity: 5 backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 @@ -25,7 +25,7 @@ eyey: prefix: X12SA-ES2-ES05 motor_resolution: 0.00125 base_velocity: 0.0625 - velocity: 1 + velocity: 5 backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 -- 2.54.0