disentangle
This commit is contained in:
@ -5,13 +5,14 @@ from .thresh import threshold
|
||||
|
||||
|
||||
def calc_apply_aggregation(results, data, pixel_mask_pf, image, aggregator):
|
||||
data = calc_data(results, data, pixel_mask_pf, image, aggregator)
|
||||
data = calc_data(results, data, image, aggregator)
|
||||
calc_mask_pixels(data, pixel_mask_pf) # changes data in place
|
||||
aggregation_ready = calc_aggregation_ready(results, data, aggregator)
|
||||
return data, aggregation_ready
|
||||
|
||||
|
||||
|
||||
def calc_data(results, data, pixel_mask_pf, image, aggregator):
|
||||
def calc_data(results, data, image, aggregator):
|
||||
if data.dtype == np.uint16:
|
||||
return data
|
||||
|
||||
@ -27,11 +28,7 @@ def calc_data(results, data, pixel_mask_pf, image, aggregator):
|
||||
|
||||
calc_apply_threshold(results, data) # changes data in place
|
||||
|
||||
data = calc_aggregate(results, data, aggregator)
|
||||
|
||||
calc_mask_pixels(data, pixel_mask_pf) # changes data in place
|
||||
|
||||
return data
|
||||
return calc_aggregate(results, data, aggregator)
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user