diff --git a/pxiii_bec/device_configs/x06da_device_config.yaml b/pxiii_bec/device_configs/x06da_device_config.yaml index ee44a35..d37444b 100644 --- a/pxiii_bec/device_configs/x06da_device_config.yaml +++ b/pxiii_bec/device_configs/x06da_device_config.yaml @@ -421,15 +421,6 @@ samzoom: readoutPriority: monitored readOnly: false softwareTrigger: false -# samcam: -# description: Sample camera device -# deviceClass: ophyd_devices.devices.areadetector.cam.GenICam -# deviceConfig: {prefix: 'X06DA-SAMCAM:cam1:'} -# onFailure: buffer -# enabled: true -# readoutPriority: monitored -# readOnly: false -# softwareTrigger: false samcam: description: Sample camera aggregate device deviceClass: pxiii_bec.devices.SamCamDetector @@ -457,21 +448,10 @@ samimg: prefix: 'X06DA-SAMCAM:image1:' deviceTags: - detector - enabled: false + enabled: true readoutPriority: async readOnly: false softwareTrigger: false -# samimg_ad: -# description: Sample camera image via AD plugin -# deviceClass: ophyd_devices.devices.areadetector.plugins.ImagePlugin_V35 -# deviceConfig: {prefix: 'X06DA-SAMCAM:image1:'} -# onFailure: buffer -# enabled: true -# readoutPriority: monitored -# readOnly: true -# softwareTrigger: false - - bstop_pneum: diff --git a/pxiii_bec/devices/A3200.py b/pxiii_bec/devices/A3200.py index 24961b0..cf01e30 100644 --- a/pxiii_bec/devices/A3200.py +++ b/pxiii_bec/devices/A3200.py @@ -28,36 +28,7 @@ Aerotech.wait_status(status) Aerotech.move(angle, wait=False, speed=None) Aerotech.set_shutter(state) -Attribute Access in Abr class -============================= -The Abr class overwrites the getattr and setattr methods to provide a pythonic -way of controlling the rootation stage of the Abr. - -The following properties are implemented: - -velocity - Sets the velocity of rotation: ``-ES-DF1:ROTX-SETV`` - -omega - Move the omega angle without any wait: ``-ES-DF1:ROTX-VAL`` - -exp_time - Sets the PV for the measurement's exposure time: ``-ES-OSC:ETIME`` - -start_angle - Sets the PV for the measurement's starting angle: ``-ES-OSC:START-POS`` - -oscillation_angle - Sets the PV for the measurement's oscillation angle: ``-ES-OSC:RANGE`` - -shutter - Controls the shutter: ``-ES-PH1:SET`` and ``-ES-PH1:GET`` - -measurement_state - Returns the PV for the measurement state: ``-ES-OSC:DONE`` - -axis_mode Returns the axis mode: ``-ES-DF1:AXES-MODE`` Examples