lima2.client 3.0.0__tar.gz → 3.0a1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lima2-client
-Version: 3.0.0
+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.0.0 → lima2_client-3.0a1}/src/lima2/client/pipeline.py

@@ -379,13 +379,13 @@ class Pipeline:
 
         # Pop stats for new frames from each receiver and concatenate, mixing in cached data.
         # Data comes from server as 1D array with size (num_frames * num_rois)
-        def pop_data(dev) -> np.ndarray:
-            return structured_array.decode(dev.popRoiStatistics(), dtype)
-
-        num_rcvs = len(self._devs)
-        with ThreadPoolExecutor(max_workers=num_rcvs) as pool:
-            flat_cache = [cache.flatten()]
-            new_data = np.concatenate(flat_cache + list(pool.map(pop_data, self._devs)))
+        new_data = np.concatenate(
+            [cache.flatten()]
+            + [
+                structured_array.decode(dev.popRoiStatistics(), dtype)
+                for dev in self._devs
+            ]
+        )
 
         # Guess number of frames from the data
         num_frames = np.unique(new_data["frame_idx"]).size
@@ -473,13 +473,13 @@ class Pipeline:
 
         # Pop profiles for new frames from each receiver and concatenate, mixing in cached data.
         # Data comes from server as 1D array with size (num_frames * sum(roi_lengths))
-        def pop_data(dev) -> np.ndarray:
-            return structured_array.decode(dev.popRoiProfiles(), dtype)
-
-        num_rcvs = len(self._devs)
-        with ThreadPoolExecutor(max_workers=num_rcvs) as pool:
-            flat_cache = [cache.flatten()]
-            new_data = np.concatenate(flat_cache + list(pool.map(pop_data, self._devs)))
+        new_data = np.concatenate(
+            [cache.flatten()]
+            + [
+                structured_array.decode(dev.popRoiProfiles(), dtype)
+                for dev in self._devs
+            ]
+        )
 
         # Reshape into (num_frames, sum(roi_lengths))
         new_data = new_data.reshape((-1, sum(roi_lengths)))
@@ -654,9 +654,9 @@ class Pipeline:
                 "no associated label"
             )
 
-        def last_frames(rcv_idx: int) -> int:
+        def last_frames(rcv_idx):
             last_frames_str = self._devs[rcv_idx].last_frames
-            return int(json.loads(last_frames_str)[f"{source.label}_idx"])
+            return json.loads(last_frames_str)[f"{source.label}_idx"]
 
         num_rcvs = len(self._devs)
         with ThreadPoolExecutor(max_workers=num_rcvs) as pool:

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

@@ -9,7 +9,6 @@ import copy
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 from enum import Enum
-from concurrent.futures import ThreadPoolExecutor
 
 import tango as tg
 from beartype import beartype
@@ -108,22 +107,18 @@ class UnevenTopology(Topology):
         If the frame is found on multiple devices (e.g. frame_idx=-1),
         return the one found last (not necessarily the most recent).
         """
+        frame: EncodedFrame | None = None
 
-        def get_frame(rcv_idx) -> EncodedFrame | None:
+        for i in range(self.num_receivers):
             try:
-                frame: EncodedFrame = getters[rcv_idx](frame_idx)
-                return frame
+                frame = getters[i](frame_idx)
             except tg.DevFailed:
-                return None
+                pass
 
-        num_rcvs = self.num_receivers
-        with ThreadPoolExecutor(max_workers=num_rcvs) as pool:
-            frames = [f for f in pool.map(get_frame, range(num_rcvs)) if f is not None]
-
-        if len(frames) == 0:
+        if frame is None:
             raise IndexError(f"Frame {frame_idx} not available from any receiver")
 
-        return frames[0]
+        return frame
 
 
 def distribute_acq(

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

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