diff --git a/.gitmodules b/.gitmodules index 7a624e146e71f630d78a5935a32528e15ee7ce29..ff87124a12cfad2e118b4f20b08635c112c9c441 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 cb97255be7d89379ef9c5e173a6802d826c3ab93..e238319c1d7132358bb978aa0abd3c1281526646 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 7252b5435e241a2421476b5be8e6e11d96134d0b..8c02e0b1a28ba130397c8f6be082feb69ec6dbcd 160000 --- a/submodules/dagflow-reactornueosc +++ b/submodules/dagflow-reactornueosc @@ -1 +1 @@ -Subproject commit 7252b5435e241a2421476b5be8e6e11d96134d0b +Subproject commit 8c02e0b1a28ba130397c8f6be082feb69ec6dbcd