Preparation to include new scan parameters

debye_bec/devices/mo1_bragg/mo1_bragg_devices.py

@@ -156,6 +156,7 @@ class Mo1TriggerSettings(Device):
     xrd_trig_period = Cpt(EpicsSignalWithRBV, suffix="xrd_trig_period", kind="config")
     xrd_n_of_trig = Cpt(EpicsSignalWithRBV, suffix="xrd_n_of_trig", kind="config")
     xrd_trig_req = Cpt(EpicsSignal, suffix="xrd_trig_req", kind="config")
+    xrd_trig_stop = Cpt(EpicsSignal, suffix="xrd_trig_stop", kind="omitted")
 
     falcon_trig_src_enum = Cpt(EpicsSignalWithRBV, suffix="falcon_trig_src_ENUM", kind="config")
     falcon_trig_mode_enum = Cpt(EpicsSignalWithRBV, suffix="falcon_trig_mode_ENUM", kind="config")
@@ -163,6 +164,7 @@ class Mo1TriggerSettings(Device):
     falcon_trig_period = Cpt(EpicsSignalWithRBV, suffix="falcon_trig_period", kind="config")
     falcon_n_of_trig = Cpt(EpicsSignalWithRBV, suffix="falcon_n_of_trig", kind="config")
     falcon_trig_req = Cpt(EpicsSignal, suffix="falcon_trig_req", kind="config")
+    falcon_trig_stop = Cpt(EpicsSignal, suffix="falcon_trig_stop", kind="omitted")
 
     univ1_trig_src_enum = Cpt(EpicsSignalWithRBV, suffix="univ1_trig_src_ENUM", kind="config")
     univ1_trig_mode_enum = Cpt(EpicsSignalWithRBV, suffix="univ1_trig_mode_ENUM", kind="config")
@@ -170,6 +172,7 @@ class Mo1TriggerSettings(Device):
     univ1_trig_period = Cpt(EpicsSignalWithRBV, suffix="univ1_trig_period", kind="config")
     univ1_n_of_trig = Cpt(EpicsSignalWithRBV, suffix="univ1_n_of_trig", kind="config")
     univ1_trig_req = Cpt(EpicsSignal, suffix="univ1_trig_req", kind="config")
+    univ1_trig_stop = Cpt(EpicsSignal, suffix="univ1_trig_stop", kind="omitted")
 
     univ2_trig_src_enum = Cpt(EpicsSignalWithRBV, suffix="univ2_trig_src_ENUM", kind="config")
     univ2_trig_mode_enum = Cpt(EpicsSignalWithRBV, suffix="univ2_trig_mode_ENUM", kind="config")
@@ -177,6 +180,7 @@ class Mo1TriggerSettings(Device):
     univ2_trig_period = Cpt(EpicsSignalWithRBV, suffix="univ2_trig_period", kind="config")
     univ2_n_of_trig = Cpt(EpicsSignalWithRBV, suffix="univ2_n_of_trig", kind="config")
     univ2_trig_req = Cpt(EpicsSignal, suffix="univ2_trig_req", kind="config")
+    univ2_trig_stop = Cpt(EpicsSignal, suffix="univ2_trig_stop", kind="omitted")
 
 
 class Mo1BraggCalculator(Device):

debye_bec/devices/mo1_bragg/mo1_bragg_enums.py

@@ -15,6 +15,7 @@ class TriggerControlMode(int, enum.Enum):
 
     PULSE = 0
     CONDITION = 1
+    SCAN = 1
 
 
 class ScanControlScanStatus(int, enum.Enum):

debye_bec/scans/xas_simple_scan.py

@@ -25,6 +25,8 @@ from bec_lib.scan_args import ScanArgument, Units
 from bec_server.scan_server.scans.scan_base import ScanBase, ScanType
 from bec_server.scan_server.scans.scan_modifier import scan_hook
 
+from debye_bec.devices.mo1_bragg.mo1_bragg_enums import TriggerControlSource
+
 
 class XasSimpleScan(ScanBase):
     scan_type = ScanType.HARDWARE_TRIGGERED
@@ -42,6 +44,7 @@ class XasSimpleScan(ScanBase):
         stop: Annotated[float, ScanArgument(display_name="Stop Energy", description="Stop energy.", units=Units.eV, ge=4500, le=64000)],
         scan_time: Annotated[float, ScanArgument(display_name="Scan Time", description="Time for one scan cycle.", units=Units.s, ge=0.05)],
         scan_duration: Annotated[float, ScanArgument(display_name="Scan Duration", description="Total scan duration.", units=Units.s, ge=0.05)],
+        univ1_trig_source: Annotated[float, ScanArgument(display_name="Source", description="Universal trigger 1 source", enum=TriggerControlSource)],
         motor: Annotated[DeviceBase | None, ScanArgument(display_name="Motor", description="Bragg motor device.")] = None,
         daq: Annotated[DeviceBase | None, ScanArgument(display_name="DAQ", description="NIDAQ device.")] = None,
         monitored_readout_cycle: Annotated[float, ScanArgument(display_name="Monitored Readout Cycle", description="Delay between monitored readouts.",units=Units.s, gt=0)] = 1,