[selector] make select a hardcoded argument, and propaget it (see #6)

This commit is contained in:
Noe Brucy
2021-01-28 11:58:16 +01:00
parent 9f8da0a8db
commit 8c82117dfc
3 changed files with 38 additions and 30 deletions
+13 -6
View File
@@ -232,18 +232,18 @@ class Plotter(Aggregator, BaseProcessor):
self.simulations[run] = simu
def _not_self_dep(self, name, dep, dep_arg, overwrite, **kwargs):
def _not_self_dep(self, name, dep, dep_arg, overwrite, select):
"""
Check if the dependency belongs to the plotter object or to another one (comp, pp, ..)
"""
if dep in self.comp.rules:
result = self.comp.process(
dep, dep_arg, overwrite, overwrite_dep=self.overwrite_dep
dep, dep_arg, overwrite, self.overwrite_dep, select
)
if result is not None:
self.just_done.append(result)
else:
super(Plotter, self)._not_self_dep(name, dep, dep_arg, overwrite, **kwargs)
super(Plotter, self)._not_self_dep(name, dep, dep_arg, overwrite, select)
def _needs_computation(self, overwrite, plot_filename):
"""
@@ -256,7 +256,15 @@ class Plotter(Aggregator, BaseProcessor):
)
def _process_rule(
self, name, rule, arg, overwrite=False, ax=None, from_cells=False, **kwargs
self,
name,
rule,
arg,
overwrite=False,
select=None,
ax=None,
from_cells=False,
**kwargs,
):
"""
Open storage and figure if needed before processing a rule
@@ -282,8 +290,7 @@ class Plotter(Aggregator, BaseProcessor):
filetype = filetype_from_ext[self.pp_params.out.ext]
# Select runs and nums
if "select" in kwargs:
select = kwargs.pop("select")
if select is not None:
runs, nums = self.selector.select(**select)
else:
runs = self.runs