diff --git a/src/postprocessor/core/abc.py b/src/postprocessor/core/abc.py index b4db424c76c81b283ab1fb8365e93e6d74338b7c..a299e19f6f87a33e0d9a6c5c099b291f377811dc 100644 --- a/src/postprocessor/core/abc.py +++ b/src/postprocessor/core/abc.py @@ -30,11 +30,15 @@ def get_process(process, suffix=""): Dynamically import a process class from the available process locations. Assumes process filename and class name are the same + Processes return the same shape as their input. + MultiSignal either take or return multiple datasets (or both). + Reshapers return a different shape for processes: Merger and Picker belong here. + suffix : str Name of suffix, generally "" (empty) or "Parameters". """ base_location = "postprocessor.core" - possible_locations = ("processes", "multisignal") + possible_locations = ("processes", "multisignal", "reshapers") found = None for possible_location in possible_locations: diff --git a/src/postprocessor/core/processor.py b/src/postprocessor/core/processor.py index 915139db82f27626a28f284c77b55004576f9546..a9836c1c441180e4c57ac996c390ed7229947eb1 100644 --- a/src/postprocessor/core/processor.py +++ b/src/postprocessor/core/processor.py @@ -14,8 +14,8 @@ from postprocessor.core.abc import get_parameters, get_process from postprocessor.core.processes.lineageprocess import ( LineageProcessParameters, ) -from postprocessor.core.processes.merger import merger, mergerParameters -from postprocessor.core.processes.picker import picker, pickerParameters +from postprocessor.core.reshapers.merger import merger, mergerParameters +from postprocessor.core.reshapers.picker import picker, pickerParameters class PostProcessorParameters(ParametersABC): diff --git a/src/postprocessor/core/reshapers/merger.py b/src/postprocessor/core/reshapers/merger.py index 2f31724e88bd0fec06f35368db4cda27fa38b152..16d2b598ea720027a2d0ca566adfc1b73cc5c31a 100644 --- a/src/postprocessor/core/reshapers/merger.py +++ b/src/postprocessor/core/reshapers/merger.py @@ -24,7 +24,7 @@ class mergerParameters(ParametersABC): class merger(PostProcessABC): """ - TODO check why it needs to be run a few times to complete the merging + Combines rows of tracklet that are likely to be the same. """ def __init__(self, parameters):