Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenCell reader extension #197

Merged
merged 4 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from 3 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
5 changes: 1 addition & 4 deletions iohub/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,7 @@ def _get_pos_names(self):
if self.p > 1:
self.pos_names = []
for p in range(self.p):
name = (
self.summary_metadata["StagePositions"][p].get("Label")
or p
)
name = self.reader.stage_positions[p].get("Label") or p
self.pos_names.append(name)
else:
self.pos_names = ["0"]
Expand Down
43 changes: 34 additions & 9 deletions iohub/multipagetiff.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ def __init__(self, folder: str, extract_data: bool = False):
# Initialize MM attributes
self.channel_names = []

# Read MM data
self._set_mm_meta()

# Gather index map of file, page, byte offset
self._gather_index_maps()

# Read MM data
self._set_mm_meta()

# if extract data, create all of the virtual zarr stores up front
if extract_data:
for i in range(self.positions):
Expand Down Expand Up @@ -173,6 +173,29 @@ def _set_mm_meta(self):
for ch in self.mm_meta["Summary"]["ChNames"]:
self.channel_names.append(ch)

# Parsing of data acquired with the OpenCell
# acquisition script on the Dragonfly miroscope
elif (
mm_version == "2.0.1 20220920"
and self.mm_meta["Summary"]["Prefix"] == "raw_data"
):
file_names = set(
[(key[0], val[0]) for key, val in self.coord_map.items()]
)

if self.mm_meta["Summary"]["Positions"] > 1:
self._stage_positions = [None] * self.positions

for p_idx, file_name in file_names:
site_idx = int(file_name.split("_")[-1].split("-")[0])
pos = self._simplify_stage_position(
self.mm_meta["Summary"]["StagePositions"][site_idx]
)
self._stage_positions[p_idx] = pos

for ch in self.mm_meta["Summary"]["ChNames"]:
self.channel_names.append(ch)

else:
if self.mm_meta["Summary"]["Positions"] > 1:
self._stage_positions = []
Expand All @@ -186,15 +209,17 @@ def _set_mm_meta(self):
for ch in self.mm_meta["Summary"]["ChNames"]:
self.channel_names.append(ch)

# dimensions based on mm metadata
# do not reflect final written dimensions
# these will change after data is loaded
self.z_step_size = self.mm_meta["Summary"]["z-step_um"]
self.height = self.mm_meta["Summary"]["Height"]
self.width = self.mm_meta["Summary"]["Width"]
self.frames = self.mm_meta["Summary"]["Frames"]
self.slices = self.mm_meta["Summary"]["Slices"]
self.channels = self.mm_meta["Summary"]["Channels"]

# dimensions based on mm metadata
# do not reflect final written dimensions
# these set in _gather_index_maps
#
# self.frames = self.mm_meta["Summary"]["Frames"]
# self.slices = self.mm_meta["Summary"]["Slices"]
# self.channels = self.mm_meta["Summary"]["Channels"]
Comment on lines +215 to +222
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this @ziw-liu. I commented out these lines so they don't overwrite the dimensions set by _gather_index_maps


def _simplify_stage_position(self, stage_pos: dict):
"""
Expand Down
Loading