From 9a4a78e0a21920819b47ea9d550ddb1ce78217f0 Mon Sep 17 00:00:00 2001
From: Maxim Gonchar <maxim.mg.gonchar@gmail.com>
Date: Fri, 9 Jun 2023 18:00:03 +0300
Subject: [PATCH] chore: load_graph
---
models/dayabay_v0.py | 35 +++++++----------------------------
models/dayabay_v1.py | 8 ++++----
2 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/models/dayabay_v0.py b/models/dayabay_v0.py
index 4ea6e9d..640f314 100644
--- a/models/dayabay_v0.py
+++ b/models/dayabay_v0.py
@@ -1,5 +1,5 @@
from dagflow.bundles.load_parameters import load_parameters
-from dagflow.bundles.load_arrays import load_arrays
+from dagflow.bundles.load_graph import load_graph
from pathlib import Path
from dagflow.graph import Graph
@@ -119,35 +119,14 @@ def model_dayabay_v0():
nodes("oscprob") << parameters("constrained.oscprob")
nodes("oscprob") << parameters("constant.oscprob")
- load_arrays(
- name = "reactor_anue_spectrum",
- filenames = [
- datasource/"tsv/reactor_anue_spectra_50kev/Huber_anue_spectrum_extrap_U235_13.0_0.05_MeV.tsv",
- datasource/"tsv/reactor_anue_spectra_50kev/Huber_anue_spectrum_extrap_Pu239_13.0_0.05_MeV.tsv",
- datasource/"tsv/reactor_anue_spectra_50kev/Huber_anue_spectrum_extrap_Pu241_13.0_0.05_MeV.tsv",
- datasource/"tsv/reactor_anue_spectra_50kev/Mueller_anue_spectrum_extrap_U238_13.0_0.05_MeV.tsv"
- ],
- replicate = index["isotope"],
- x = 'enu',
- y = 'spec',
- merge_x = True
- )
-
- # load_arrays(
- # name = "reactor_anue_spectrum",
- # filenames = datasource/"hdf/anue_spectra_extrap_13.0_0.05_MeV.hdf5",
- # replicate = index["isotope"]
- # )
- #
- # load_arrays(
- # name = "reactor_anue_spectrum",
- # filenames = datasource/"root/anue_spectra_extrap_13.0_0.05_MeV.root",
- # replicate = index["isotope"]
- # )
+ load_graph(name="reactor_anue.input_spectrum", x='enu', y='spec', load=datasource/"tsv/reactor_anue_spectra_50kev.yaml")
+ # load_graph(name="reactor_anue.input_spectrum", x='enu', y='spec', merge_x=True, filenames=datasource/"hdf/anue_spectra_extrap_13.0_0.05_MeV.hdf5", replicate=index["isotope"])
+ # load_graph(name="reactor_anue.input_spectrum", x='enu', y='spec', merge_x=True, filenames=datasource/"root/anue_spectra_extrap_13.0_0.05_MeV.root", replicate=index["isotope"])
+
from dagflow.lib.InterpolatorGroup import InterpolatorGroup
interpolator, _ = InterpolatorGroup.replicate("exp", "reactor_anue.indexer", "reactor_anue.interpolator", replicate=index["isotope"])
- outputs["reactor_anue_spectrum.enu"] >> inputs["reactor_anue.interpolator.xcoarse"]
- outputs("reactor_anue_spectrum.spec") >> inputs("reactor_anue.interpolator.ycoarse")
+ outputs["reactor_anue.input_spectrum.enu"] >> inputs["reactor_anue.interpolator.xcoarse"]
+ outputs("reactor_anue.input_spectrum.spec") >> inputs("reactor_anue.interpolator.ycoarse")
ibd.outputs["enu"] >> inputs["reactor_anue.interpolator.xfine"]
from dagflow.lib.arithmetic import Product
diff --git a/models/dayabay_v1.py b/models/dayabay_v1.py
index 346e495..43d8b23 100644
--- a/models/dayabay_v1.py
+++ b/models/dayabay_v1.py
@@ -1,5 +1,5 @@
from dagflow.bundles.load_parameters import load_parameters
-from dagflow.bundles.load_arrays import load_arrays
+from dagflow.bundles.load_graph import load_graph
from pathlib import Path
from dagflow.graph import Graph
@@ -113,7 +113,7 @@ def model_dayabay_v1():
nodes("oscprob") << parameters("constrained.oscprob")
nodes("oscprob") << parameters("constant.oscprob")
- load_arrays(
+ load_graph(
name = "reactor_anue_spectrum",
filenames = [
datasource/"tsv/reactor_anue_spectra_50kev/Huber_anue_spectrum_extrap_U235_13.0_0.05_MeV.tsv",
@@ -127,13 +127,13 @@ def model_dayabay_v1():
merge_x = True
)
- # load_arrays(
+ # load_graph(
# name = "reactor_anue_spectrum",
# filenames = datasource/"hdf/anue_spectra_extrap_13.0_0.05_MeV.hdf5",
# replicate = list_isotopes
# )
#
- # load_arrays(
+ # load_graph(
# name = "reactor_anue_spectrum",
# filenames = datasource/"root/anue_spectra_extrap_13.0_0.05_MeV.root",
# replicate = list_isotopes
--
GitLab