some new lines
This commit is contained in:
@ -3,12 +3,15 @@ import numpy as np
|
|||||||
|
|
||||||
def calc_force_send(results, data, pixel_mask_pf, image, n_aggregated_images, data_summed):
|
def calc_force_send(results, data, pixel_mask_pf, image, n_aggregated_images, data_summed):
|
||||||
force_send_visualisation = False
|
force_send_visualisation = False
|
||||||
|
|
||||||
if data.dtype != np.uint16:
|
if data.dtype != np.uint16:
|
||||||
apply_threshold = results.get("apply_threshold", False)
|
apply_threshold = results.get("apply_threshold", False)
|
||||||
apply_aggregation = results.get("apply_aggregation", False)
|
apply_aggregation = results.get("apply_aggregation", False)
|
||||||
|
|
||||||
if not apply_aggregation:
|
if not apply_aggregation:
|
||||||
data_summed = None
|
data_summed = None
|
||||||
n_aggregated_images = 1
|
n_aggregated_images = 1
|
||||||
|
|
||||||
if apply_threshold or apply_aggregation:
|
if apply_threshold or apply_aggregation:
|
||||||
if apply_threshold and all(k in results for k in ("threshold_min", "threshold_max")):
|
if apply_threshold and all(k in results for k in ("threshold_min", "threshold_max")):
|
||||||
threshold_min = float(results["threshold_min"])
|
threshold_min = float(results["threshold_min"])
|
||||||
@ -16,6 +19,7 @@ def calc_force_send(results, data, pixel_mask_pf, image, n_aggregated_images, da
|
|||||||
data[data < threshold_min] = 0.0
|
data[data < threshold_min] = 0.0
|
||||||
if threshold_max > threshold_min:
|
if threshold_max > threshold_min:
|
||||||
data[data > threshold_max] = 0.0
|
data[data > threshold_max] = 0.0
|
||||||
|
|
||||||
if apply_aggregation and "aggregation_max" in results:
|
if apply_aggregation and "aggregation_max" in results:
|
||||||
if data_summed is not None:
|
if data_summed is not None:
|
||||||
data += data_summed
|
data += data_summed
|
||||||
@ -24,10 +28,12 @@ def calc_force_send(results, data, pixel_mask_pf, image, n_aggregated_images, da
|
|||||||
data_summed[data == -np.nan] = -np.nan #TODO: this does nothing
|
data_summed[data == -np.nan] = -np.nan #TODO: this does nothing
|
||||||
results["aggregated_images"] = n_aggregated_images
|
results["aggregated_images"] = n_aggregated_images
|
||||||
results["worker"] = 1 #TODO: keep this for backwards compatibility?
|
results["worker"] = 1 #TODO: keep this for backwards compatibility?
|
||||||
|
|
||||||
if n_aggregated_images >= results["aggregation_max"]:
|
if n_aggregated_images >= results["aggregation_max"]:
|
||||||
force_send_visualisation = True
|
force_send_visualisation = True
|
||||||
data_summed = None
|
data_summed = None
|
||||||
n_aggregated_images = 1
|
n_aggregated_images = 1
|
||||||
|
|
||||||
if pixel_mask_pf is not None:
|
if pixel_mask_pf is not None:
|
||||||
data[~pixel_mask_pf] = np.nan
|
data[~pixel_mask_pf] = np.nan
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user