[bug] [factorisation] removed remaining validity checks is_valid

This commit is contained in:
Noe Brucy
2020-12-15 15:56:24 +01:00
parent 9864ba97b8
commit 157f84e994
3 changed files with 12 additions and 23 deletions
-5
View File
@@ -23,14 +23,12 @@ class Rule:
description="", description="",
group="", group="",
dependencies=[], dependencies=[],
is_valid=lambda arg: True,
kind="classic", kind="classic",
unit=U.none, unit=U.none,
): ):
self.postproc = postproc self.postproc = postproc
self.process_fn = process self.process_fn = process
self.dependencies = dependencies self.dependencies = dependencies
self.is_valid_add = is_valid
self.group = group self.group = group
self.description = description self.description = description
self.unit = unit self.unit = unit
@@ -144,7 +142,6 @@ class BaseProcessor:
else: else:
name_full = rule.group + "/" + name name_full = rule.group + "/" + name
if rule.is_valid(arg):
if name_full not in self.just_done: if name_full not in self.just_done:
if self._needs_computation(overwrite, name_full): if self._needs_computation(overwrite, name_full):
self._log("Processing {}".format(name_full)) self._log("Processing {}".format(name_full))
@@ -157,8 +154,6 @@ class BaseProcessor:
self._log( self._log(
"Data for {} is already computed, skipping...".format(name_full) "Data for {} is already computed, skipping...".format(name_full)
) )
else:
self._log("{} is not valid in this context".format(name_full), "ERROR")
def def_rules(self): def def_rules(self):
for rule in self.rules: for rule in self.rules:
-5
View File
@@ -266,11 +266,6 @@ class Plotter(Aggregator, BaseProcessor):
else: else:
name_full = name name_full = name
# Exit if not valid
if not rule.is_valid(arg):
self._log("{} is not valid in this context".format(name_full), "ERROR")
return
# get filetype of the output # get filetype of the output
filetype = filetype_from_ext[self.pp_params.out.ext] filetype = filetype_from_ext[self.pp_params.out.ext]
-1
View File
@@ -1386,7 +1386,6 @@ class PostProcessor(HDF5Container):
"Toomre Q parameter for a Keplerian disk", "Toomre Q parameter for a Keplerian disk",
"/maps", "/maps",
dependencies=["coldens"], dependencies=["coldens"],
is_valid=lambda _: self.pp_params.disk.enable,
), ),
"sinks": Rule( "sinks": Rule(
self, self,