diff --git a/core/processes/picker.py b/core/processes/picker.py index a7221e6f8146609a59921e3752826aedac6c3802..ef986cfa3974f474a1df901beddb960bae4d115f 100644 --- a/core/processes/picker.py +++ b/core/processes/picker.py @@ -1,6 +1,3 @@ -import seaborn as sns -from matplotlib import pyplot as plt # TODO DELETE THIS - from typing import Tuple, Union, List from abc import ABC, abstractmethod @@ -29,10 +26,10 @@ class pickerParameters(ParametersABC): { "sequence": [ # ("lineage", "intersection", "families"), - ("condition", "intersection", "any_present", 0.8), - ("condition", "intersection", "growing", 40), - ("condition", "intersection", "present", 8), - ("condition", "intersection", "mother_buds", 5, 0.8), + ["condition", "intersection", "any_present", 0.8], + ["condition", "intersection", "growing", 40], + ["condition", "intersection", "present", 8], + ["condition", "intersection", "mother_buds", 5, 0.8], # ("lineage", "full_families", "intersection"), ], } diff --git a/core/processor.py b/core/processor.py index 81c54b6f19f60df1316223df87ad8dbb883c1ef3..46bbd6cb3711c96d8f751a332f079602cc101464 100644 --- a/core/processor.py +++ b/core/processor.py @@ -49,16 +49,16 @@ class PostProcessorParameters(ParametersABC): "merger": "/extraction/general/None/area", "picker": ["/extraction/general/None/area"], }, - "processes": ( - ( + "processes": [ + [ "bud_metric", [ "/extraction/general/None/volume", "/extraction/em_ratio/np_max/mean", "/extraction/em_ratio/np_max/median", ], - ), - ( + ], + [ "dsignal", [ "/extraction/general/None/volume", @@ -70,7 +70,7 @@ class PostProcessorParameters(ParametersABC): "/postprocessing/bud_metric/extraction_em_ratio_np_max_mean", "/postprocessing/bud_metric/extraction_em_ratio_np_max_median", ], - ), + ], ( "aggregate", [ @@ -93,12 +93,12 @@ class PostProcessorParameters(ParametersABC): ], ), # "savgol": ["/extraction/general/None/area"], - ), + ], }, parameters={ "prepost": { - "merger": mergerParameters.default(), - "picker": pickerParameters.default(), + "merger": mergerParameters.default().to_dict(), + "picker": pickerParameters.default().to_dict(), } }, outpaths={"aggregate": "/postprocessing/experiment_wide/aggregated/"},