diff --git a/csaxs_bec/device_configs/bl_detectors.yaml b/csaxs_bec/device_configs/bl_detectors.yaml index a7cb3e2..a151b35 100644 --- a/csaxs_bec/device_configs/bl_detectors.yaml +++ b/csaxs_bec/device_configs/bl_detectors.yaml @@ -1,5 +1,5 @@ eiger_1_5: - description: Eiger 1.5M in-vacuum detector + description: Eiger 1.5M in-vacuum detector deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M deviceConfig: detector_distance: 2150 @@ -8,9 +8,11 @@ eiger_1_5: enabled: True readoutPriority: async softwareTrigger: False + deviceTags: + - bl_detectors # eiger_9: -# description: Eiger 9M detector +# description: Eiger 9M detector # deviceClass: csaxs_bec.devices.jungfraujoch.eiger_9m.Eiger9M # deviceConfig: # detector_distance: 2200 @@ -19,6 +21,8 @@ eiger_1_5: # enabled: True # readoutPriority: async # softwareTrigger: False +# deviceTags: +# - bl_detectors # ids_cam: # description: IDS camera for live image acquisition @@ -32,4 +36,5 @@ eiger_1_5: # enabled: true # readoutPriority: async # softwareTrigger: True - +# deviceTags: +# - bl_detectors diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml index 4a224aa..0278521 100644 --- a/csaxs_bec/device_configs/bl_endstation.yaml +++ b/csaxs_bec/device_configs/bl_endstation.yaml @@ -11,6 +11,8 @@ ddg1: readOnly: false readoutPriority: baseline softwareTrigger: true + deviceTags: + - bl_endstation ddg2: description: Detector delay Generator for trigger burst @@ -22,6 +24,8 @@ ddg2: readOnly: false readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation ########################################################################## ###################### Multichannel Scaler################################ @@ -36,6 +40,8 @@ mcs: enabled: true readoutPriority: async softwareTrigger: false + deviceTags: + - bl_endstation @@ -51,6 +57,8 @@ fsh: onFailure: raise enabled: true readoutPriority: monitored + deviceTags: + - bl_endstation ########################################################################## ########################### FAST SHUTTER ################################# @@ -67,6 +75,8 @@ shutter_es: readoutPriority: baseline readOnly: true softwareTrigger: false + deviceTags: + - bl_endstation ########################################################################## ######################## SMARACT STAGES ################################## @@ -96,6 +106,8 @@ xbpm3x: init_position: -22.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 0 + deviceTags: + - bl_endstation xbpm3y: description: X-ray beam position y monitor 1 in ESbox1 @@ -119,6 +131,8 @@ xbpm3y: init_position: -2 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 1 + deviceTags: + - bl_endstation sl4xi: description: ESbox1 slit 4 inner blade movement @@ -142,6 +156,8 @@ sl4xi: init_position: -5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 2 + deviceTags: + - bl_endstation sl4xo: description: ESbox1 slit 4 outer blade movement @@ -165,6 +181,8 @@ sl4xo: init_position: 6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 3 + deviceTags: + - bl_endstation sl4yb: description: ESbox1 slit 4 bottom blade movement @@ -188,6 +206,8 @@ sl4yb: init_position: -5.8 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 4 + deviceTags: + - bl_endstation sl4yt: description: ESbox1 slit 4 top blade movement @@ -211,6 +231,8 @@ sl4yt: init_position: 5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 5 + deviceTags: + - bl_endstation sl4xc: description: ESbox1 slit 4 x center @@ -226,6 +248,8 @@ sl4xc: needs: - sl4xi - sl4xo + deviceTags: + - bl_endstation sl4xs: @@ -242,6 +266,8 @@ sl4xs: needs: - sl4xi - sl4xo + deviceTags: + - bl_endstation sl4yc: description: ESbox1 slit 4 y center @@ -257,6 +283,8 @@ sl4yc: needs: - sl4yb - sl4yt + deviceTags: + - bl_endstation sl4ys: @@ -273,6 +301,8 @@ sl4ys: needs: - sl4yb - sl4yt + deviceTags: + - bl_endstation fast_shutter_n1_x: description: ESbox1 New fast shutter 1 x movment @@ -297,6 +327,8 @@ fast_shutter_n1_x: in: 0 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 7 + deviceTags: + - bl_endstation fast_shutter_o1_x: description: ESbox1 Old fast shutter 1 x movment @@ -321,6 +353,8 @@ fast_shutter_o1_x: in_position: 9.34 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 6 + deviceTags: + - bl_endstation fast_shutter_o2_x: description: ESbox1 Old fast shutter 2 x movment @@ -344,6 +378,8 @@ fast_shutter_o2_x: init_position: -15.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 5 + deviceTags: + - bl_endstation filter_array_1_x: description: ESbox1 Filter Array 1 x movment @@ -367,6 +403,8 @@ filter_array_1_x: init_position: 25 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 1 + deviceTags: + - bl_endstation filter_array_2_x: description: ESbox1 Filter Array 2 x movment @@ -390,6 +428,8 @@ filter_array_2_x: init_position: 25.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 2 + deviceTags: + - bl_endstation filter_array_3_x: description: ESbox1 Filter Array 3 x movment @@ -413,6 +453,8 @@ filter_array_3_x: init_position: 25.8 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 3 + deviceTags: + - bl_endstation filter_array_4_x: description: ESbox1 Filter Array 4 x movment @@ -436,6 +478,8 @@ filter_array_4_x: init_position: 25 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 4 + deviceTags: + - bl_endstation sl5xi: description: ESbox1 slit 5 inner blade movement @@ -459,6 +503,8 @@ sl5xi: init_position: -5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 6 + deviceTags: + - bl_endstation sl5xo: description: ESbox1 slit 5 outer blade movement @@ -482,6 +528,8 @@ sl5xo: init_position: 6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 7 + deviceTags: + - bl_endstation sl5yb: description: ESbox1 slit 5 bottom blade movement @@ -505,6 +553,8 @@ sl5yb: init_position: -5.8 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 8 + deviceTags: + - bl_endstation sl5yt: description: ESbox1 slit 5 top blade movement @@ -528,6 +578,8 @@ sl5yt: init_position: 5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 0 + deviceTags: + - bl_endstation sl5xc: description: ESbox1 slit 5 x center @@ -543,6 +595,8 @@ sl5xc: needs: - sl5xi - sl5xo + deviceTags: + - bl_endstation sl5xs: @@ -559,6 +613,8 @@ sl5xs: needs: - sl5xi - sl5xo + deviceTags: + - bl_endstation sl5yc: @@ -575,6 +631,8 @@ sl5yc: needs: - sl5yb - sl5yt + deviceTags: + - bl_endstation sl5ys: @@ -591,6 +649,8 @@ sl5ys: needs: - sl5yb - sl5yt + deviceTags: + - bl_endstation ############## XBOX 3 (XBOX 2 ES) ##################### @@ -617,6 +677,8 @@ sl6xi: init_position: -6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 2 + deviceTags: + - bl_endstation sl6xo: description: ESbox2 slit 6 outer blade movement @@ -640,6 +702,8 @@ sl6xo: init_position: 5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 3 + deviceTags: + - bl_endstation sl6yb: description: ESbox2 slit 6 bottom blade movement @@ -663,6 +727,8 @@ sl6yb: init_position: -5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 4 + deviceTags: + - bl_endstation sl6yt: description: ESbox1 slit 6 top blade movement @@ -686,6 +752,8 @@ sl6yt: init_position: 6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 5 + deviceTags: + - bl_endstation sl6xc: description: ESbox1 slit 6 x center @@ -701,6 +769,8 @@ sl6xc: needs: - sl6xi - sl6xo + deviceTags: + - bl_endstation sl6xs: description: ESbox1 slit 6 x size @@ -716,6 +786,8 @@ sl6xs: needs: - sl6xi - sl6xo + deviceTags: + - bl_endstation sl6yc: description: ESbox1 slit 6 y center @@ -731,6 +803,8 @@ sl6yc: needs: - sl6yb - sl6yt + deviceTags: + - bl_endstation sl6ys: description: ESbox1 slit 6 y size @@ -746,6 +820,8 @@ sl6ys: needs: - sl6yb - sl6yt + deviceTags: + - bl_endstation xbimtrx: description: ESbox2 beam intensity monitor x movement @@ -770,6 +846,8 @@ xbimtrx: in_position: 9.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 0 + deviceTags: + - bl_endstation xbimtry: description: ESbox2 beam intensity monitor y movement @@ -793,6 +871,8 @@ xbimtry: init_position: 0 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 1 + deviceTags: + - bl_endstation @@ -805,68 +885,66 @@ aptrx: deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-PIN1:TRX1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation aptry: description: Aperture pinhole Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-PIN1:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation ebtrx: description: Exposure box aperture X deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-EB:TRX1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation ebtry: description: Exposure box aperture Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-EB:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation ebtrz: description: Exposure box aperture Z deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-EB:TRZ1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation ebsupport: description: Exposure box granite support Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-EH1-EB:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline @@ -874,162 +952,164 @@ ebsupport: userParameter: one_reflection: -93.0 two_reflections: 10.9787 + deviceTags: + - bl_endstation fttrx1: description: FTS1 translation X deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-FTS1:TRX1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation fttry1: description: FTS1 translation Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-FTS1:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation fttrx2: description: FTS2 translation X deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-FTS2:TRX1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation fttry2: description: FTS2 translation Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-FTS2:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation fttrz: description: FTS1 translation Z deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-FTS1:TRZ1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation bs1x: description: Beamstop 1 X deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-BS1:TRX1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation bs1y: description: Beamstop 1 Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-BS1:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation bs2x: description: Beamstop 2 X deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-BS2:TRX1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation bs2y: description: Beamstop 2 Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-BS2:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation # dttrx: # description: Detector table X # deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME # deviceConfig: # prefix: X12SA-ES1-DETT:TRX1 -# deviceTags: -# - cSAXS_ES # onFailure: retry # enabled: true # readoutPriority: baseline # softwareTrigger: false +# deviceTags: +# - bl_endstation dttry: description: Detector table Y deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-DETT:TRY1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation dttrz: description: Detector table Z deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-DETT:TRZ1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation dettrx: description: Detector 1 X deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES1-DET1:TRX1 - deviceTags: - - cSAXS_ES onFailure: retry enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - bl_endstation @@ -1050,6 +1130,8 @@ galilrioesxbox: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - bl_endstation gain_bpm_xbox2: description: Gain control for BPM XBox2 @@ -1065,6 +1147,8 @@ gain_bpm_xbox2: onFailure: retry needs: - galilrioesxbox + deviceTags: + - bl_endstation bpm_xbox2_slowrb: description: BPM Xbox 2 (First Xbox in ES hutch) readback @@ -1079,6 +1163,8 @@ bpm_xbox2_slowrb: onFailure: retry needs: - galilrioesxbox + deviceTags: + - bl_endstation gain_bim_xbox3: description: Gain control for beam intensity monitor ES Xbox3 @@ -1094,6 +1180,8 @@ gain_bim_xbox3: onFailure: retry needs: - galilrioesxbox + deviceTags: + - bl_endstation bim_xbox3_slowrb: description: Beam intensity slow readback ES XBox3 @@ -1105,6 +1193,8 @@ bim_xbox3_slowrb: onFailure: retry needs: - galilrioesxbox + deviceTags: + - bl_endstation @@ -1123,6 +1213,8 @@ galilrioesft: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - bl_endstation gain_beamstop_diode: description: Gain control for beamstop flightube @@ -1138,6 +1230,8 @@ gain_beamstop_diode: onFailure: retry needs: - galilrioesft + deviceTags: + - bl_endstation beamstop_intensity: description: Beamstop intensity from Galil analog input ch6 @@ -1149,6 +1243,8 @@ beamstop_intensity: onFailure: retry needs: - galilrioesft + deviceTags: + - bl_endstation diff --git a/csaxs_bec/device_configs/bl_frontend.yaml b/csaxs_bec/device_configs/bl_frontend.yaml index ee40118..7a251bb 100644 --- a/csaxs_bec/device_configs/bl_frontend.yaml +++ b/csaxs_bec/device_configs/bl_frontend.yaml @@ -8,6 +8,8 @@ idgap: readoutPriority: baseline readOnly: false # put to false if you like to move it softwareTrigger: false + deviceTags: + - bl_frontend xbpm1x: description: 'X-ray BPM1 in frontend translation x' @@ -20,8 +22,7 @@ xbpm1x: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend xbpm1y: description: 'X-ray BPM1 in frontend translation y' @@ -34,8 +35,7 @@ xbpm1y: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1xi: description: 'slit 1 (frontend) x ring' @@ -48,8 +48,7 @@ sl1xi: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1xo: description: 'slit 1 (frontend) x wall' @@ -62,8 +61,7 @@ sl1xo: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1yb: description: 'slit 1 (frontend) y bottom' @@ -76,8 +74,7 @@ sl1yb: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1yt: description: 'slit 1 (frontend) y top' @@ -90,8 +87,7 @@ sl1yt: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1xc: description: 'slit 1 (frontend) x center' @@ -104,8 +100,7 @@ sl1xc: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1xs: description: 'slit 1 (frontend) x size' @@ -118,8 +113,7 @@ sl1xs: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1yc: description: 'slit 1 (frontend) y center' @@ -132,8 +126,7 @@ sl1yc: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend sl1ys: description: 'slit 1 (frontend) y size' @@ -146,8 +139,7 @@ sl1ys: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - frontend + - bl_frontend ##################################### #### XBPM ########################### ##################################### @@ -165,6 +157,8 @@ xbpm1c1: readoutPriority: monitored readOnly: true softwareTrigger: false + deviceTags: + - bl_frontend xbpm1c2: description: 'XBPM1 (frontend) current 2' @@ -176,6 +170,8 @@ xbpm1c2: readoutPriority: monitored readOnly: true softwareTrigger: false + deviceTags: + - bl_frontend xbpm1c3: description: 'XBPM1 (frontend) current 3' @@ -187,6 +183,8 @@ xbpm1c3: readoutPriority: monitored readOnly: true softwareTrigger: false + deviceTags: + - bl_frontend xbpm1c4: description: 'XBPM1 (frontend) current 4' @@ -198,6 +196,8 @@ xbpm1c4: readoutPriority: monitored readOnly: true softwareTrigger: false + deviceTags: + - bl_frontend bpm1: description: 'XBPM1 (frontend)' @@ -217,6 +217,8 @@ bpm1: - xbpm1c2 - xbpm1c3 - xbpm1c4 + deviceTags: + - bl_frontend ############################################ ######### End of xbpm sub devices ########## @@ -231,4 +233,6 @@ xbpm1: enabled: true readoutPriority: monitored readOnly: true - softwareTrigger: false \ No newline at end of file + softwareTrigger: false + deviceTags: + - bl_frontend diff --git a/csaxs_bec/device_configs/bl_general.yaml b/csaxs_bec/device_configs/bl_general.yaml index 3266e38..c0860e1 100644 --- a/csaxs_bec/device_configs/bl_general.yaml +++ b/csaxs_bec/device_configs/bl_general.yaml @@ -9,3 +9,5 @@ x12saEPS: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - bl_general diff --git a/csaxs_bec/device_configs/bl_optics_hutch.yaml b/csaxs_bec/device_configs/bl_optics_hutch.yaml index 0451ae2..791eeb2 100644 --- a/csaxs_bec/device_configs/bl_optics_hutch.yaml +++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml @@ -9,8 +9,7 @@ sl2xi: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl2xo: description: "slit 1 (optics) x wall" @@ -23,8 +22,7 @@ sl2xo: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl2yb: description: "slit 1 (optics) y bottom" @@ -37,8 +35,7 @@ sl2yb: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl2yt: description: "slit 1 (optics) y top" @@ -51,8 +48,7 @@ sl2yt: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl2xc: description: "slit 1 (optics) x center" @@ -65,8 +61,7 @@ sl2xc: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl2xs: description: "slit 1 (optics) x size" @@ -79,8 +74,7 @@ sl2xs: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl2yc: description: "slit 1 (optics) y center" @@ -93,8 +87,7 @@ sl2yc: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl2ys: description: "slit 1 (optics) y size" @@ -107,8 +100,7 @@ sl2ys: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch dmmroty: description: "Double Multilayer Monochromator rotation Y" @@ -121,8 +113,7 @@ dmmroty: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch dmmx: description: "Double Multilayer Monochromator, translation X" @@ -135,8 +126,7 @@ dmmx: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch dmmy: description: "Double Multilayer Monochromator, translation Y" @@ -149,8 +139,7 @@ dmmy: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch ccmroty: description: "Channel-cut Monochromator rotation Y" @@ -163,8 +152,7 @@ ccmroty: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch ccmx: description: "Channel-cut Monochromator, translation X" @@ -177,8 +165,7 @@ ccmx: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch # TO BE REVIEWED, REMOVE VELOCITY WITH NEW CLASS! ccm_energy: @@ -196,6 +183,8 @@ ccm_energy: readoutPriority: baseline readOnly: false softwareTrigger: false + deviceTags: + - bl_optics_hutch ########################################################################## ######################## SMARACT STAGES ################################## @@ -222,6 +211,8 @@ xbpm2x: in_position: -1.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 0 + deviceTags: + - bl_optics_hutch xbpm2y: description: X-ray beam position monitor 1 in OPbox @@ -243,6 +234,8 @@ xbpm2y: in_position: -1.0 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 1 + deviceTags: + - bl_optics_hutch scinx: description: scintillator in OPbox @@ -265,6 +258,8 @@ scinx: init_position: -23 bl_smar_stage: 2 in_position: -12.5 + deviceTags: + - bl_optics_hutch # poly: # description: polarizer holder in OPbox @@ -286,6 +281,8 @@ scinx: # # bl_smar_stage to use csaxs reference method. assign number according to axis channel # init_position: -23 # bl_smar_stage: 1 +# deviceTags: +# - bl_optics_hutch # polrot: # description: rotation of crytal of the polarizer @@ -307,6 +304,8 @@ scinx: # in_position: -1.0 # # bl_smar_stage to use csaxs reference method. assign number according to axis channel # bl_smar_stage: 0 +# deviceTags: +# - bl_optics_hutch # 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' @@ -318,6 +317,8 @@ scinx: # readoutPriority: monitored # readOnly: true # softwareTrigger: false +# deviceTags: +# - bl_optics_hutch # my_settable_signal: # description: 'This is an example of a settable Epics signal' # deviceClass: ophyd.EpicsSignal @@ -328,6 +329,8 @@ scinx: # readoutPriority: baseline # readOnly: false # softwareTrigger: false +# deviceTags: +# - bl_optics_hutch #################### ### BPM and polarization diag XBox1 (optics hutch) @@ -348,6 +351,8 @@ galilrioop: readOnly: false readoutPriority: monitored connectionTimeout: 20 + deviceTags: + - bl_optics_hutch # gain_bpm_xbox1: # description: Gain control for BPM XBox1 (OP hutch) @@ -363,6 +368,8 @@ galilrioop: # onFailure: retry # needs: # - galilrioop +# deviceTags: +# - bl_optics_hutch # bpm_xbox1_slowrb: # description: BPM Xbox 1 (OP hutch) readback @@ -377,6 +384,8 @@ galilrioop: # onFailure: retry # needs: # - galilrioop +# deviceTags: +# - bl_optics_hutch gain_diodes_xbox1: description: Gain control for diodes (horizontal and vertical) XBox1 @@ -392,6 +401,8 @@ gain_diodes_xbox1: onFailure: retry needs: - galilrioop + deviceTags: + - bl_optics_hutch diode_horizontal_xbox1_slowrb: description: Slow readback diode horizontal XBox OP (polarization diagnostics) @@ -403,6 +414,8 @@ diode_horizontal_xbox1_slowrb: onFailure: retry needs: - galilrioop + deviceTags: + - bl_optics_hutch diode_vertical_xbox1_slowrb: description: Slow readback diode vertical XBox OP (polarization diagnostics) @@ -414,6 +427,8 @@ diode_vertical_xbox1_slowrb: onFailure: retry needs: - galilrioop + deviceTags: + - bl_optics_hutch sl3xi: description: "slit 2 (optics) x ring" @@ -426,8 +441,7 @@ sl3xi: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl3xo: description: "slit 2 (optics) x wall" @@ -440,8 +454,7 @@ sl3xo: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl3yb: description: "slit 2 (optics) y bottom" @@ -454,8 +467,7 @@ sl3yb: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl3yt: description: "slit 2 (optics) y top" @@ -468,8 +480,7 @@ sl3yt: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl3xc: description: "slit 2 (optics) x center" @@ -482,8 +493,7 @@ sl3xc: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl3xs: description: "slit 2 (optics) x size" @@ -496,8 +506,7 @@ sl3xs: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl3yc: description: "slit 2 (optics) y center" @@ -510,8 +519,7 @@ sl3yc: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch sl3ys: description: "slit 2 (optics) y size" @@ -524,8 +532,7 @@ sl3ys: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvbendu: description: "KB Vertical Focusing Mirror, bender upstream" @@ -538,8 +545,7 @@ kbvbendu: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvbendd: description: "KB Vertical Focusing Mirror, bender downstream" @@ -552,8 +558,7 @@ kbvbendd: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvtrx: description: "KB Vertical Focusing Mirror, translation X" @@ -566,8 +571,7 @@ kbvtrx: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvtry: description: "KB Vertical Focusing Mirror, translation Y" @@ -580,8 +584,7 @@ kbvtry: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvyaw: description: "KB Vertical Focusing Mirror, yaw" @@ -594,8 +597,7 @@ kbvyaw: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvroll: description: "KB Vertical Focusing Mirror, roll" @@ -608,8 +610,7 @@ kbvroll: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvpitch: description: "KB Vertical Focusing Mirror, pitch" @@ -622,8 +623,7 @@ kbvpitch: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvtrxu: description: "KB Vertical Focusing Mirror, translation X upstream" @@ -636,8 +636,7 @@ kbvtrxu: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvtrxd: description: "KB Vertical Focusing Mirror, translation X downstream" @@ -650,8 +649,7 @@ kbvtrxd: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvtryur: description: "KB Vertical Focusing Mirror, translation Y upstream ring" @@ -664,8 +662,7 @@ kbvtryur: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvtryw: description: "KB Vertical Focusing Mirror, translation Y wall" @@ -678,8 +675,7 @@ kbvtryw: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbvtrydr: description: "KB Vertical Focusing Mirror, translation Y downstream ring" @@ -692,8 +688,7 @@ kbvtrydr: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhbendu: description: "KB Horizontal Focusing Mirror, bender upstream" @@ -706,8 +701,7 @@ kbhbendu: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhbendd: description: "KB Horizontal Focusing Mirror, bender downstream" @@ -720,8 +714,7 @@ kbhbendd: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhtrx: description: "KB Horizontal Focusing Mirror, translation X" @@ -734,8 +727,7 @@ kbhtrx: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhtry: description: "KB Horizontal Focusing Mirror, translation Y" @@ -747,12 +739,11 @@ kbhtry: readoutPriority: baseline readOnly: false softwareTrigger: false - deviceTags: - - cSAXS - - optics userParameter: one_reflection: -5.0 two_reflections: -0.95 + deviceTags: + - bl_optics_hutch kbhyaw: description: "KB Horizontal Focusing Mirror, yaw" @@ -765,8 +756,7 @@ kbhyaw: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhroll: description: "KB Horizontal Focusing Mirror, roll" @@ -779,8 +769,7 @@ kbhroll: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhpitch: description: "KB Horizontal Focusing Mirror, pitch" @@ -793,8 +782,7 @@ kbhpitch: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhtrxu: description: "KB Horizontal Focusing Mirror, translation X upstream" @@ -807,8 +795,7 @@ kbhtrxu: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhtrxd: description: "KB Horizontal Focusing Mirror, translation X downstream" @@ -821,8 +808,7 @@ kbhtrxd: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhtryuw: description: "KB Horizontal Focusing Mirror, translation Y upstream wall" @@ -835,8 +821,7 @@ kbhtryuw: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhtryr: description: "KB Horizontal Focusing Mirror, translation Y ring" @@ -849,8 +834,7 @@ kbhtryr: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch kbhtrydw: description: "KB Horizontal Focusing Mirror, translation Y downstream wall" @@ -863,5 +847,4 @@ kbhtrydw: readOnly: false softwareTrigger: false deviceTags: - - cSAXS - - optics + - bl_optics_hutch diff --git a/csaxs_bec/device_configs/machine.yml b/csaxs_bec/device_configs/machine.yml index bf8e5cf..6610aec 100644 --- a/csaxs_bec/device_configs/machine.yml +++ b/csaxs_bec/device_configs/machine.yml @@ -9,6 +9,8 @@ curr: readoutPriority: monitored readOnly: true softwareTrigger: false + deviceTags: + - machine ofb: description: SLS OFB status @@ -21,6 +23,8 @@ ofb: readoutPriority: baseline readOnly: true softwareTrigger: false + deviceTags: + - machine shutter: description: X12SA shutter status @@ -33,6 +37,8 @@ shutter: readoutPriority: baseline readOnly: true softwareTrigger: false + deviceTags: + - machine operator: description: SLS operator messages @@ -43,3 +49,5 @@ operator: readoutPriority: on_request readOnly: true softwareTrigger: false + deviceTags: + - machine diff --git a/csaxs_bec/device_configs/ptycho_flomni.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml index cddb6d4..b8a3f26 100644 --- a/csaxs_bec/device_configs/ptycho_flomni.yaml +++ b/csaxs_bec/device_configs/ptycho_flomni.yaml @@ -23,6 +23,8 @@ feyex: out: -1 fttrx_in: 2.3 fttrx_out: -24 + deviceTags: + - ptycho_flomni feyey: description: Xray eye Y @@ -42,6 +44,8 @@ feyey: connectionTimeout: 20 userParameter: in: -10.09 + deviceTags: + - ptycho_flomni fheater: description: Heater Y deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -58,6 +62,8 @@ fheater: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_flomni foptx: description: Optics X @@ -85,6 +91,8 @@ foptx: #250 micron, 30 nm, Tomas structures # in: -14.5490625 # out: -14.1809 + deviceTags: + - ptycho_flomni fopty: description: Optics Y @@ -112,6 +120,8 @@ fopty: #250 micron, 30 nm, Tomas structures # in: 2.8419921875 # out: 2.8419921875 + deviceTags: + - ptycho_flomni foptz: description: Optics Z @@ -131,6 +141,8 @@ foptz: connectionTimeout: 20 userParameter: in: 23 + deviceTags: + - ptycho_flomni fsamroy: description: Sample rotation @@ -148,6 +160,8 @@ fsamroy: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_flomni fsamx: description: Sample coarse X deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -166,6 +180,8 @@ fsamx: connectionTimeout: 20 userParameter: in: -1.14 + deviceTags: + - ptycho_flomni fsamy: description: Sample coarse Y deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -184,6 +200,8 @@ fsamy: connectionTimeout: 20 userParameter: in: 3 + deviceTags: + - ptycho_flomni ftracky: description: Laser Tracker coarse Y deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -200,6 +218,8 @@ ftracky: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_flomni ftrackz: description: Laser Tracker coarse Z deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -216,6 +236,8 @@ ftrackz: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_flomni ftransx: description: Sample transer X deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -232,6 +254,8 @@ ftransx: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_flomni ftransy: description: Sample transer Y deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -250,6 +274,8 @@ ftransy: connectionTimeout: 20 userParameter: sensor_voltage: -1.6 + deviceTags: + - ptycho_flomni ftransz: description: Sample transer Z deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -266,6 +292,8 @@ ftransz: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_flomni ftray: description: Sample transfer tray deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -282,6 +310,8 @@ ftray: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_flomni ############################################################ @@ -296,6 +326,8 @@ flomni_samples: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - ptycho_flomni ############################################################ #################### flOMNI Smaract motors ################# @@ -330,6 +362,8 @@ fosax: #250 micron, 30 nm, Tomas structures # in: 9.420798 # out: 5.1 + deviceTags: + - ptycho_flomni fosay: description: OSA Y @@ -356,6 +390,8 @@ fosay: # in: -2.3684 #250 micron, 30 nm, Tomas structures # in: -2.383993 + deviceTags: + - ptycho_flomni fosaz: description: OSA Z deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor @@ -382,6 +418,8 @@ fosaz: # micron, 30 nm, 7.9 kev, very close to the sample. make sure foptz is 32.02 or smaller //abe's fzp's # in: 0.5 # out: -5 + deviceTags: + - ptycho_flomni ############################################################ #################### flOMNI RT motors ###################### @@ -407,6 +445,8 @@ rtx: low_signal: 8500 min_signal: 8000 rt_pid_voltage: -0.06219 + deviceTags: + - ptycho_flomni rty: description: flomni rt deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniMotor @@ -425,6 +465,8 @@ rty: connectionTimeout: 20 userParameter: tomo_additional_offsety: 0 + deviceTags: + - ptycho_flomni rtz: description: flomni rt deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniMotor @@ -441,6 +483,8 @@ rtz: readOnly: false readoutPriority: on_request connectionTimeout: 20 + deviceTags: + - ptycho_flomni rt_positions: deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniFlyer @@ -451,6 +495,8 @@ rt_positions: connectionTimeout: 20 enabled: true readOnly: False + deviceTags: + - ptycho_flomni ############################################################ ####################### Cameras ############################ @@ -467,6 +513,8 @@ cam_flomni_gripper: onFailure: buffer readOnly: false readoutPriority: on_request + deviceTags: + - ptycho_flomni cam_flomni_overview: description: Camera flomni overview @@ -479,6 +527,8 @@ cam_flomni_overview: onFailure: buffer readOnly: false readoutPriority: on_request + deviceTags: + - ptycho_flomni cam_xeye: description: Camera flOMNI Xray eye ID1 @@ -496,6 +546,8 @@ cam_xeye: readoutPriority: async userParameter: pixel_calibration: 0.00044247787610619477 # mm/pixel (= 0.05 / 113) + deviceTags: + - ptycho_flomni # cam_ids_rgb: # description: Camera flOMNI Xray eye ID203 # deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera @@ -510,6 +562,8 @@ cam_xeye: # onFailure: buffer # readOnly: false # readoutPriority: async +# deviceTags: +# - ptycho_flomni # ############################################################ @@ -523,6 +577,8 @@ flomni_temphum: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - ptycho_flomni # ############################################################ # ########## OMNY / flOMNI / LamNI fast shutter ############## # REPLACED BY SIMULATED BEAMLINE DEVICE !!!!!!!!!!!!!!!! @@ -535,6 +591,8 @@ flomni_temphum: # onFailure: buffer # readOnly: false # readoutPriority: baseline +# deviceTags: +# - ptycho_flomni ############################################################ #################### GUI Signals ########################### ############################################################ @@ -546,6 +604,8 @@ omny_xray_gui: onFailure: buffer readOnly: false readoutPriority: on_request + deviceTags: + - ptycho_flomni calculated_signal: description: Calculated signal from alignment for fit @@ -555,6 +615,8 @@ calculated_signal: enabled: true readOnly: false readoutPriority: baseline + deviceTags: + - ptycho_flomni ############################################################ #################### OMNY Pandabox ######################### @@ -584,8 +646,8 @@ omny_panda: INENC4.VAL.Mean: interf_st_rotx_mean INENC4.VAL.Min: interf_st_rotx_min PCAP.GATE_DURATION.Value: pcap_gate_duration_value - deviceTags: - - detector enabled: true readOnly: false softwareTrigger: false + deviceTags: + - ptycho_flomni diff --git a/csaxs_bec/device_configs/ptycho_lamni.yaml b/csaxs_bec/device_configs/ptycho_lamni.yaml index 900e0f9..e3d02b9 100644 --- a/csaxs_bec/device_configs/ptycho_lamni.yaml +++ b/csaxs_bec/device_configs/ptycho_lamni.yaml @@ -13,8 +13,6 @@ leyex: - 0 port: 8081 sign: -1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -22,6 +20,8 @@ leyex: connectionTimeout: 20 userParameter: in: 14.117 + deviceTags: + - ptycho_lamni leyey: description: Xray eye Y deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -33,8 +33,6 @@ leyey: - 0 port: 8081 sign: -1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -43,6 +41,8 @@ leyey: userParameter: in: 48.069 out: 0.5 + deviceTags: + - ptycho_lamni loptx: description: Optics X deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -54,8 +54,6 @@ loptx: - 0 port: 8081 sign: 1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -64,6 +62,8 @@ loptx: userParameter: in: -0.244 out: -0.699 + deviceTags: + - ptycho_lamni lopty: description: Optics Y deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -75,8 +75,6 @@ lopty: - 0 port: 8081 sign: 1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -85,6 +83,8 @@ lopty: userParameter: in: 3.724 out: 3.53 + deviceTags: + - ptycho_lamni loptz: description: Optics Z deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -96,13 +96,13 @@ loptz: - 0 port: 8081 sign: -1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_lamni lsamrot: description: Sample rotation deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -114,13 +114,13 @@ lsamrot: - 0 port: 8081 sign: 1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - ptycho_lamni lsamx: description: Sample coarse X deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -132,8 +132,6 @@ lsamx: - 0 port: 8081 sign: -1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -141,6 +139,8 @@ lsamx: connectionTimeout: 20 userParameter: center: 8.768 + deviceTags: + - ptycho_lamni lsamy: description: Sample coarse Y deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -152,8 +152,6 @@ lsamy: - 0 port: 8081 sign: 1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -161,7 +159,8 @@ lsamy: connectionTimeout: 20 userParameter: center: 10.041 - + deviceTags: + - ptycho_lamni ############################################################ ################ LamNI Smaract motors ###################### @@ -178,8 +177,6 @@ losax: - 0 port: 8085 sign: -1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -187,6 +184,8 @@ losax: connectionTimeout: 20 userParameter: in: -1.442 + deviceTags: + - ptycho_lamni losay: description: OSA Y deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor @@ -198,8 +197,6 @@ losay: - 0 port: 8085 sign: -1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -208,6 +205,8 @@ losay: userParameter: in: -0.171 out: 3.8 + deviceTags: + - ptycho_lamni losaz: description: OSA Z deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor @@ -219,8 +218,6 @@ losaz: - 0 port: 8085 sign: 1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -229,6 +226,8 @@ losaz: userParameter: in: -1 out: -3 + deviceTags: + - ptycho_lamni ############################################################ #################### flOMNI RT motors ###################### @@ -242,16 +241,16 @@ rtx: host: mpc2680.psi.ch labels: rtx limits: - - 0 - - 0 + - 0 + - 0 port: 3333 sign: 1 - deviceTags: - - lamni readoutPriority: baseline connectionTimeout: 20 enabled: true readOnly: False + deviceTags: + - ptycho_lamni rty: deviceClass: csaxs_bec.devices.omny.rt.rt_lamni_ophyd.RtLamniMotor deviceConfig: @@ -260,16 +259,16 @@ rty: host: mpc2680.psi.ch labels: rty limits: - - 0 - - 0 + - 0 + - 0 port: 3333 sign: 1 - deviceTags: - - lamni readoutPriority: baseline connectionTimeout: 20 enabled: true readOnly: False + deviceTags: + - ptycho_lamni rt_positions: deviceClass: csaxs_bec.devices.omny.rt.rt_lamni_ophyd.RtLamniFlyer @@ -280,6 +279,8 @@ rt_positions: connectionTimeout: 20 enabled: true readOnly: False + deviceTags: + - ptycho_lamni ############################################################ ######################### Cameras ########################## @@ -299,9 +300,11 @@ cam_xeye: readOnly: false readoutPriority: async userParameter: - pixel_calibration: 0.0009174311926605505 # mm/pixel (= 0.2 / 218) + pixel_calibration: 0.0009174311926605505 # mm/pixel (= 0.2 / 218) ############################################################ + deviceTags: + - ptycho_lamni #################### GUI Signals ########################### ############################################################ omny_xray_gui: @@ -311,4 +314,6 @@ omny_xray_gui: enabled: true onFailure: buffer readOnly: false - readoutPriority: on_request \ No newline at end of file + readoutPriority: on_request + deviceTags: + - ptycho_lamni diff --git a/csaxs_bec/device_configs/ptycho_omny.yaml b/csaxs_bec/device_configs/ptycho_omny.yaml index 4f809a7..ebdfa1e 100755 --- a/csaxs_bec/device_configs/ptycho_omny.yaml +++ b/csaxs_bec/device_configs/ptycho_omny.yaml @@ -13,6 +13,8 @@ cam200: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - ptycho_omny cam201: description: Camera201 @@ -26,6 +28,8 @@ cam201: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - ptycho_omny cam202: description: Camera202 @@ -39,6 +43,8 @@ cam202: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - ptycho_omny cam203: description: Camera203 @@ -52,6 +58,8 @@ cam203: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - ptycho_omny ############################################################ #################### OMNY RT motors ######################## @@ -73,6 +81,8 @@ rtx: userParameter: low_signal: 8500 min_signal: 8000 + deviceTags: + - ptycho_omny rty: description: OMNY rt deviceClass: csaxs_bec.devices.omny.rt.rt_omny_ophyd.RtOMNYMotor @@ -88,6 +98,8 @@ rty: connectionTimeout: 20 userParameter: tomo_additional_offsety: 0 + deviceTags: + - ptycho_omny rtz: description: OMNY rt deviceClass: csaxs_bec.devices.omny.rt.rt_omny_ophyd.RtOMNYMotor @@ -101,6 +113,8 @@ rtz: readOnly: false readoutPriority: on_request connectionTimeout: 20 + deviceTags: + - ptycho_omny rt_positions: deviceClass: csaxs_bec.devices.omny.rt.rt_omny_ophyd.RtOMNYFlyer @@ -111,6 +125,8 @@ rt_positions: connectionTimeout: 20 enabled: true readOnly: False + deviceTags: + - ptycho_omny # ############################################################ # ##################### OMNY samples ######################### @@ -123,6 +139,8 @@ omny_samples: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - ptycho_omny # ############################################################ # ##################### OMNY vacuum ########################## # ############################################################ @@ -134,6 +152,8 @@ omny_samples: # onFailure: buffer # readOnly: false # readoutPriority: baseline +# deviceTags: +# - ptycho_omny # ############################################################ # ##################### OMNY dewar ########################### # ############################################################ @@ -145,6 +165,8 @@ omny_dewar: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - ptycho_omny # ############################################################ # ##################### OMNY temperatures #################### @@ -157,6 +179,8 @@ omny_temperatures: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - ptycho_omny ############################################################ ##################### OMNY Galil motors #################### @@ -172,8 +196,6 @@ ofzpx: - 0 port: 8081 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -181,6 +203,8 @@ ofzpx: connectionTimeout: 20 userParameter: in: -0.4317 + deviceTags: + - ptycho_omny ofzpy: description: FZP Y deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -192,8 +216,6 @@ ofzpy: - 0 port: 8081 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -202,6 +224,8 @@ ofzpy: userParameter: in: 0.7944 out: 0.6377 + deviceTags: + - ptycho_omny ofzpz: description: FZP Z deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -213,8 +237,6 @@ ofzpz: - 0 port: 8081 sign: -1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -222,6 +244,8 @@ ofzpz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny otransx: description: Transfer X deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -233,8 +257,6 @@ otransx: - 0 port: 8081 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -242,6 +264,8 @@ otransx: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny otransy: description: Transfer Y deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -253,8 +277,6 @@ otransy: - 0 port: 8081 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -263,6 +285,8 @@ otransy: userParameter: up_position: -1.2 gripper_sensorvoltagetarget: -2.30 + deviceTags: + - ptycho_omny otransz: description: Transfer Z deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -274,8 +298,6 @@ otransz: - 0 port: 8081 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -283,6 +305,8 @@ otransz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny osamx: description: Sample X deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -294,8 +318,6 @@ osamx: - 0 port: 8082 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -303,6 +325,8 @@ osamx: connectionTimeout: 20 userParameter: in: -0.1 + deviceTags: + - ptycho_omny osamz: description: Sample Z deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -314,8 +338,6 @@ osamz: - 0 port: 8082 sign: 1 - deviceTags: - - omny enabled: false onFailure: buffer readOnly: true @@ -323,6 +345,8 @@ osamz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny oosay: description: OSA Y deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -334,8 +358,6 @@ oosay: - 0 port: 8082 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -344,6 +366,8 @@ oosay: userParameter: near_field_in: 0.531 far_field_in: 0.4122 + deviceTags: + - ptycho_omny oosax: description: OSA X deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -355,8 +379,6 @@ oosax: - 0 port: 8082 sign: -1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -365,6 +387,8 @@ oosax: userParameter: near_field_in: 3.2044 far_field_in: 3.022 + deviceTags: + - ptycho_omny oosaz: description: OSA Z deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -376,8 +400,6 @@ oosaz: - 0 port: 8082 sign: -1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -386,6 +408,8 @@ oosaz: userParameter: near_field_in: -0.4452 far_field_in: 6.5 + deviceTags: + - ptycho_omny oparkz: description: OSA Y deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -397,8 +421,6 @@ oparkz: - 0 port: 8082 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -406,6 +428,8 @@ oparkz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny oshuttleopen: description: Shuttle opener deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -417,8 +441,6 @@ oshuttleopen: - 0 port: 8082 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: true @@ -426,6 +448,8 @@ oshuttleopen: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny oshuttlealign: description: Shuttle aligner deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -437,8 +461,6 @@ oshuttlealign: - 0 port: 8082 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: true @@ -446,6 +468,8 @@ oshuttlealign: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny osamy: description: Sample Y deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -457,8 +481,6 @@ osamy: - 0 port: 8083 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -466,6 +488,8 @@ osamy: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny otracky: description: Laser Tracker Y deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -477,8 +501,6 @@ otracky: - 0 port: 8083 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -486,6 +508,8 @@ otracky: connectionTimeout: 20 userParameter: start_pos: -4.3431 + deviceTags: + - ptycho_omny osamroy: description: Sample rotation deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -497,8 +521,6 @@ osamroy: - 0 port: 8083 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -506,6 +528,8 @@ osamroy: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - ptycho_omny otrackz: description: Laser Tracker Z deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -517,8 +541,6 @@ otrackz: - 0 port: 8083 sign: -1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -526,6 +548,8 @@ otrackz: connectionTimeout: 20 userParameter: start_pos: -0.6948 + deviceTags: + - ptycho_omny oeyex: description: Xray eye X deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -537,8 +561,6 @@ oeyex: - 0 port: 8083 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -546,6 +568,8 @@ oeyex: connectionTimeout: 20 userParameter: xray_in: -45.7394 + deviceTags: + - ptycho_omny oeyez: description: Xray eye Z deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -557,8 +581,6 @@ oeyez: - 0 port: 8083 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -566,6 +588,8 @@ oeyez: connectionTimeout: 20 userParameter: xray_in: -2 + deviceTags: + - ptycho_omny oeyey: description: Xray eye Y deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor @@ -577,8 +601,6 @@ oeyey: - 0 port: 8083 sign: 1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -586,6 +608,8 @@ oeyey: connectionTimeout: 20 userParameter: xray_in: 0.0229 + deviceTags: + - ptycho_omny ############################################################ #################### flOMNI Smaract motors ################# @@ -609,6 +633,8 @@ ocsx: connectionTimeout: 20 userParameter: nothing: 0 + deviceTags: + - ptycho_omny ocsy: description: Central Stop Y deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor @@ -627,6 +653,8 @@ ocsy: connectionTimeout: 20 userParameter: nothing: 0 + deviceTags: + - ptycho_omny oshield: description: Thermal Shield Sample Stage deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor @@ -645,3 +673,5 @@ oshield: connectionTimeout: 20 userParameter: nothing: 0 + deviceTags: + - ptycho_omny diff --git a/csaxs_bec/device_configs/sastt.yaml b/csaxs_bec/device_configs/sastt.yaml index d1b7118..5777e4f 100644 --- a/csaxs_bec/device_configs/sastt.yaml +++ b/csaxs_bec/device_configs/sastt.yaml @@ -9,13 +9,12 @@ samx: backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 1 - deviceTags: - - cSAXS - - owis_samx onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - sastt samy: description: Owis motor stage samy deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -27,13 +26,12 @@ samy: backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 - deviceTags: - - cSAXS - - owis_samx onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - sastt rotx: description: Rotation stage rotx deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -46,15 +44,14 @@ rotx: acceleration: 0.2 user_offset_dir: 1 limits: - - -0.1 - - 0.1 - deviceTags: - - cSAXS - - rotx + - -0.1 + - 0.1 onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - sastt roty: description: Rotation stage roty deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -67,15 +64,14 @@ roty: acceleration: 0.2 user_offset_dir: 0 limits: - - -0.1 - - 0.1 - deviceTags: - - cSAXS - - roty + - -0.1 + - 0.1 onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - sastt micfoc: description: Focusing motor of Microscope stage deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -87,11 +83,9 @@ micfoc: backlash_distance: 0.125 acceleration: 0.4 user_offset_dir: 0 - deviceTags: - - cSAXS - - micfoc onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false - + deviceTags: + - sastt diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_flomni.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_flomni.yaml index 5deb8c7..6632fd0 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_flomni.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_flomni.yaml @@ -8,6 +8,8 @@ ddg1: readOnly: false readoutPriority: baseline softwareTrigger: true + deviceTags: + - simulated_bl_endstation_flomni fsh: description: Simulated fast shutter manual control and readback deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.cSAXSSimulatedFastShutter @@ -16,6 +18,8 @@ fsh: onFailure: raise enabled: true readoutPriority: monitored + deviceTags: + - simulated_bl_endstation_flomni flomni: - !include ../ptycho_flomni.yaml diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_lamni.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_lamni.yaml index 4442b48..2217767 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_lamni.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_bl_endstation_lamni.yaml @@ -8,6 +8,8 @@ ddg1: readOnly: false readoutPriority: baseline softwareTrigger: true + deviceTags: + - simulated_bl_endstation_lamni fsh: description: Simulated fast shutter manual control and readback deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.cSAXSSimulatedFastShutter @@ -16,6 +18,8 @@ fsh: onFailure: raise enabled: true readoutPriority: monitored + deviceTags: + - simulated_bl_endstation_lamni flomni: - !include ../ptycho_lamni.yaml diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_flomni.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_flomni.yaml index 7591e75..6e4e185 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_flomni.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_flomni.yaml @@ -27,6 +27,8 @@ omny_xray_gui: onFailure: buffer readOnly: false readoutPriority: on_request + deviceTags: + - simulated_flomni ############################################################ #################### flOMNI Galil motors ################### @@ -56,6 +58,8 @@ feyex: out: -1 fttrx_in: 2.3 fttrx_out: -24 + deviceTags: + - simulated_flomni feyey: description: Xray eye Y (simulated) @@ -78,6 +82,8 @@ feyey: connectionTimeout: 20 userParameter: in: -10.09 + deviceTags: + - simulated_flomni fheater: description: Heater Y (simulated) @@ -98,6 +104,8 @@ fheater: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_flomni foptx: description: Optics X (simulated) @@ -122,6 +130,8 @@ foptx: #170 micron, 60 nm in: -13.831 out: -13.831 + deviceTags: + - simulated_flomni fopty: description: Optics Y (simulated) @@ -146,6 +156,8 @@ fopty: #170 micron, 60 nm in: 0.42 out: 0.57 + deviceTags: + - simulated_flomni foptz: description: Optics Z (simulated) @@ -168,6 +180,8 @@ foptz: connectionTimeout: 20 userParameter: in: 23 + deviceTags: + - simulated_flomni fsamroy: description: Sample rotation (simulated) @@ -187,6 +201,8 @@ fsamroy: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_flomni fsamx: description: Sample coarse X (simulated) @@ -209,6 +225,8 @@ fsamx: connectionTimeout: 20 userParameter: in: -1.14 + deviceTags: + - simulated_flomni fsamy: description: Sample coarse Y (simulated) @@ -231,6 +249,8 @@ fsamy: connectionTimeout: 20 userParameter: in: 3 + deviceTags: + - simulated_flomni ftracky: description: Laser Tracker coarse Y (simulated) @@ -251,6 +271,8 @@ ftracky: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_flomni ftrackz: description: Laser Tracker coarse Z (simulated) @@ -271,6 +293,8 @@ ftrackz: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_flomni ftransx: description: Sample transer X (simulated) @@ -291,6 +315,8 @@ ftransx: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_flomni ftransy: description: Sample transer Y (simulated) @@ -315,6 +341,8 @@ ftransy: connectionTimeout: 20 userParameter: sensor_voltage: -1.6 + deviceTags: + - simulated_flomni ftransz: description: Sample transer Z (simulated) @@ -335,6 +363,8 @@ ftransz: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_flomni ftray: description: Sample transfer tray (simulated) @@ -357,6 +387,8 @@ ftray: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_flomni ############################################################ #################### flOMNI Smaract motors ################# @@ -384,6 +416,8 @@ fosax: #170 micron, 60 nm, 7.9 kev in: 8.727079 out: 5.1 + deviceTags: + - simulated_flomni fosay: description: OSA Y (simulated) @@ -406,6 +440,8 @@ fosay: userParameter: #170 micron, 60 nm, 7.9 kev in: -0.04603 + deviceTags: + - simulated_flomni fosaz: description: OSA Z (simulated) @@ -429,6 +465,8 @@ fosaz: #170 micron, 60 nm, 7.9 kev, foptz 16.9, probe size 7.5 mu in: 13.1 out: 6 + deviceTags: + - simulated_flomni ############################################################ #################### flOMNI RT motors ###################### @@ -454,6 +492,8 @@ rtx: low_signal: 8500 min_signal: 8000 rt_pid_voltage: -0.06219 + deviceTags: + - simulated_flomni rty: description: flomni rt (simulated) @@ -473,6 +513,8 @@ rty: connectionTimeout: 20 userParameter: tomo_additional_offsety: 0 + deviceTags: + - simulated_flomni rtz: description: flomni rt (simulated) @@ -490,6 +532,8 @@ rtz: readOnly: false readoutPriority: on_request connectionTimeout: 20 + deviceTags: + - simulated_flomni rt_positions: deviceClass: csaxs_bec.devices.sim.sim_rt_flomni.SimRtFlomniFlyer @@ -502,6 +546,8 @@ rt_positions: connectionTimeout: 20 enabled: true readOnly: False + deviceTags: + - simulated_flomni ############################################################ ####################### Cameras ############################ @@ -520,6 +566,8 @@ cam_flomni_gripper: onFailure: buffer readOnly: false readoutPriority: on_request + deviceTags: + - simulated_flomni cam_flomni_overview: description: Camera flomni overview (simulated) @@ -534,6 +582,8 @@ cam_flomni_overview: onFailure: buffer readOnly: false readoutPriority: on_request + deviceTags: + - simulated_flomni cam_xeye: description: Camera flOMNI Xray eye ID1 (simulated) @@ -553,6 +603,8 @@ cam_xeye: readoutPriority: async userParameter: pixel_calibration: 0.00044247787610619477 # mm/pixel (= 0.05 / 113) + deviceTags: + - simulated_flomni ############################################################ #################### Sample storage ######################## @@ -572,6 +624,8 @@ flomni_samples: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - simulated_flomni ############################################################ #################### Computed signal ####################### @@ -585,6 +639,8 @@ calculated_signal: enabled: true readOnly: false readoutPriority: baseline + deviceTags: + - simulated_flomni ############################################################ ######### Simulated beamline devices (shutter, DDG) ######## @@ -600,6 +656,8 @@ ddg1: readOnly: false readoutPriority: baseline softwareTrigger: true + deviceTags: + - simulated_flomni fsh: description: Simulated fast shutter manual control and readback @@ -609,3 +667,5 @@ fsh: onFailure: raise enabled: true readoutPriority: monitored + deviceTags: + - simulated_flomni diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_lamni.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_lamni.yaml index e2459d2..ec81460 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_lamni.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_lamni.yaml @@ -18,8 +18,6 @@ leyex: sim_stppermm: 12800 sim_velocity: 3 sim_initial_position: 14.117 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -27,6 +25,8 @@ leyex: connectionTimeout: 20 userParameter: in: 14.117 + deviceTags: + - simulated_lamni leyey: description: Xray eye Y deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -41,8 +41,6 @@ leyey: sim_stppermm: 12800 sim_velocity: 3 sim_initial_position: 48.069 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -51,6 +49,8 @@ leyey: userParameter: in: 48.069 out: 0.5 + deviceTags: + - simulated_lamni loptx: description: Optics X deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -66,8 +66,6 @@ loptx: sim_encpermm: 10000 sim_velocity: 0.5 sim_initial_position: -0.244 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -76,6 +74,8 @@ loptx: userParameter: in: -0.244 out: -0.699 + deviceTags: + - simulated_lamni lopty: description: Optics Y deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -91,8 +91,6 @@ lopty: sim_encpermm: 30000 sim_velocity: 0.5 sim_initial_position: 3.724 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -101,6 +99,8 @@ lopty: userParameter: in: 3.724 out: 3.53 + deviceTags: + - simulated_lamni loptz: description: Optics Z deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -116,13 +116,13 @@ loptz: sim_encpermm: 10000 sim_velocity: 1 sim_initial_position: 0 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_lamni lsamrot: description: Sample rotation deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -138,13 +138,13 @@ lsamrot: sim_encpermm: 36000 sim_velocity: 48 #4x than hw sim_initial_position: 0 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - simulated_lamni lsamx: description: Sample coarse X deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -160,8 +160,6 @@ lsamx: sim_encpermm: 2000 sim_velocity: 3 sim_initial_position: 8.768 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -169,6 +167,8 @@ lsamx: connectionTimeout: 20 userParameter: center: 8.768 + deviceTags: + - simulated_lamni lsamy: description: Sample coarse Y deviceClass: csaxs_bec.devices.sim.sim_lamni.SimLamniGalilMotor @@ -184,8 +184,6 @@ lsamy: sim_encpermm: 2000 sim_velocity: 3 sim_initial_position: 10.041 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -193,6 +191,8 @@ lsamy: connectionTimeout: 20 userParameter: center: 10.041 + deviceTags: + - simulated_lamni losax: description: OSA X deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -205,8 +205,6 @@ losax: port: 8085 sign: -1 sim_initial_position: -1.442 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -214,6 +212,8 @@ losax: connectionTimeout: 20 userParameter: in: -1.442 + deviceTags: + - simulated_lamni losay: description: OSA Y deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -226,8 +226,6 @@ losay: port: 8085 sign: -1 sim_initial_position: -0.171 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -236,6 +234,8 @@ losay: userParameter: in: -0.171 out: 3.8 + deviceTags: + - simulated_lamni losaz: description: OSA Z deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -248,8 +248,6 @@ losaz: port: 8085 sign: 1 sim_initial_position: -1 - deviceTags: - - lamni enabled: true onFailure: buffer readOnly: false @@ -258,6 +256,8 @@ losaz: userParameter: in: -1 out: -3 + deviceTags: + - simulated_lamni rtx: deviceClass: csaxs_bec.devices.sim.sim_lamni.SimRtLamniMotor deviceConfig: @@ -278,12 +278,12 @@ rtx: y_axis: 1 y_sign: 1 y_center: 10.041 - deviceTags: - - lamni readoutPriority: baseline connectionTimeout: 20 enabled: true readOnly: false + deviceTags: + - simulated_lamni rty: deviceClass: csaxs_bec.devices.sim.sim_lamni.SimRtLamniMotor deviceConfig: @@ -297,12 +297,12 @@ rty: port: 3333 sign: 1 sim_coarse_coupling: *id001 - deviceTags: - - lamni readoutPriority: baseline connectionTimeout: 20 enabled: true readOnly: false + deviceTags: + - simulated_lamni rt_positions: deviceClass: csaxs_bec.devices.sim.sim_lamni.SimRtLamniFlyer deviceConfig: @@ -314,6 +314,8 @@ rt_positions: connectionTimeout: 20 enabled: true readOnly: false + deviceTags: + - simulated_lamni cam_xeye: description: Camera LamNI Xray eye ID15 deviceClass: csaxs_bec.devices.sim.sim_cameras.SimIDSCamera @@ -330,6 +332,8 @@ cam_xeye: readoutPriority: async userParameter: pixel_calibration: 0.0009174311926605505 # mm/pixel (= 0.2 / 218) + deviceTags: + - simulated_lamni ddg1: description: Simulated main delay generator for triggering deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.SimulatedDDG1 @@ -340,6 +344,8 @@ ddg1: readOnly: false readoutPriority: baseline softwareTrigger: true + deviceTags: + - simulated_lamni fsh: description: Simulated fast shutter manual control and readback deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.cSAXSSimulatedFastShutter @@ -348,6 +354,8 @@ fsh: onFailure: raise enabled: true readoutPriority: monitored + deviceTags: + - simulated_lamni ############################################################ #################### GUI Signals ########################### @@ -359,4 +367,6 @@ omny_xray_gui: enabled: true onFailure: buffer readOnly: false - readoutPriority: on_request \ No newline at end of file + readoutPriority: on_request + deviceTags: + - simulated_lamni diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml index d8bdb3c..8c38760 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml @@ -16,6 +16,8 @@ cam200: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - simulated_omny cam201: description: Camera201 deviceClass: csaxs_bec.devices.sim.sim_cameras.SimIDSCamera @@ -28,6 +30,8 @@ cam201: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - simulated_omny cam202: description: Camera202 deviceClass: csaxs_bec.devices.sim.sim_cameras.SimIDSCamera @@ -40,6 +44,8 @@ cam202: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - simulated_omny cam203: description: Camera203 deviceClass: csaxs_bec.devices.sim.sim_cameras.SimIDSCamera @@ -52,6 +58,8 @@ cam203: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - simulated_omny rtx: description: OMNY rt deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYMotor @@ -68,6 +76,8 @@ rtx: userParameter: low_signal: 8500 min_signal: 8000 + deviceTags: + - simulated_omny rty: description: OMNY rt deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYMotor @@ -83,6 +93,8 @@ rty: connectionTimeout: 20 userParameter: tomo_additional_offsety: 0 + deviceTags: + - simulated_omny rtz: description: OMNY rt deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYMotor @@ -96,6 +108,8 @@ rtz: readOnly: false readoutPriority: on_request connectionTimeout: 20 + deviceTags: + - simulated_omny rt_positions: deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYFlyer deviceConfig: @@ -106,6 +120,8 @@ rt_positions: connectionTimeout: 20 enabled: true readOnly: false + deviceTags: + - simulated_omny omny_samples: description: OMNYSampleStorage deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYSampleStorage @@ -114,6 +130,8 @@ omny_samples: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - simulated_omny omny_dewar: description: OMNY Dewar Information deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYDewar @@ -122,6 +140,8 @@ omny_dewar: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - simulated_omny omny_temperatures: description: OMNY Temperatures and pressures deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYTemperatures @@ -130,6 +150,8 @@ omny_temperatures: onFailure: buffer readOnly: false readoutPriority: baseline + deviceTags: + - simulated_omny ofzpx: description: FZP X deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -142,8 +164,6 @@ ofzpx: port: 8081 sign: 1 sim_initial_position: -0.4317 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -151,6 +171,8 @@ ofzpx: connectionTimeout: 20 userParameter: in: -0.4317 + deviceTags: + - simulated_omny ofzpy: description: FZP Y deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -163,8 +185,6 @@ ofzpy: port: 8081 sign: 1 sim_initial_position: 0.7944 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -173,6 +193,8 @@ ofzpy: userParameter: in: 0.7944 out: 0.6377 + deviceTags: + - simulated_omny ofzpz: description: FZP Z deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -185,8 +207,6 @@ ofzpz: port: 8081 sign: -1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -194,6 +214,8 @@ ofzpz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny otransx: description: Transfer X deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -206,8 +228,6 @@ otransx: port: 8081 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -215,6 +235,8 @@ otransx: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny otransy: description: Transfer Y deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -227,8 +249,6 @@ otransy: port: 8081 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -237,6 +257,8 @@ otransy: userParameter: up_position: -1.2 gripper_sensorvoltagetarget: -2.3 + deviceTags: + - simulated_omny otransz: description: Transfer Z deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -249,8 +271,6 @@ otransz: port: 8081 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -258,6 +278,8 @@ otransz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny osamx: description: Sample X deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -270,8 +292,6 @@ osamx: port: 8082 sign: 1 sim_initial_position: -0.1 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -279,6 +299,8 @@ osamx: connectionTimeout: 20 userParameter: in: -0.1 + deviceTags: + - simulated_omny osamz: description: Sample Z deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -291,8 +313,6 @@ osamz: port: 8082 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: false onFailure: buffer readOnly: true @@ -300,6 +320,8 @@ osamz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny oosay: description: OSA Y deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -312,8 +334,6 @@ oosay: port: 8082 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -322,6 +342,8 @@ oosay: userParameter: near_field_in: 0.531 far_field_in: 0.4122 + deviceTags: + - simulated_omny oosax: description: OSA X deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -334,8 +356,6 @@ oosax: port: 8082 sign: -1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -344,6 +364,8 @@ oosax: userParameter: near_field_in: 3.2044 far_field_in: 3.022 + deviceTags: + - simulated_omny oosaz: description: OSA Z deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -356,8 +378,6 @@ oosaz: port: 8082 sign: -1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -366,6 +386,8 @@ oosaz: userParameter: near_field_in: -0.4452 far_field_in: 6.5 + deviceTags: + - simulated_omny oparkz: description: OSA Y deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -378,8 +400,6 @@ oparkz: port: 8082 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -387,6 +407,8 @@ oparkz: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny oshuttleopen: description: Shuttle opener deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -399,8 +421,6 @@ oshuttleopen: port: 8082 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: true @@ -408,6 +428,8 @@ oshuttleopen: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny oshuttlealign: description: Shuttle aligner deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -420,8 +442,6 @@ oshuttlealign: port: 8082 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: true @@ -429,6 +449,8 @@ oshuttlealign: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny osamy: description: Sample Y deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -441,8 +463,6 @@ osamy: port: 8083 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -450,6 +470,8 @@ osamy: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny otracky: description: Laser Tracker Y deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -462,8 +484,6 @@ otracky: port: 8083 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -471,6 +491,8 @@ otracky: connectionTimeout: 20 userParameter: start_pos: -4.3431 + deviceTags: + - simulated_omny osamroy: description: Sample rotation deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -483,8 +505,6 @@ osamroy: port: 8083 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -492,6 +512,8 @@ osamroy: connectionTimeout: 20 userParameter: in: 0 + deviceTags: + - simulated_omny otrackz: description: Laser Tracker Z deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -504,8 +526,6 @@ otrackz: port: 8083 sign: -1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -513,6 +533,8 @@ otrackz: connectionTimeout: 20 userParameter: start_pos: -0.6948 + deviceTags: + - simulated_omny oeyex: description: Xray eye X deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -525,8 +547,6 @@ oeyex: port: 8083 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -534,6 +554,8 @@ oeyex: connectionTimeout: 20 userParameter: xray_in: -45.7394 + deviceTags: + - simulated_omny oeyez: description: Xray eye Z deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -546,8 +568,6 @@ oeyez: port: 8083 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -555,6 +575,8 @@ oeyez: connectionTimeout: 20 userParameter: xray_in: -2 + deviceTags: + - simulated_omny oeyey: description: Xray eye Y deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor @@ -567,8 +589,6 @@ oeyey: port: 8083 sign: 1 sim_initial_position: 0 - deviceTags: - - omny enabled: true onFailure: buffer readOnly: false @@ -576,6 +596,8 @@ oeyey: connectionTimeout: 20 userParameter: xray_in: 0.0229 + deviceTags: + - simulated_omny ocsx: description: Central Stop X deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -595,6 +617,8 @@ ocsx: connectionTimeout: 20 userParameter: nothing: 0 + deviceTags: + - simulated_omny ocsy: description: Central Stop Y deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -614,6 +638,8 @@ ocsy: connectionTimeout: 20 userParameter: nothing: 0 + deviceTags: + - simulated_omny oshield: description: Thermal Shield Sample Stage deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor @@ -633,6 +659,8 @@ oshield: connectionTimeout: 20 userParameter: nothing: 0 + deviceTags: + - simulated_omny ddg1: description: Simulated main delay generator for triggering @@ -644,6 +672,8 @@ ddg1: readOnly: false readoutPriority: baseline softwareTrigger: true + deviceTags: + - simulated_omny fsh: description: Simulated fast shutter manual control and readback deviceClass: csaxs_bec.devices.sim.simulated_beamline_devices.cSAXSSimulatedFastShutter @@ -652,3 +682,5 @@ fsh: onFailure: raise enabled: true readoutPriority: monitored + deviceTags: + - simulated_omny diff --git a/csaxs_bec/device_configs/test_config.yaml b/csaxs_bec/device_configs/test_config.yaml index b269875..95ae587 100644 --- a/csaxs_bec/device_configs/test_config.yaml +++ b/csaxs_bec/device_configs/test_config.yaml @@ -8,6 +8,8 @@ galilrioesxbox: readOnly: false readoutPriority: baseline connectionTimeout: 20 + deviceTags: + - test_config bpm1: readoutPriority: baseline deviceClass: csaxs_bec.devices.pseudo_devices.bpm.BPM @@ -21,4 +23,6 @@ bpm1: softwareTrigger: true needs: - galilrioesxbox + deviceTags: + - test_config diff --git a/csaxs_bec/device_configs/user_setup.yaml b/csaxs_bec/device_configs/user_setup.yaml index 6129d05..0448ebb 100644 --- a/csaxs_bec/device_configs/user_setup.yaml +++ b/csaxs_bec/device_configs/user_setup.yaml @@ -13,13 +13,12 @@ eyex: backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 - deviceTags: - - cSAXS - - owis_eyex onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - user_setup eyey: description: Owis motor stage samx deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -31,13 +30,12 @@ eyey: backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 - deviceTags: - - cSAXS - - owis_eyey onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - user_setup samx: description: Owis motor stage samx deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -49,13 +47,12 @@ samx: backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 - deviceTags: - - cSAXS - - owis_samx onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - user_setup samy: description: Owis motor stage samx deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -67,13 +64,12 @@ samy: backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 - deviceTags: - - cSAXS - - owis_samy onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - user_setup # samx: # description: Owis motor stage samx # deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -85,13 +81,12 @@ samy: # backlash_distance: 0.0125 # acceleration: 0.2 # user_offset_dir: 0 -# deviceTags: -# - cSAXS -# - owis_samx # onFailure: buffer # enabled: true # readoutPriority: baseline # softwareTrigger: false +# deviceTags: +# - user_setup # samy: # description: Owis motor stage samx # deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME @@ -103,13 +98,12 @@ samy: # backlash_distance: 0.0125 # acceleration: 0.2 # user_offset_dir: 0 -# deviceTags: -# - cSAXS -# - owis_samx # onFailure: buffer # enabled: true # readoutPriority: baseline # softwareTrigger: false +# deviceTags: +# - user_setup # eye_cam: # description: Camera Microscope # deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera @@ -124,6 +118,8 @@ samy: # onFailure: buffer # readOnly: false # readoutPriority: async +# deviceTags: +# - user_setup smarx: description: sample position x with smaract deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor @@ -146,6 +142,8 @@ smarx: #init_position: 0 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 6 + deviceTags: + - user_setup smary: description: sample position y with smaract deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor @@ -167,4 +165,6 @@ smary: userParameter: #init_position: 0 # bl_smar_stage to use csaxs reference method. assign number according to axis channel - bl_smar_stage: 7 \ No newline at end of file + bl_smar_stage: 7 + deviceTags: + - user_setup diff --git a/csaxs_bec/device_configs/user_template.yaml b/csaxs_bec/device_configs/user_template.yaml index 6a85f8e..c8968a3 100644 --- a/csaxs_bec/device_configs/user_template.yaml +++ b/csaxs_bec/device_configs/user_template.yaml @@ -12,13 +12,12 @@ samx: backlash_distance: 0.125 acceleration: 0.2 user_offset_dir: 0 - deviceTags: - - cSAXS - - owis_samx onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - user_template ############################################################ ########### OWIS LTM80 with micro-stepping ################# ############################################################ @@ -33,13 +32,12 @@ samy: backlash_distance: 0.0125 acceleration: 0.2 user_offset_dir: 0 - deviceTags: - - cSAXS - - owis_samx onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - user_template ############################################################ #################### OWIS Rotation DMT65 ################### ############################################################ @@ -57,13 +55,12 @@ rotx: limits: - -0.1 - 0.1 - deviceTags: - - cSAXS - - rotx onFailure: buffer enabled: true readoutPriority: baseline softwareTrigger: false + deviceTags: + - user_template ############################################################ @@ -88,7 +85,7 @@ npx: readoutPriority: baseline connectionTimeout: 20 deviceTags: - - npoint + - user_template npy: description: nPoint y axis on the big (3-axis) npoint controller deviceClass: csaxs_bec.devices.npoint.npoint.NPointAxis @@ -107,7 +104,7 @@ npy: readoutPriority: baseline connectionTimeout: 20 deviceTags: - - npoint + - user_template np2x: description: nPoint x axis on the small (2-axis) npoint controller deviceClass: csaxs_bec.devices.npoint.npoint.NPointAxis @@ -126,7 +123,7 @@ np2x: readoutPriority: baseline connectionTimeout: 20 deviceTags: - - npoint + - user_template ############################################################ #################### IDS camera ############################ @@ -145,6 +142,8 @@ test_cam_mic: onFailure: buffer readOnly: false readoutPriority: async + deviceTags: + - user_template ############################################################ ####################### Smaract ############################ @@ -170,4 +169,6 @@ xbpm3x: userParameter: init_position: -22.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel - bl_smar_stage: 0 \ No newline at end of file + bl_smar_stage: 0 + deviceTags: + - user_template