sf-daq/dap
0
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

the usual todo note

Browse Source
This commit is contained in:
augustin_s
2024-08-09 12:56:15 +02:00
parent 03b556d61f
commit a7429115d7
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dap/algos/forcesend.py
View File

@ -37,9 +37,11 @@ def calc_apply_threshold(results, data):
if k not in results: if k not in results:
return return
#TODO: this is duplicated in calc_apply_threshold and calc_radial_integration
threshold_min = float(results["threshold_min"]) threshold_min = float(results["threshold_min"])
threshold_max = float(results["threshold_max"]) threshold_max = float(results["threshold_max"])
data[data < threshold_min] = 0.0 data[data < threshold_min] = 0.0
#TODO: skipping max is a guess, but not obvious/symmetric -- better to ensure the order min < max by switching them if needed
if threshold_max > threshold_min: if threshold_max > threshold_min:
data[data > threshold_max] = 0.0 data[data > threshold_max] = 0.0

2
dap/algos/radprof.py
View File

@ -18,7 +18,7 @@ def calc_radial_integration(results, data, pixel_mask_pf):
apply_threshold = results.get("apply_threshold", False) apply_threshold = results.get("apply_threshold", False)
#TODO: this is duplicated in calc_apply_threshold #TODO: this is duplicated in calc_apply_threshold and calc_force_send
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"])
threshold_max = float(results["threshold_max"]) threshold_max = float(results["threshold_max"])

2
dap/algos/thresh.py
View File

@ -13,7 +13,7 @@ def calc_apply_threshold(results, data):
threshold_value_choice = results.get("threshold_value", "NaN") threshold_value_choice = results.get("threshold_value", "NaN")
threshold_value = 0 if threshold_value_choice == "0" else np.nan #TODO threshold_value = 0 if threshold_value_choice == "0" else np.nan #TODO
#TODO: this is duplicated in calc_radial_integration #TODO: this is duplicated in calc_radial_integration and calc_force_send
threshold_min = float(results["threshold_min"]) threshold_min = float(results["threshold_min"])
threshold_max = float(results["threshold_max"]) threshold_max = float(results["threshold_max"])
data[data < threshold_min] = threshold_value data[data < threshold_min] = threshold_value