Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/imcflibs/imagej/bdv.py
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ def define_dataset_auto(
file_path,
bf_series_type,
dataset_save_path=None,
timepoints_per_partition=1,
timepoints_per_partition=0,
resave="Re-save as multiresolution HDF5",
subsampling_factors=None,
hdf5_chunk_sizes=None,
Expand All @@ -830,8 +830,9 @@ def define_dataset_auto(
Defines how Bio-Formats interprets the series.
timepoints_per_partition : int, optional
Split the output dataset by timepoints. Use `0` for no split, resulting
in a single HDF5 file containing all timepoints. By default `1`,
resulting in a HDF5 per timepoints.
in a single HDF5 file containing all timepoints. Otherwise, choose the
number of timepoints per file. By default `0`.

resave : str, optional
Allow the function to either re-save the images or simply create a
merged xml. Use `Load raw data` to avoid re-saving, by default `Re-save
Expand Down Expand Up @@ -864,6 +865,12 @@ def define_dataset_auto(
hdf5_chunk_sizes = "hdf5_chunk_sizes=" + hdf5_chunk_sizes + " "
else:
hdf5_chunk_sizes = ""
if timepoints_per_partition > 0:
split_timepoints = "split_hdf5 timepoints_per_partition=" + str(
timepoints_per_partition
)
else:
split_timepoints = ""

if bf_series_type == "Angles":
angle_rotation = "apply_angle_rotation "
Expand Down Expand Up @@ -901,9 +908,7 @@ def define_dataset_auto(
+ angle_rotation
+ subsampling_factors
+ hdf5_chunk_sizes
+ "split_hdf5 "
+ "timepoints_per_partition="
+ str(timepoints_per_partition)
+ split_timepoints
+ " "
+ "setups_per_partition=0 "
+ "use_deflate_compression "
Expand Down
13 changes: 11 additions & 2 deletions tests/bdv/test_define_dataset_auto.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,17 @@ def test_define_dataset_auto_tile(tmp_path, caplog):
+ result_folder
+ "] "
+ "check_stack_sizes "
+ "setups_per_partition=0 "
+ "use_deflate_compression "
)

# Construct the final call to ImageJ
final_call = "IJ.run(cmd=[%s], params=[%s])" % (cmd, options)

# Define the dataset using the "Auto-Loader" option
bdv.define_dataset_auto(project_filename, file_info["path"], bf_series_type)
# Check if the final call is in the log
assert final_call == caplog.messages[0]
Comment thread
ehrenfeu marked this conversation as resolved.
+ "split_hdf5 "
+ "timepoints_per_partition=1 "
+ "setups_per_partition=0 "
Expand Down Expand Up @@ -160,8 +171,6 @@ def test_define_dataset_auto_angle(tmp_path, caplog):
+ "] "
+ "check_stack_sizes "
+ "apply_angle_rotation "
+ "split_hdf5 "
+ "timepoints_per_partition=1 "
+ "setups_per_partition=0 "
+ "use_deflate_compression "
)
Expand Down