diff --git a/core/processor.py b/core/processor.py index 9098220926286ba0eabb892b55b8418790a0dc99..87bc475fc5ebd73dd46c5e35263c31aa481eaaf1 100644 --- a/core/processor.py +++ b/core/processor.py @@ -15,19 +15,17 @@ class PostProcessorParameters(ParametersABC): Anthology of parameters used for postprocessing :merger: :picker: parameters for picker - :processes: List of processes that can be found in ./processes - :datasets: Dictionary + :processes: Dict processes:[objectives], 'processes' are defined in ./processes/ + while objectives are relative or absolute paths to datasets. If relative paths the + post-processed addresses are used. #TODO Use cells to fetch updated cell indices """ - def __init__( - self, merger=None, picker=None, processes=[], datasets=[], outpaths=[] - ): + def __init__(self, merger=None, picker=None, processes=[]): self.merger: MergerParameters = merger self.picker: PickerParameters = picker self.processes: List = processes - self.outpaths = outpaths self.datasets: Dict = datasets @@ -43,7 +41,7 @@ class PostProcessorParameters(ParametersABC): datasets={ "merger": "/extraction/general/None/area", "picker": "/extraction/general/None/area", - "processes": [], + "processes": {"dSignal": ["/general/None/area"]}, }, ) @@ -57,8 +55,7 @@ class PostProcessor: self._signal = Signal(filename) self._writer = Writer(filename) - self.datasets = parameters["datasets"] - self.outpaths = parameters["outpaths"] + # self.outpaths = parameters["outpaths"] self.merger = Merger(parameters["merger"]) self.picker = Picker( parameters=parameters["picker"], cells=Cells.from_source(filename) diff --git a/examples/basic_processes.py b/examples/basic_processes.py index b3bf6a2455bfd0ee95a521d2ed1f20f55e584292..c322fd4b68b2dd4f310a44bcd2a4ccbebb366f48 100644 --- a/examples/basic_processes.py +++ b/examples/basic_processes.py @@ -5,11 +5,11 @@ pp = PostProcessor( "/shared_libs/pipeline-core/scripts/pH_calibration_dual_phl__ura8__by4741__01/ph_5_29_025store.h5", params, ) -# tmp = pp.run() +tmp = pp.run() import h5py -f = h5py.File( - "/shared_libs/pipeline-core/scripts/pH_calibration_dual_phl__ura8__by4741__01/ph_5_29_025store.h5", - "a", -) +# f = h5py.File( +# "/shared_libs/pipeline-core/scripts/pH_calibration_dual_phl__ura8__by4741__01/ph_5_29_025store.h5", +# "a", +# )