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

refactor #1

Merged
augustin_s merged 159 commits from refactor into main 2024-10-12 17:09:10 +02:00
Conversation 1 Commits 159 Files Changed 20 +2 -4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7d57d6c5e0 - Show all commits

6
dap/algos/aggregation.py
View File

@@ -1,5 +1,3 @@
import numpy as np
from .mask import calc_mask_pixels from .mask import calc_mask_pixels
from .thresh import threshold from .thresh import threshold
@@ -8,7 +6,7 @@ def calc_apply_aggregation(results, data, pixel_mask_pf, aggregator):
calc_apply_threshold(results, data) # changes data in place calc_apply_threshold(results, data) # changes data in place
data = calc_data(results, data, aggregator) data = calc_data(results, data, aggregator)
calc_mask_pixels(data, pixel_mask_pf) # changes data in place calc_mask_pixels(data, pixel_mask_pf) # changes data in place
aggregation_ready = calc_aggregation_ready(results, data, aggregator) aggregation_ready = calc_aggregation_ready(results, aggregator)
return data, aggregation_ready return data, aggregation_ready
@@ -60,7 +58,7 @@ def calc_aggregate(results, data, aggregator):
def calc_aggregation_ready(results, data, aggregator): def calc_aggregation_ready(results, aggregator):
apply_aggregation = results.get("apply_aggregation", False) apply_aggregation = results.get("apply_aggregation", False)
if not apply_aggregation: if not apply_aggregation:
return False return False