diff --git a/models/dayabay_v0.py b/models/dayabay_v0.py
index f14e5d460594b362f97421a3a1c276bb4b195452..1bb2a50f79336e9956d85661c9bc064a75b3d072 100644
--- a/models/dayabay_v0.py
+++ b/models/dayabay_v0.py
@@ -10,65 +10,65 @@ from dagflow.storage import NodeStorage
def model_dayabay_v0():
storage = NodeStorage()
- datasource = Path('data/dayabay-v0')
+ datasource = Path("data/dayabay-v0")
index = GNIndex.from_dict({
- ('s', 'site'): ('EH1', 'EH2', 'EH3'),
- ('d', 'detector'): ('AD11', 'AD12', 'AD21', 'AD22', 'AD31', 'AD32', 'AD33', 'AD34'),
- ('p', 'period'): ('6AD', '8AD', '7AD'),
- ('r', 'reactor'): ('DB1', 'DB2', 'LA1', 'LA2', 'LA3', 'LA4'),
- ('i', 'isotope'): ('U235', 'U238', 'Pu239', 'Pu241'),
- ('b', 'background'): ('acc', 'lihe', 'fastn', 'amc', 'alphan'),
+ ("s", "site"): ("EH1", "EH2", "EH3"),
+ ("d", "detector"): ("AD11", "AD12", "AD21", "AD22", "AD31", "AD32", "AD33", "AD34"),
+ ("p", "period"): ("6AD", "8AD", "7AD"),
+ ("r", "reactor"): ("DB1", "DB2", "LA1", "LA2", "LA3", "LA4"),
+ ("i", "isotope"): ("U235", "U238", "Pu239", "Pu241"),
+ ("b", "background"): ("acc", "lihe", "fastn", "amc", "alphan"),
})
- idx_r = index.sub('r')
- idx_rd = index.sub(('r', 'd'))
- idx_ri = index.sub(('r', 'i'))
+ idx_d = index.sub("d")
+ idx_r = index.sub("r")
+ idx_rd = index.sub(("r", "d"))
+ idx_ri = index.sub(("r", "i"))
+
+ list_detectors = idx_d.values
list_reactors = idx_r.values
- list_dr = idx_rd.values
+ list_reactors_detectors = idx_rd.values
list_reactors_isotopes = idx_ri.values
- list_dr_unique = idx_rd.unique_values
- idx_unique = index.unique_values
-
close = True
with Graph(close=close) as graph, storage:
#
# Load parameters
#
- load_parameters({'path': 'oscprob' , 'load': datasource/'parameters/oscprob.yaml'})
- load_parameters({'path': 'oscprob' , 'load': datasource/'parameters/oscprob_solar.yaml'})
- load_parameters({'path': 'oscprob' , 'load': datasource/'parameters/oscprob_constants.yaml'})
+ load_parameters({"path": "oscprob" , "load": datasource/"parameters/oscprob.yaml"})
+ load_parameters({"path": "oscprob" , "load": datasource/"parameters/oscprob_solar.yaml"})
+ load_parameters({"path": "oscprob" , "load": datasource/"parameters/oscprob_constants.yaml"})
- load_parameters({'path': 'ibd' , 'load': datasource/'parameters/pdg2012.yaml'})
- load_parameters({'path': 'ibd.csc' , 'load': datasource/'parameters/ibd_constants.yaml'})
- load_parameters({'path': 'conversion' , 'load': datasource/'parameters/conversion_thermal_power.yaml'})
- load_parameters({'path': 'conversion' , 'load': datasource/'parameters/conversion_oscprob_argument.yaml'})
+ load_parameters({"path": "ibd" , "load": datasource/"parameters/pdg2012.yaml"})
+ load_parameters({"path": "ibd.csc" , "load": datasource/"parameters/ibd_constants.yaml"})
+ load_parameters({"path": "conversion" , "load": datasource/"parameters/conversion_thermal_power.yaml"})
+ load_parameters({"path": "conversion" , "load": datasource/"parameters/conversion_oscprob_argument.yaml"})
- load_parameters({ 'load': datasource/'parameters/baselines.yaml'})
+ load_parameters({ "load": datasource/"parameters/baselines.yaml"})
- load_parameters({'path': 'detector' , 'load': datasource/'parameters/detector_nprotons_correction.yaml'})
- load_parameters({'path': 'detector' , 'load': datasource/'parameters/detector_eres.yaml'})
+ load_parameters({"path": "detector" , "load": datasource/"parameters/detector_nprotons_correction.yaml"})
+ load_parameters({"path": "detector" , "load": datasource/"parameters/detector_eres.yaml"})
- load_parameters({'path': 'reactor' , 'load': datasource/'parameters/reactor_e_per_fission.yaml'})
- load_parameters({'path': 'reactor' , 'load': datasource/'parameters/reactor_thermal_power_nominal.yaml' , 'replicate': list_reactors })
- load_parameters({'path': 'reactor' , 'load': datasource/'parameters/reactor_snf.yaml' , 'replicate': list_reactors })
- load_parameters({'path': 'reactor' , 'load': datasource/'parameters/reactor_offequilibrium_correction.yaml' , 'replicate': list_reactors_isotopes })
- load_parameters({'path': 'reactor' , 'load': datasource/'parameters/reactor_fission_fraction_scale.yaml' , 'replicate': list_reactors , 'replica_key_offset': 1 })
+ load_parameters({"path": "reactor" , "load": datasource/"parameters/reactor_e_per_fission.yaml"})
+ load_parameters({"path": "reactor" , "load": datasource/"parameters/reactor_thermal_power_nominal.yaml" , "replicate": list_reactors })
+ load_parameters({"path": "reactor" , "load": datasource/"parameters/reactor_snf.yaml" , "replicate": list_reactors })
+ load_parameters({"path": "reactor" , "load": datasource/"parameters/reactor_offequilibrium_correction.yaml" , "replicate": list_reactors_isotopes })
+ load_parameters({"path": "reactor" , "load": datasource/"parameters/reactor_fission_fraction_scale.yaml" , "replicate": list_reactors , "replica_key_offset": 1 })
# Create Nuisance parameters
- nuisanceall = Sum('nuisance total')
- storage['stat.nuisance.all'] = nuisanceall
+ nuisanceall = Sum("nuisance total")
+ storage["stat.nuisance.all"] = nuisanceall
- (output for output in storage('stat.nuisance_parts').walkvalues()) >> nuisanceall
+ (output for output in storage("stat.nuisance_parts").walkvalues()) >> nuisanceall
#
# Create nodes
#
- labels = LoadYaml(datasource/'labels.yaml')
- parameters = storage('parameter')
- nodes = storage.child('nodes')
- inputs = storage.child('inputs')
- outputs = storage.child('outputs')
+ labels = LoadYaml(datasource/"labels.yaml")
+ parameters = storage("parameter")
+ nodes = storage.child("nodes")
+ inputs = storage.child("inputs")
+ outputs = storage.child("outputs")
from dagflow.lib.Array import Array
from dagflow.lib.View import View
@@ -83,32 +83,36 @@ def model_dayabay_v0():
integration_orders_edep, _=Array.from_value("integration.ordersx", 4, edges=edges_energy_edep, label_from=labels)
integration_orders_costheta, _=Array.from_value("integration.ordersy", 4, edges=edges_costheta, label_from=labels)
from dagflow.lib.IntegratorGroup import IntegratorGroup
- integrator, _=IntegratorGroup.replicate('2d', 'kinematics_sampler', 'kinematics_integrator', replicate=list_dr)
+ integrator, _=IntegratorGroup.replicate("2d", "kinematics_sampler", "kinematics_integral", replicate=list_reactors_detectors)
integration_orders_edep >> integrator.inputs["ordersX"]
integration_orders_costheta >> integrator.inputs["ordersY"]
- outputs['integration.mesh_edep'] = (int_mesh_edep:=integrator.outputs['x'])
- outputs['integration.mesh_costheta'] = (int_mesh_costheta:=integrator.outputs['y'])
+ outputs["integration.mesh_edep"] = (int_mesh_edep:=integrator.outputs["x"])
+ outputs["integration.mesh_costheta"] = (int_mesh_costheta:=integrator.outputs["y"])
from reactornueosc.IBDXsecO1Group import IBDXsecO1Group
ibd, _ = IBDXsecO1Group.make_stored(use_edep=True)
- ibd << storage('parameter.constant.ibd')
- ibd << storage('parameter.constant.ibd.csc')
- int_mesh_edep >> ibd.inputs['edep']
- int_mesh_costheta >> ibd.inputs['costheta']
- outputs['ibd'] = ibd.outputs['result']
+ ibd << storage("parameter.constant.ibd")
+ ibd << storage("parameter.constant.ibd.csc")
+ int_mesh_edep >> ibd.inputs["edep"]
+ int_mesh_costheta >> ibd.inputs["costheta"]
+ outputs["ibd"] = ibd.outputs["result"]
from reactornueosc.NueSurvivalProbability import NueSurvivalProbability
- NueSurvivalProbability.replicate('oscprob', replicate=list_dr)
- ibd.outputs['enu'] >> inputs('oscprob.enu')
- parameters('constant.baseline') >> inputs('oscprob.L')
- nodes('oscprob') << parameters('free.oscprob')
- nodes('oscprob') << parameters('constrained.oscprob')
- nodes('oscprob') << parameters('constant.oscprob')
+ NueSurvivalProbability.replicate("oscprob", replicate=list_reactors_detectors, distance_unit="m")
+ ibd.outputs["enu"] >> inputs("oscprob.enu")
+ parameters("constant.baseline") >> inputs("oscprob.L")
+ nodes("oscprob") << parameters("free.oscprob")
+ nodes("oscprob") << parameters("constrained.oscprob")
+ nodes("oscprob") << parameters("constant.oscprob")
+
+ from dagflow.lib.arithmetic import Product
+ Product.replicate("kinematics_integrand", outputs("oscprob"), outputs["ibd"], replicate=list_reactors_detectors)
+ outputs("kinematics_integrand") >> inputs("kinematics_integral")
- ibd.outputs['result'] >> inputs('kinematics_integrator')
+ Sum.replicate("count_rate", outputs("kinematics_integral"), replicate=list_detectors)
- storage('outputs').read_labels(labels, strict=True)
- storage('inputs').remove_connected_inputs()
+ storage("outputs").read_labels(labels, strict=True)
+ storage("inputs").remove_connected_inputs()
storage.read_paths()
# storage.process_indices(idx_unique)
@@ -116,44 +120,45 @@ def model_dayabay_v0():
print(storage.to_table(truncate=True))
return
- # storage('outputs').plot(show_all=True)
+ # storage("outputs").plot(show_all=True)
+ # storage("outputs.oscprob").plot(show_all=True)
- storage['parameter.normalized.detector.eres.b_stat'].value = 1
- storage['parameter.normalized.detector.eres.a_nonuniform'].value = 2
+ storage["parameter.normalized.detector.eres.b_stat"].value = 1
+ storage["parameter.normalized.detector.eres.a_nonuniform"].value = 2
- # p1 = storage['parameter.normalized.detector.eres.b_stat']
- # p2 = storage['parameter.constrained.detector.eres.b_stat']
+ # p1 = storage["parameter.normalized.detector.eres.b_stat"]
+ # p2 = storage["parameter.constrained.detector.eres.b_stat"]
- constrained = storage('parameter.constrained')
- normalized = storage('parameter.normalized')
+ constrained = storage("parameter.constrained")
+ normalized = storage("parameter.normalized")
- print('Everything')
+ print("Everything")
print(storage.to_table(truncate=True))
- # print('Constants')
- # print(storage('parameter.constant').to_table(truncate=True))
+ # print("Constants")
+ # print(storage("parameter.constant").to_table(truncate=True))
#
- # print('Constrained')
+ # print("Constrained")
# print(constrained.to_table(truncate=True))
#
- # print('Normalized')
+ # print("Normalized")
# print(normalized.to_table(truncate=True))
#
- # print('Stat')
- # print(storage('stat').to_table(truncate=True))
+ # print("Stat")
+ # print(storage("stat").to_table(truncate=True))
- # print('Parameters (latex)')
- # print(storage['parameter'].to_latex())
+ # print("Parameters (latex)")
+ # print(storage["parameter"].to_latex())
#
- # print('Constants (latex)')
- # tex = storage['parameter.constant'].to_latex(columns=['path', 'value', 'label'])
+ # print("Constants (latex)")
+ # tex = storage["parameter.constant"].to_latex(columns=["path", "value", "label"])
# print(tex)
- storage.to_datax('output/dayabay_v0_data.tex')
+ storage.to_datax("output/dayabay_v0_data.tex")
from dagflow.graphviz import GraphDot
- GraphDot.from_graph(graph, show='all').savegraph("output/dayabay_v0.dot")
- GraphDot.from_node(storage['parameter_node.constrained.reactor.fission_fraction_scale.DB1'].constraint._norm_node, show='all', minsize=2).savegraph("output/dayabay_v0_large.dot")
- GraphDot.from_node(storage['stat.nuisance.all'], show='all', mindepth=-1, no_forward=True).savegraph("output/dayabay_v0_nuisance.dot")
- GraphDot.from_output(storage['outputs.edges.energy_evis'], show='all', mindepth=-3, no_forward=True).savegraph("output/dayabay_v0_top.dot")
+ GraphDot.from_graph(graph, show="all").savegraph("output/dayabay_v0.dot")
+ GraphDot.from_node(storage["parameter_node.constrained.reactor.fission_fraction_scale.DB1"].constraint._norm_node, show="all", minsize=2).savegraph("output/dayabay_v0_large.dot")
+ GraphDot.from_node(storage["stat.nuisance.all"], show="all", mindepth=-1, no_forward=True).savegraph("output/dayabay_v0_nuisance.dot")
+ GraphDot.from_output(storage["outputs.edges.energy_evis"], show="all", mindepth=-3, no_forward=True).savegraph("output/dayabay_v0_top.dot")