From fcce6dd3c205a79e087150b9c419df3965cfd212 Mon Sep 17 00:00:00 2001
From: Maxim Gonchar <maxim.mg.gonchar@gmail.com>
Date: Mon, 24 Apr 2023 17:57:09 +0300
Subject: [PATCH] feat: add offequilibrium_correction
---
models/dayabay_v0.py | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/models/dayabay_v0.py b/models/dayabay_v0.py
index cba4253..b894953 100644
--- a/models/dayabay_v0.py
+++ b/models/dayabay_v0.py
@@ -54,31 +54,41 @@ def model_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'),
})
idx_r= index.sub('r')
+ idx_rd= index.sub(('r', 'd'))
+ idx_ri= index.sub(('r', 'i'))
list_reactors = idx_r.values
+ list_dr = idx_rd.values
+ list_reactors_isotopes = idx_ri.values
with Graph(close=True) as g:
storage ^= load_parameters({'path': 'ibd' , 'load': datasource/'parameters/pdg2012.yaml'})
+
+ storage ^= load_parameters({ 'load': datasource/'parameters/baselines.yaml'})
+
storage ^= load_parameters({'path': 'detector' , 'load': datasource/'parameters/detector_nprotons_correction.yaml'})
+ storage ^= load_parameters({ 'load': datasource/'parameters/detector_eres.yaml'})
+
storage ^= load_parameters({'path': 'reactor' , 'load': datasource/'parameters/reactor_thermal_power_nominal.yaml', 'replicate': list_reactors })
- storage ^= load_parameters({'path': 'eres' , 'load': datasource/'parameters/detector_eres.yaml'})
- storage ^= load_parameters({ 'load': datasource/'parameters/baselines.yaml'})
+ storage ^= load_parameters({'path': 'reactor' , 'load': datasource/'parameters/offequilibrium_correction.yaml', 'replicate': list_reactors_isotopes })
nuisanceall = Sum('nuisance total')
storage['stat.nuisance.all'] = nuisanceall
- (output for output in storage['stat.nuisance_parts'].values()) >> nuisanceall
+ (output for output in storage['stat.nuisance_parts'].walkvalues()) >> nuisanceall
- storage['parameter.normalized.eres.eres.b_stat'].value = 1
- storage['parameter.normalized.eres.eres.a_nonuniform'].value = 2
+ storage['parameter.normalized.eres.b_stat'].value = 1
+ storage['parameter.normalized.eres.a_nonuniform'].value = 2
- # print('Everything')
- # print(storage.to_df())
+ print('Everything')
+ print(storage.to_df())
print('Parameters')
print(storage['parameter'].to_df())
--
GitLab