From c51379a2ccc93c199e88b5cbb4f3fe0a9ec3a51b Mon Sep 17 00:00:00 2001 From: gac-x12sa Date: Fri, 27 Jun 2025 16:21:08 +0200 Subject: [PATCH 1/5] feat:add initial optics hutch config --- csaxs_bec/device_configs/optics_hutch.yaml | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 csaxs_bec/device_configs/optics_hutch.yaml diff --git a/csaxs_bec/device_configs/optics_hutch.yaml b/csaxs_bec/device_configs/optics_hutch.yaml new file mode 100644 index 0000000..eeb6560 --- /dev/null +++ b/csaxs_bec/device_configs/optics_hutch.yaml @@ -0,0 +1,59 @@ +dmm1_roty: + description: 'Double Multilayer Monochromator first crystal, rotation Y' + deviceClass: ophyd.EpicsMotor + deviceConfig: + prefix: 'X12SA-OP-DMM1:ROTY' + onFailure: raise + enabled: true + readoutPriority: baseline + readOnly: true #false TODO Put to true to be able to move it (once tested)! + softwareTrigger: false + deviceTags: + - cSAXS + - optics +dmm1_trx: + description: 'Double Multilayer Monochromator first crystal, translation X' + deviceClass: ophyd.EpicsMotor + deviceConfig: + prefix: 'X12SA-OP-DMM1:TRX' + onFailure: raise + enabled: true + readoutPriority: baseline + readOnly: true #false TODO Put to true to be able to move it (once tested)! + softwareTrigger: false + deviceTags: + - cSAXS + - optics +dmm1_try: + description: 'Double Multilayer Monochromator first crystal, translation Y' + deviceClass: ophyd.EpicsMotor + deviceConfig: + prefix: 'X12SA-OP-DMM1:TRY' + onFailure: raise + enabled: true + readoutPriority: baseline + readOnly: true #false TODO Put to true to be able to move it (once tested)! + softwareTrigger: false + deviceTags: + - cSAXS + - optics +# dmm1_trx_readback_example: # This is the same template as for i.e. bpm4i +# description: 'This is an example of a read-only Epics signal' +# deviceClass: ophyd.EpicsSignalRO +# deviceConfig: +# read_pv: 'X12SA-OP-DMM1:TRX.RBV' +# onFailure: raise +# enabled: true +# readoutPriority: monitored +# readOnly: true +# softwareTrigger: false +# my_settable_signal: +# description: 'This is an example of a settable Epics signal' +# deviceClass: ophyd.EpicsSignal +# deviceConfig: +# read_pv: 'X07MA-FE-DSAPER' +# onFailure: retry +# enabled: true +# readoutPriority: baseline +# readOnly: false +# softwareTrigger: false \ No newline at end of file -- 2.49.1 From fad46111444e074135563be8a69cca343c93a3ee Mon Sep 17 00:00:00 2001 From: gac-x12sa Date: Tue, 1 Jul 2025 11:42:39 +0200 Subject: [PATCH 2/5] set readOnly to false for DMM motors and correct description --- csaxs_bec/device_configs/optics_hutch.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/csaxs_bec/device_configs/optics_hutch.yaml b/csaxs_bec/device_configs/optics_hutch.yaml index eeb6560..3000e5c 100644 --- a/csaxs_bec/device_configs/optics_hutch.yaml +++ b/csaxs_bec/device_configs/optics_hutch.yaml @@ -1,38 +1,38 @@ dmm1_roty: - description: 'Double Multilayer Monochromator first crystal, rotation Y' + description: 'Double Multilayer Monochromator rotation Y' deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X12SA-OP-DMM1:ROTY' onFailure: raise enabled: true readoutPriority: baseline - readOnly: true #false TODO Put to true to be able to move it (once tested)! + readOnly: false softwareTrigger: false deviceTags: - cSAXS - optics dmm1_trx: - description: 'Double Multilayer Monochromator first crystal, translation X' + description: 'Double Multilayer Monochromator, translation X' deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X12SA-OP-DMM1:TRX' onFailure: raise enabled: true readoutPriority: baseline - readOnly: true #false TODO Put to true to be able to move it (once tested)! + readOnly: false softwareTrigger: false deviceTags: - cSAXS - optics dmm1_try: - description: 'Double Multilayer Monochromator first crystal, translation Y' + description: 'Double Multilayer Monochromator, translation Y' deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X12SA-OP-DMM1:TRY' onFailure: raise enabled: true readoutPriority: baseline - readOnly: true #false TODO Put to true to be able to move it (once tested)! + readOnly: false softwareTrigger: false deviceTags: - cSAXS -- 2.49.1 From 8ca1f00d1cb6583d254dd5b515bdbf02dd477c9a Mon Sep 17 00:00:00 2001 From: gac-x12sa Date: Fri, 4 Jul 2025 14:28:25 +0200 Subject: [PATCH 3/5] add channel-cut motors and change motor names to shorter names --- csaxs_bec/device_configs/optics_hutch.yaml | 32 ++++++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/csaxs_bec/device_configs/optics_hutch.yaml b/csaxs_bec/device_configs/optics_hutch.yaml index 3000e5c..c1ec9c6 100644 --- a/csaxs_bec/device_configs/optics_hutch.yaml +++ b/csaxs_bec/device_configs/optics_hutch.yaml @@ -1,4 +1,4 @@ -dmm1_roty: +dmmroty: description: 'Double Multilayer Monochromator rotation Y' deviceClass: ophyd.EpicsMotor deviceConfig: @@ -11,7 +11,7 @@ dmm1_roty: deviceTags: - cSAXS - optics -dmm1_trx: +dmmx: description: 'Double Multilayer Monochromator, translation X' deviceClass: ophyd.EpicsMotor deviceConfig: @@ -24,7 +24,7 @@ dmm1_trx: deviceTags: - cSAXS - optics -dmm1_try: +dmmy: description: 'Double Multilayer Monochromator, translation Y' deviceClass: ophyd.EpicsMotor deviceConfig: @@ -37,6 +37,32 @@ dmm1_try: deviceTags: - cSAXS - optics +ccmroty: + description: 'Channel-cut Monochromator rotation Y' + deviceClass: ophyd.EpicsMotor + deviceConfig: + prefix: 'X12SA-OP-CCM1:ROTY' + onFailure: raise + enabled: true + readoutPriority: baseline + readOnly: false + softwareTrigger: false + deviceTags: + - cSAXS + - optics +ccmx: + description: 'Channel-cut Monochromator, translation X' + deviceClass: ophyd.EpicsMotor + deviceConfig: + prefix: 'X12SA-OP-CCM1:TRX' + onFailure: raise + enabled: true + readoutPriority: baseline + readOnly: false + softwareTrigger: false + deviceTags: + - cSAXS + - optics # dmm1_trx_readback_example: # This is the same template as for i.e. bpm4i # description: 'This is an example of a read-only Epics signal' # deviceClass: ophyd.EpicsSignalRO -- 2.49.1 From e9fc6930fffd90dc979128fb6a675309c71e69ff Mon Sep 17 00:00:00 2001 From: gac-x12sa Date: Fri, 4 Jul 2025 15:26:06 +0200 Subject: [PATCH 4/5] add and test smaract stages inside OPbox --- csaxs_bec/device_configs/optics_hutch.yaml | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/csaxs_bec/device_configs/optics_hutch.yaml b/csaxs_bec/device_configs/optics_hutch.yaml index c1ec9c6..d3957e5 100644 --- a/csaxs_bec/device_configs/optics_hutch.yaml +++ b/csaxs_bec/device_configs/optics_hutch.yaml @@ -11,6 +11,7 @@ dmmroty: deviceTags: - cSAXS - optics + dmmx: description: 'Double Multilayer Monochromator, translation X' deviceClass: ophyd.EpicsMotor @@ -24,6 +25,7 @@ dmmx: deviceTags: - cSAXS - optics + dmmy: description: 'Double Multilayer Monochromator, translation Y' deviceClass: ophyd.EpicsMotor @@ -37,6 +39,7 @@ dmmy: deviceTags: - cSAXS - optics + ccmroty: description: 'Channel-cut Monochromator rotation Y' deviceClass: ophyd.EpicsMotor @@ -50,6 +53,7 @@ ccmroty: deviceTags: - cSAXS - optics + ccmx: description: 'Channel-cut Monochromator, translation X' deviceClass: ophyd.EpicsMotor @@ -63,6 +67,71 @@ ccmx: deviceTags: - cSAXS - optics + +xbpm1x: + description: X-ray beam position monitor 1 in OPbox + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: A + host: x12sa-eb-smaract-mcs-03.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + +xbpm1y: + description: X-ray beam position monitor 1 in OPbox + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: B + host: x12sa-eb-smaract-mcs-03.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + +Cu_foilx: + description: Cu foil in OPbox + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: C + host: x12sa-eb-smaract-mcs-03.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + +scinx: + description: scintillator in OPbox + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: D + host: x12sa-eb-smaract-mcs-03.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + # dmm1_trx_readback_example: # This is the same template as for i.e. bpm4i # description: 'This is an example of a read-only Epics signal' # deviceClass: ophyd.EpicsSignalRO -- 2.49.1 From 66622fd75d69baa2cfd9deedc6a859bd6bc4381d Mon Sep 17 00:00:00 2001 From: gac-x12sa Date: Fri, 4 Jul 2025 15:32:27 +0200 Subject: [PATCH 5/5] change cu_foilx motor name to lower case c --- csaxs_bec/device_configs/optics_hutch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csaxs_bec/device_configs/optics_hutch.yaml b/csaxs_bec/device_configs/optics_hutch.yaml index d3957e5..3e92273 100644 --- a/csaxs_bec/device_configs/optics_hutch.yaml +++ b/csaxs_bec/device_configs/optics_hutch.yaml @@ -100,7 +100,7 @@ xbpm1y: readOnly: false readoutPriority: baseline -Cu_foilx: +cu_foilx: description: Cu foil in OPbox deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor deviceConfig: -- 2.49.1