diff --git a/LICENSE b/LICENSE index 5155622..0074613 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ BSD 3-Clause License Copyright (c) 2020, Henry Pinkard and -Copyright (c) 2020, Munsky Group +Copyright (c) 2024, Munsky Group All rights reserved. diff --git a/pycromanager/_version.py b/pycromanager/_version.py index 24d191e..37a4ba3 100644 --- a/pycromanager/_version.py +++ b/pycromanager/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 23, 1) +version_info = (0, 23, 2) __version__ = ".".join(map(str, version_info)) diff --git a/pycromanager/acq_util.py b/pycromanager/acq_util.py index fa8e10e..5ee9347 100644 --- a/pycromanager/acq_util.py +++ b/pycromanager/acq_util.py @@ -79,8 +79,13 @@ def start_headless( ) SUBPROCESSES.append(process) - output = process.stdout.readline() - if "STARTED" not in output.decode('utf-8'): + started = False + output = True + # Some drivers output various status messages which need to be skipped over to look for the STARTED token. + while output and not started: + output = process.stdout.readline() + started = "STARTED" in output.decode('utf-8') + if not started: raise Exception('Error starting headless mode') if debug: print('Headless mode started') @@ -91,7 +96,7 @@ def logger(): def multi_d_acquisition_events( - num_time_points: int=1, + num_time_points: int=None, time_interval_s: float=0, z_start: float=None, z_end: float=None, @@ -111,7 +116,7 @@ def multi_d_acquisition_events( Parameters ---------- num_time_points : int - How many time points if it is a timelapse (Default value = 1) + How many time points if it is a timelapse (Default value = None) time_interval_s : float the minimum interval between consecutive time points in seconds. Keep at 0 to go as fast as possible (Default value = 0) @@ -193,7 +198,7 @@ def generate_events(event, order): if len(order) == 0: yield event return - elif order[0] == "t" and num_time_points != 1: + elif order[0] == "t" and num_time_points is not None and num_time_points > 0: time_indices = np.arange(num_time_points) for time_index in time_indices: new_event = copy.deepcopy(event) diff --git a/setup.py b/setup.py index 06f7579..f92cc6e 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Development Status :: 3 - Alpha", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent",