diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml index ffc291b..f038221 100644 --- a/csaxs_bec/device_configs/bl_endstation.yaml +++ b/csaxs_bec/device_configs/bl_endstation.yaml @@ -72,7 +72,7 @@ xbpm3x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -95,7 +95,7 @@ xbpm3y: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -118,7 +118,7 @@ sl3trxi: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -141,7 +141,7 @@ sl3trxo: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -164,7 +164,7 @@ sl3trxb: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -187,7 +187,7 @@ sl3trxt: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -210,7 +210,7 @@ fast_shutter_n1_x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -234,7 +234,7 @@ fast_shutter_o1_x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -257,7 +257,7 @@ fast_shutter_o2_x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -280,7 +280,7 @@ filter_array_1_x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -303,7 +303,7 @@ filter_array_2_x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -326,7 +326,7 @@ filter_array_3_x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -349,7 +349,7 @@ filter_array_4_x: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -372,7 +372,7 @@ sl4trxi: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -395,7 +395,7 @@ sl4trxo: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -418,7 +418,7 @@ sl4trxb: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -441,7 +441,7 @@ sl4trxt: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -466,7 +466,7 @@ sl5trxi: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -489,7 +489,7 @@ sl5trxo: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -512,7 +512,7 @@ sl5trxb: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -535,7 +535,7 @@ sl5trxt: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -558,7 +558,7 @@ xbimtrx: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -581,7 +581,7 @@ xbimtry: # precision: 3 # tolerance: 0.005 enabled: true - onFailure: buffer + onFailure: retry readOnly: false readoutPriority: baseline connectionTimeout: 20 @@ -589,3 +589,237 @@ xbimtry: init_position: 0 # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 1 + + + +################### XBOX related ################### +# we assue the epics settings for resolution, velocity etc. are correct +# we do not overwrite from here + +aptrx: + description: Aperture pinhole X + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME + deviceConfig: + prefix: X12SA-ES1-PIN1:TRX1 + deviceTags: + - cSAXS_ES + onFailure: retry + enabled: true + readoutPriority: baseline + softwareTrigger: false + +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 + +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 + +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 + +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 + +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 + softwareTrigger: false + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +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 \ No newline at end of file diff --git a/csaxs_bec/device_configs/bl_optics_hutch.yaml b/csaxs_bec/device_configs/bl_optics_hutch.yaml index 5dcf9f9..98f39eb 100644 --- a/csaxs_bec/device_configs/bl_optics_hutch.yaml +++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml @@ -68,91 +68,106 @@ ccmx: - cSAXS - optics +# ccm_energy: +# readoutPriority: baseline +# deviceClass: ophyd_devices.devices.simple_positioner.PSIPositionerBase +# prefix: "X12SA-OP-CCM1:" +# override_suffixes: +# user_readback: "ENERGY-GET" +# user_setpoint: "ENERGY-SET" +# velocity: "ROTY:VELO" +# deviceTags: +# - user motors +# enabled: true +# readOnly: false + ########################################################################## ######################## SMARACT STAGES ################################## ########################################################################## -xbpm2x: - 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 - connectionTimeout: 20 - userParameter: - # bl_smar_stage to use csaxs reference method. assign number according to axis channel - bl_smar_stage: 0 +# xbpm2x: +# 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 +# connectionTimeout: 20 +# userParameter: +# # bl_smar_stage to use csaxs reference method. assign number according to axis channel +# bl_smar_stage: 0 -xbpm2y: - 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 - connectionTimeout: 20 - userParameter: - # bl_smar_stage to use csaxs reference method. assign number according to axis channel - bl_smar_stage: 1 +# xbpm2y: +# 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 +# connectionTimeout: 20 +# userParameter: +# # bl_smar_stage to use csaxs reference method. assign number according to axis channel +# bl_smar_stage: 1 + +# 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 +# connectionTimeout: 20 +# userParameter: +# # bl_smar_stage to use csaxs reference method. assign number according to axis channel +# bl_smar_stage: 2 + +# 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 +# connectionTimeout: 20 +# userParameter: +# # bl_smar_stage to use csaxs reference method. assign number according to axis channel +# bl_smar_stage: 3 -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 - connectionTimeout: 20 - userParameter: - # bl_smar_stage to use csaxs reference method. assign number according to axis channel - bl_smar_stage: 2 -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 - connectionTimeout: 20 - userParameter: - # bl_smar_stage to use csaxs reference method. assign number according to axis channel - bl_smar_stage: 3 # dmm1_trx_readback_example: # This is the same template as for i.e. bpm4i diff --git a/csaxs_bec/device_configs/ptycho_flomni.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml index 060a93a..b905ad7 100644 --- a/csaxs_bec/device_configs/ptycho_flomni.yaml +++ b/csaxs_bec/device_configs/ptycho_flomni.yaml @@ -395,7 +395,7 @@ rtz: readoutPriority: on_request connectionTimeout: 20 -rt_flyer: +omny_positions: deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniFlyer deviceConfig: host: mpc2844.psi.ch @@ -522,6 +522,18 @@ omny_panda: FMC_IN.VAL2.Min: cap_voltage_fzp_x_min FMC_IN.VAL2.Max: cap_voltage_fzp_x_max FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean + INENC1_VAL_Max: interf_st_fzp_y_max + INENC1_VAL_Mean: interf_st_fzp_y_mean + INENC1_VAL_Min: interf_st_fzp_y_min + INENC2_VAL_Max: interf_st_fzp_x_max + INENC2_VAL_Mean: interf_st_fzp_x_mean + INENC2_VAL_Min: interf_st_fzp_x_min + INENC3_VAL_Max: interf_st_rotz_max + INENC3_VAL_Mean: interf_st_rotz_mean + INENC3_VAL_Min: interf_st_rotz_min + INENC4_VAL_Max: interf_st_rotx_max + INENC4_VAL_Mean: interf_st_rotx_mean + INENC4_VAL_Min: interf_st_rotx_min deviceTags: - detector enabled: true