From 094b896aebb459c7ff6a43698b1b8a73bb45df4e Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 6 Jun 2023 11:11:57 +0200 Subject: [PATCH] order --- slic/core/acquisition/pvacquisition.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/slic/core/acquisition/pvacquisition.py b/slic/core/acquisition/pvacquisition.py index be38f8e4..feeb5848 100644 --- a/slic/core/acquisition/pvacquisition.py +++ b/slic/core/acquisition/pvacquisition.py @@ -61,12 +61,13 @@ def epics_to_h5_triggered(filename, channels, n_pulses=100, wait_time=0.5, conne def make_pvs(channels, timeout=1): pvs = [PV(ch) for ch in channels] status = [pv.wait_for_connection(timeout=timeout) for pv in pvs] - if not all(status): - broken = (n for n, s in zip(channels, status) if not s) - broken = sorted(set(broken)) - printable_broken = ", ".join(broken) - raise ConnectionError(f"connection to the following PVs timed out ({timeout} sec): {printable_broken}") - return pvs + if all(status): + return pvs + + broken = (n for n, s in zip(channels, status) if not s) + broken = sorted(set(broken)) + printable_broken = ", ".join(broken) + raise ConnectionError(f"connection to the following PVs timed out ({timeout} sec): {printable_broken}") def make_arrays(pvs, n_pulses):