lima2.client 3.0a0__tar.gz → 3.0a1__tar.gz

{lima2_client-3.0a0/src/lima2_client.egg-info → lima2_client-3.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lima2-client
-Version: 3.0a0
+Version: 3.0a1
 Summary: Python client library for Lima2 detector
 Author: BCU (ESRF)
 License: Copyright (c) 2020-2024 Beamline Control Unit, ESRF

{lima2_client-3.0a0 → lima2_client-3.0a1}/src/lima2/client/client.py

@@ -157,6 +157,7 @@ class Client:
             acq_params=acq_params,
             proc_params=proc_params,
             num_receivers=len(self.receivers),
+            topology_kind=self.topology_kind,
         )
 
         self.detector.prepare_acq(uuid, ctl, acq, proc)
@@ -176,7 +177,13 @@ class Client:
 
     @docstring_from(Detector.start_acq)
     def start_acq(self) -> None:
-        self.detector.start_acq()
+        pipeline = self.current_pipeline
+        pipeline.register_on_finished(pipeline.unregister_events)
+        try:
+            self.detector.start_acq()
+        except Exception:
+            pipeline.unregister_events()
+            raise
 
     @docstring_from(Detector.trigger)
     def trigger(self) -> None:
@@ -293,9 +300,14 @@ class Client:
 
         Raises if the pipeline is absent from a receiver.
         """
+
+        # First unregister Tango events
+        pipeline = self.__pipelines.pop(uuid, None)
+        if pipeline is not None:
+            pipeline.unregister_events()
+
         for recv in self.receivers:
             recv.erasePipeline(str(uuid))
-        self.__pipelines.pop(uuid, None)
 
     def clear_previous_pipelines(self) -> None:
         """Erase all pipelines except the current one."""

{lima2_client-3.0a0 → lima2_client-3.0a1}/src/lima2/client/detector.py

@@ -24,6 +24,8 @@ import logging
 import uuid
 from collections.abc import Iterator
 
+import gevent
+
 import tango
 from beartype import beartype
 from gevent.lock import BoundedSemaphore
@@ -406,12 +408,18 @@ class Detector:
             f"prepare_acq({uuid}, {ctrl_params}, {acq_params}, {proc_params})"
         )
 
-        validate(
-            instance=ctrl_params,
-            schema=self.params_schema[self.ctrl.name()]["acq_params"],
-        )
+        def parallel_exec(ctrl_fn, recv_fn):
+            tasks = [gevent.spawn(ctrl_fn, self.__ctrl)]
+            tasks += [gevent.spawn(recv_fn, i, r) for i, r in enumerate(self.__recvs)]
+            gevent.joinall(tasks, raise_error=True)
+
+        def validate_ctrl(ctrl):
+            validate(
+                instance=ctrl_params,
+                schema=self.params_schema[ctrl.name()]["acq_params"],
+            )
 
-        for i, recv in enumerate(self.__recvs):
+        def validate_recv(i, recv):
             validate(
                 instance=acq_params[i],
                 schema=self.params_schema[recv.name()]["acq_params"],
@@ -420,13 +428,19 @@ class Detector:
             pipeline_class = pipelines.get_class(proc_params[i]["class_name"])
             validate(instance=proc_params[i], schema=pipeline_class.params_schema)
 
+        parallel_exec(validate_ctrl, validate_recv)
+
         # Update parameters on the device servers
-        # TODO: Rename acq_params to ctrl_params
-        self.__ctrl.acq_params = json.dumps(ctrl_params)
-        for i, recv in enumerate(self.__recvs):
+        def update_ctrl(ctrl):
+            # TODO: Rename acq_params to ctrl_params
+            ctrl.acq_params = json.dumps(ctrl_params)
+
+        def update_recv(i, recv):
             recv.acq_params = json.dumps(acq_params[i])
             recv.proc_params = json.dumps(proc_params[i])
 
+        parallel_exec(update_ctrl, update_recv)
+
         # Raises and reverts to IDLE on exception
         with self._locked_fsm() as fsm:
             fsm.prepare(str(uuid))