Skip to content

Commit 1836eee

Browse files
Fix issues in sample data scripts and image series annotator example
1 parent 14842f9 commit 1836eee

File tree

2 files changed

+40
-8
lines changed

2 files changed

+40
-8
lines changed
Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
from micro_sam.sam_annotator import image_folder_annotator
2+
from micro_sam.sample_data import fetch_image_series_example_data
23

34

4-
def main():
5+
def series_annotation():
6+
"""Annotate a series of images. Example runs for three different example images.
7+
"""
8+
example_data = fetch_image_series_example_data("./data")
59
image_folder_annotator(
6-
"./data/series", "./segmented-series",
7-
embedding_path="./embeddings/series-embeddings",
10+
example_data, "./data/series-segmentation-result", embedding_path="./embeddings/series-embeddings",
811
pattern="*.tif", model_type="vit_b"
912
)
1013

1114

15+
def main():
16+
series_annotation()
17+
18+
1219
if __name__ == "__main__":
1320
main()

micro_sam/sample_data.py

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@
44
import pooch
55

66

7+
def fetch_image_series_example_data(save_directory):
8+
"""Download the sample images for the image series annotator.
9+
"""
10+
save_directory = Path(save_directory)
11+
os.makedirs(save_directory, exist_ok=True)
12+
print("Example data directory is:", save_directory.resolve())
13+
fname = "image-series.zip"
14+
unpack_filenames = [os.path.join("series", f"im{i}.tif") for i in range(3)]
15+
unpack = pooch.Unzip(members=unpack_filenames)
16+
pooch.retrieve(
17+
url="https://owncloud.gwdg.de/index.php/s/M1zGnfkulWoAhUG/download",
18+
known_hash="92346ca9770bcaf55248efee590718d54c7135b6ebca15d669f3b77b6afc8706",
19+
fname=fname,
20+
path=save_directory,
21+
progressbar=True,
22+
processor=unpack,
23+
)
24+
data_folder = os.path.join(save_directory, f"{fname}.unzip", "series")
25+
assert os.path.exists(data_folder)
26+
return data_folder
27+
28+
729
def fetch_wholeslide_example_data(save_directory):
830
"""Download the sample data for the 2d annotator.
931
@@ -74,15 +96,16 @@ def fetch_3d_example_data(save_directory):
7496
print("Example data directory is:", save_directory.resolve())
7597
unpack_filenames = [os.path.join("Lucchi++", "Test_In", f"mask{str(i).zfill(4)}.png") for i in range(165)]
7698
unpack = pooch.Unzip(members=unpack_filenames)
99+
fname = "lucchi_pp.zip"
77100
pooch.retrieve(
78101
url="http://www.casser.io/files/lucchi_pp.zip",
79102
known_hash="770ce9e98fc6f29c1b1a250c637e6c5125f2b5f1260e5a7687b55a79e2e8844d",
80-
fname="lucchi_pp.zip",
103+
fname=fname,
81104
path=save_directory,
82105
progressbar=True,
83106
processor=unpack,
84107
)
85-
lucchi_dir = save_directory.joinpath("lucchi_pp.zip.unzip", "Lucchi++", "Test_In")
108+
lucchi_dir = save_directory.joinpath(f"{fname}.unzip", "Lucchi++", "Test_In")
86109
return str(lucchi_dir)
87110

88111

@@ -101,13 +124,15 @@ def fetch_tracking_example_data(save_directory):
101124
print("Example data directory is:", save_directory.resolve())
102125
unpack_filenames = [os.path.join("DIC-C2DH-HeLa", "01", f"t{str(i).zfill(3)}.tif") for i in range(84)]
103126
unpack = pooch.Unzip(members=unpack_filenames)
127+
fname = "DIC-C2DH-HeLa.zip"
104128
pooch.retrieve(
105129
url="http://data.celltrackingchallenge.net/training-datasets/DIC-C2DH-HeLa.zip", # 37 MB
106130
known_hash="fac24746fa0ad5ddf6f27044c785edef36bfa39f7917da4ad79730a7748787af",
107-
fname="DIC-C2DH-HeLa.zip",
131+
fname=fname,
108132
path=save_directory,
109133
progressbar=True,
110134
processor=unpack,
111135
)
112-
cell_tracking_directory = save_directory.joinpath("DIC-C2DH-HeLa", "train", "01")
113-
return str(cell_tracking_directory)
136+
cell_tracking_dir = save_directory.joinpath(f"{fname}.unzip", "DIC-C2DH-HeLa", "01")
137+
assert os.path.exists(cell_tracking_dir)
138+
return str(cell_tracking_dir)

0 commit comments

Comments
 (0)