diff --git a/pxiii_bec/bec_widgets/auto_updates.py b/pxiii_bec/bec_widgets/auto_updates.py index 543fde8..89cb7ff 100644 --- a/pxiii_bec/bec_widgets/auto_updates.py +++ b/pxiii_bec/bec_widgets/auto_updates.py @@ -56,6 +56,8 @@ class PlotUpdate(AutoUpdates): plt1.set(title=f"PXIII: Scan {info.scan_number}", x_label=dev_x, y_label=dev_y) except RPCResponseTimeoutError: pass + except AttributeError: + pass # plt1.add_dap(dev_x, dev_y, dap="LinearModel") def handler(self, info: ScanInfo) -> None: diff --git a/pxiii_bec/device_configs/x06da_device_config.yaml b/pxiii_bec/device_configs/x06da_device_config.yaml index 818b7d6..c5fda49 100644 --- a/pxiii_bec/device_configs/x06da_device_config.yaml +++ b/pxiii_bec/device_configs/x06da_device_config.yaml @@ -1,3 +1,36 @@ +sls_current: + description: SLS current + deviceClass: ophyd.EpicsSignalRO + deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true} + onFailure: buffer + enabled: true + readoutPriority: monitored + readOnly: true + softwareTrigger: false +vg0_press: + description: VG0 pressure + deviceClass: ophyd.EpicsSignalRO + deviceConfig: {read_pv: 'X06DA-FE-VMCC-0000:PRESSURE', auto_monitor: true} + onFailure: buffer + enabled: true + readoutPriority: monitored + readOnly: true + softwareTrigger: false +abs_press: + description: Absorber pressure + deviceClass: ophyd.EpicsSignalRO + deviceConfig: {read_pv: 'X06DA-FE-ABS1-VMCC-1010:PRESSURE', auto_monitor: true} + onFailure: buffer + enabled: true + readoutPriority: monitored + readOnly: true + softwareTrigger: false + + + + + + sldi_cenx: description: FE slit-diaphragm horizontal center deviceClass: ophyd.EpicsMotor @@ -10,7 +43,7 @@ sldi_cenx: sldi_sizex: description: FE slit-diaphragm horizontal size deviceClass: ophyd.EpicsMotor - deviceConfig: {prefix: 'X06DA-FE-SLDI:GAPX'} + deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEX'} onFailure: buffer enabled: true readoutPriority: monitored @@ -28,7 +61,7 @@ sldi_ceny: sldi_sizey: description: FE slit-diaphragm vertical size deviceClass: ophyd.EpicsMotor - deviceConfig: {prefix: 'X06DA-FE-SLDI:GAPY'} + deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEY'} onFailure: buffer enabled: true readoutPriority: monitored diff --git a/pxiii_bec/scripts/beamlinescripts.py b/pxiii_bec/scripts/beamlinescripts.py index 32d92ff..af5dcdc 100644 --- a/pxiii_bec/scripts/beamlinescripts.py +++ b/pxiii_bec/scripts/beamlinescripts.py @@ -1,5 +1,5 @@ -import bec -import bec_lib.devicemanager.DeviceContainer as dev +# import bec +# import bec_lib.devicemanager.DeviceContainer as dev def rock(steps, exp_time, scan_start=None, scan_end=None, datasource=None, visual=True, **kwargs): diff --git a/pxiii_bec/scripts/scanwrappers.py b/pxiii_bec/scripts/scanwrappers.py index a42c5cf..51e5713 100644 --- a/pxiii_bec/scripts/scanwrappers.py +++ b/pxiii_bec/scripts/scanwrappers.py @@ -1,5 +1,5 @@ -import bec -import bec_lib.devicemanager.DeviceContainer as dev +# import bec +# import bec_lib.devicemanager.DeviceContainer as dev def bl_check_beam():