diff --git a/model_tools/parameters_storage.py b/model_tools/parameters_storage.py index 06272036edbc6f36b4d33a1c45020f5a88b29e46..1c793c411a383bf72a1b3a3bd4ce1b9f6f689974 100644 --- a/model_tools/parameters_storage.py +++ b/model_tools/parameters_storage.py @@ -31,24 +31,15 @@ class ParametersStorage(NestedMKDict): def plot( self, *args, - close: bool=True, - show: bool=True, **kwargs ) -> None: from dagflow.plot import plot_auto - if close: - from matplotlib.pyplot import close - if show: - from matplotlib.pyplot import show - for key, value in self.walkitems(): + for _, value in self.walkitems(): if not isinstance(value, Output): continue plot_auto(value, *args, **kwargs) - if show: show() - if close: close() - def to_list(self, **kwargs) -> list: return self.visit(ParametersVisitor(kwargs)).data_list diff --git a/models/dayabay_v0.py b/models/dayabay_v0.py index f544cfe9f833a73f497643fad9dd11468afd0200..e65912baba3450cfed8cba9ba7c0b4e52333a8be 100644 --- a/models/dayabay_v0.py +++ b/models/dayabay_v0.py @@ -4,6 +4,7 @@ from pathlib import Path from dagflow.graph import Graph from dagflow.graphviz import savegraph from dagflow.lib.arithmetic import Sum +from dagflow.tools.schema import LoadYaml from gindex import GNIndex from model_tools.parameters_storage import ParametersStorage @@ -60,8 +61,9 @@ def model_dayabay_v0(): from dagflow.lib.Array import Array from dagflow.lib.View import View from numpy import linspace - outputs['edges.energy_common']= (energy_edges:=Array("energy_edges", linspace(0, 12, 241)).outputs[0]) - outputs['edges.energy_evis']= (energy_evis:=View("energy_evis").outputs[0]) + labels = LoadYaml(datasource/'labels.yaml') + outputs['edges.energy_common']= (energy_edges:=Array("energy_edges", linspace(0, 12, 241), label=labels['energy_common']).outputs[0]) + outputs['edges.energy_evis']= (energy_evis:=View("energy_evis", label=labels['energy_evis']).outputs[0]) energy_edges >> energy_evis.node storage.read_paths()