Fix for the new scan type validation

pxiii_bec/device_configs/x06da_device_config.yaml

@@ -46,7 +46,7 @@ dccm_energy1:
 dccm_diode:
   description: Diode between mono crystals
   deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-OP-XPM1:BOT:READOUT'}
+  deviceConfig: {read_pv: 'X06DA-OP-XPM1:BOT:READOUT', auto_monitor: true}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -73,7 +73,7 @@ dccm_energy2:
 dccm_xbpm:
   description: XBPM total intensity after monochromator
   deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV'}
+  deviceConfig: {read_pv: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -403,6 +403,34 @@ ms_zoom:
   readoutPriority: monitored
   readOnly: false
   softwareTrigger: false
+samdist:
+  description: Sample distance
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-DF1:CBOX-USER1', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+samrange:
+  description: Sample in valid distance
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-DF1:CBOX-CMP1', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  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: true
+  softwareTrigger: false
+
 
 bstop_pneum:
   description: Beamstop pneumatic in-out
@@ -440,15 +468,65 @@ bstop_z:
   readoutPriority: monitored
   readOnly: false
   softwareTrigger: false
-bstop_diode:
-  description: Beamstop diode
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-BS:READOUT'}
+bstop_pneum:
+  description: Beamstop pneumatic
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X06DA-ES-BS:GET-POS', write_pv: 'X06DA-ES-BS:SET-POS', put_complete: true}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
   readOnly: true
   softwareTrigger: false
+bstop_diode:
+  description: Beamstop diode
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-BS:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+frontlight:
+  description: Microscope frontlight
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X06DA-ES-FL:SET-BRGHT', put_complete: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+backlight:
+  description: Backlight reflector
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X06DA-ES-BL:GET-POS', write_pv: 'X06DA-ES-BL:SET-POS', put_complete: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+det_y:
+  description: Pilatus height
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-DET:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+det_z:
+  description: Pilatus translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-DET:TRZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+
+
+
+
+
 omega:
   description: ABR rotation stage
   deviceClass: pxiii_bec.devices.A3200Axis
@@ -467,3 +545,15 @@ abr:
   readoutPriority: monitored
   readOnly: false
   softwareTrigger: false
+
+
+samimg:
+  description: Sample camera image
+  deviceClass: ophyd_devices.devices.areadetector.plugins.ImagePlugin_V35
+  deviceConfig: {prefix: 'X06DA-SAMCAM:image1:'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+

pxiii_bec/devices/A3200.py

@@ -115,7 +115,7 @@ class AerotechAbrMixin(CustomDeviceMixin):
         logger.warning(f"Configuring {self.parent.scaninfo.scan_msg.info['scan_name']} on ABR")
 
         d = {}
-        if self.parent.scaninfo.scan_type in ("measure", "measurement"):
+        if self.parent.scaninfo.scan_type in ("measure", "measurement", "fly"):
             scanargs = self.parent.scaninfo.scan_msg.info['kwargs']
             scanname = self.parent.scaninfo.scan_msg.info['scan_name']
 

pxiii_bec/scans/mx_measurements.py

@@ -56,7 +56,7 @@ class AerotechFlyscanBase(AsyncFlyScanBase):
     abr_complete : bool
         Wait for the launched ABR task to complete.
     """
-    scan_type = "measure"
+    scan_type = "fly"
     scan_report_hint = "table"
     arg_input = {}
     arg_bundle_size = {"bundle": len(arg_input), "min": None, "max": None}