Skip to content

Commit 9a318c1

Browse files
committed
rename bounding_boxes file to cartesian_coordinate for better meaning
1 parent 74d8390 commit 9a318c1

24 files changed

+64
-26
lines changed

chunkflow/chunk/affinity_map/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import numpy as np
44

5-
from chunkflow.lib.bounding_boxes import Cartesian
5+
from chunkflow.lib.cartesian_coordinate import Cartesian
66
from chunkflow.chunk import Chunk
77

88
class AffinityMap(Chunk):

chunkflow/chunk/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import cc3d
1717
from cloudvolume.lib import yellow, Bbox
1818

19-
from chunkflow.lib.bounding_boxes import BoundingBox, Cartesian
19+
from chunkflow.lib.cartesian_coordinate import BoundingBox, Cartesian
2020

2121
# from typing import Tuple
2222
# Offset = Tuple[int, int, int]

chunkflow/chunk/image/convnet/inferencer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import numpy as np
1212
from tqdm import tqdm
1313

14-
from chunkflow.lib.bounding_boxes import Cartesian, to_cartesian
14+
from chunkflow.lib.cartesian_coordinate import Cartesian, to_cartesian
1515

1616
from .patch.base import PatchInferencerBase
1717
from chunkflow.chunk import Chunk

chunkflow/chunk/probability_map.py

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import math
2+
3+
import numpy as np
4+
from .base import Chunk
5+
from skimage.feature import peak_local_max
6+
7+
from chunkflow.lib.cartesian_coordinate import Cartesian
8+
9+
10+
class ProbabilityMap(Chunk):
11+
def __init__(self, array: np.ndarray, voxel_offset: Cartesian = None, voxel_size: Cartesian = None):
12+
super().__init__(array, voxel_offset, voxel_size)
13+
assert np.issubdtype(self.dtype, np.floating)
14+
15+
def detect_points(self, min_distance: int = 1, threshold_abs: float=None,
16+
threshold_rel: float = None, exclude_border: int=True, indices: bool=True,
17+
num_peaks_per_label: int = math.inf):
18+
# prob = chunk.array.copy()
19+
prob = self.array
20+
prob -= np.mean(prob)
21+
prob[prob<0.] = 0.
22+
prob /= prob.max()
23+
24+
coords = peak_local_max(
25+
prob,
26+
min_distance=min_distance,
27+
threshold_abs=threshold_abs,
28+
threshold_rel=threshold_rel,
29+
exclude_border=exclude_border,
30+
indices=indices,
31+
num_peaks_per_label = num_peaks_per_label,
32+
)
33+
34+
confidences = prob[coords[:, 0], coords[:, 1], coords[:, 2]]
35+
36+
coords += np.asarray(self.voxel_offset, dtype=coords.dtype).reshape(1,3)
37+
print('number of detected points: ', coords.shape[0])
38+
return coords, confidences

chunkflow/chunk/segmentation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# from ...lib.gala import evaluate
1313
from chunkflow.lib.gala import evaluate
14-
from chunkflow.lib.bounding_boxes import Cartesian
14+
from chunkflow.lib.cartesian_coordinate import Cartesian
1515

1616
import kimimaro
1717
import fastremap

chunkflow/flow/flow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from cloudfiles import CloudFiles
2222

2323
from chunkflow.lib.aws.sqs_queue import SQSQueue
24-
from chunkflow.lib.bounding_boxes import Cartesian, BoundingBox, BoundingBoxes
24+
from chunkflow.lib.cartesian_coordinate import Cartesian, BoundingBox, BoundingBoxes
2525
from chunkflow.lib.synapses import Synapses
2626

2727
from chunkflow.chunk import Chunk

chunkflow/flow/load_pngs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import numpy as np
55

6-
from chunkflow.lib.bounding_boxes import BoundingBox, Cartesian
6+
from chunkflow.lib.cartesian_coordinate import BoundingBox, Cartesian
77
from chunkflow.chunk import Chunk
88

99
from tqdm import tqdm

chunkflow/flow/load_precomputed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from cloudvolume import CloudVolume
55
from cloudfiles import CloudFiles
66

7-
from chunkflow.lib.bounding_boxes import BoundingBox, Cartesian
7+
from chunkflow.lib.cartesian_coordinate import BoundingBox, Cartesian
88
from chunkflow.chunk.validate import validate_by_template_matching
99
from tinybrain import downsample_with_averaging
1010
from chunkflow.chunk import Chunk

chunkflow/flow/mask.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from cloudvolume import CloudVolume
55

66
from chunkflow.chunk import Chunk
7-
from chunkflow.lib.bounding_boxes import Cartesian
7+
from chunkflow.lib.cartesian_coordinate import Cartesian
88
from .base import OperatorBase
99

1010

chunkflow/flow/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import numpy as np
99

10-
from chunkflow.lib.bounding_boxes import Cartesian
10+
from chunkflow.lib.cartesian_coordinate import Cartesian
1111

1212
from .base import OperatorBase
1313

0 commit comments

Comments
 (0)