From 22e80e053df8d006edb8759884a509852ef853b1 Mon Sep 17 00:00:00 2001
From: Maxim Gonchar <maxim.mg.gonchar@gmail.com>
Date: Fri, 26 May 2023 14:41:33 +0300
Subject: [PATCH] data: add osc pars
---
.gitmodules | 4 ----
models/dayabay_v0.py | 3 +++
submodules/dagflow-reactornueosc | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 7a624e1..ff87124 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "submodules/dagflow"]
- path = submodules/dagflow
- url = https://git.jinr.ru/dag-computing/dag-flow.git
- branch = feature/pars-gindex
[submodule "submodules/dagflow-reactornueosc"]
path = submodules/dagflow-reactornueosc
url = https://git.jinr.ru/dag-computing/dagflow-reactorenueosc.git
diff --git a/models/dayabay_v0.py b/models/dayabay_v0.py
index cb97255..e238319 100644
--- a/models/dayabay_v0.py
+++ b/models/dayabay_v0.py
@@ -31,6 +31,9 @@ def model_dayabay_v0():
#
# Load parameters
#
+ load_parameters({'path': 'oscprob' , 'load': datasource/'parameters/oscprob.yaml'})
+ load_parameters({'path': 'oscprob' , 'load': datasource/'parameters/oscprob_solar.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'})
diff --git a/submodules/dagflow-reactornueosc b/submodules/dagflow-reactornueosc
index 7252b54..8c02e0b 160000
--- a/submodules/dagflow-reactornueosc
+++ b/submodules/dagflow-reactornueosc
@@ -1 +1 @@
-Subproject commit 7252b5435e241a2421476b5be8e6e11d96134d0b
+Subproject commit 8c02e0b1a28ba130397c8f6be082feb69ec6dbcd
--
GitLab