Merge pull request #45 from NNPDF/fix-vlchi2

fix shifting of the data during sampling
NNPDF · Sep 25, 2022 · 42cb7e3 · 42cb7e3
2 parents d76a2d0 + 25fe01a
commit 42cb7e3
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 45 deletions.
diff --git a/runcards/fit_runcard.yml b/runcards/fit_runcard.yml
@@ -8,48 +8,48 @@ description: runcard for nnufit
 
 # Datasets to be included in the fit
 experiments:
-- {dataset: BEBCWA59_F2, frac: 0.80}
-- {dataset: BEBCWA59_F3, frac: 0.80}
-- {dataset: CCFR_F2, frac: 0.80}
-- {dataset: CCFR_F3, frac: 0.80}
-- {dataset: CDHSW_DXDYNUB, frac: 0.80}
-- {dataset: CDHSW_DXDYNUU, frac: 0.80}
-- {dataset: CDHSW_F2, frac: 0.80}
-- {dataset: CDHSW_F3, frac: 0.80}
-- {dataset: CDHSW_FW, frac: 0.80}
-- {dataset: CHARM_F2, frac: 0.80}
-- {dataset: CHARM_F3, frac: 0.80}
-- {dataset: CHORUS_DXDYNUB, frac: 0.80}
-- {dataset: CHORUS_DXDYNUU, frac: 0.80}
-- {dataset: CHORUS_F2, frac: 0.80}
-- {dataset: CHORUS_F3, frac: 0.80}
-- {dataset: NUTEV_DXDYNUB, frac: 0.80}
-- {dataset: NUTEV_DXDYNUU, frac: 0.80}
-- {dataset: NUTEV_F2, frac: 0.80}
-- {dataset: NUTEV_F3, frac: 0.80}
+- {dataset: BEBCWA59_F2, frac: 0.75}
+- {dataset: BEBCWA59_F3, frac: 0.75}
+- {dataset: CCFR_F2, frac: 0.75}
+- {dataset: CCFR_F3, frac: 0.75}
+- {dataset: CDHSW_DXDYNUB, frac: 0.75}
+- {dataset: CDHSW_DXDYNUU, frac: 0.75}
+- {dataset: CDHSW_F2, frac: 0.75}
+- {dataset: CDHSW_F3, frac: 0.75}
+- {dataset: CDHSW_FW, frac: 0.75}
+- {dataset: CHARM_F2, frac: 0.75}
+- {dataset: CHARM_F3, frac: 0.75}
+- {dataset: CHORUS_DXDYNUB, frac: 0.75}
+- {dataset: CHORUS_DXDYNUU, frac: 0.75}
+- {dataset: CHORUS_F2, frac: 0.75}
+- {dataset: CHORUS_F3, frac: 0.75}
+- {dataset: NUTEV_DXDYNUB, frac: 0.75}
+- {dataset: NUTEV_DXDYNUU, frac: 0.75}
+- {dataset: NUTEV_F2, frac: 0.75}
+- {dataset: NUTEV_F3, frac: 0.75}
 # -- PROTON BC DATASETS (Matching A=1) --
-- {dataset: PROTONBC_F2_MATCHING, frac: 0.80}
-- {dataset: PROTONBC_F3_MATCHING, frac: 0.80}
-- {dataset: PROTONBC_DXDYNUU_MATCHING, frac: 0.80}
-- {dataset: PROTONBC_DXDYNUB_MATCHING, frac: 0.80}
+- {dataset: PROTONBC_F2_MATCHING, frac: 0.75}
+- {dataset: PROTONBC_F3_MATCHING, frac: 0.75}
+- {dataset: PROTONBC_DXDYNUU_MATCHING, frac: 0.75}
+- {dataset: PROTONBC_DXDYNUB_MATCHING, frac: 0.75}
 # -- MATCHING AT HIGH Q2 --
-- {dataset: BEBCWA59_F2_MATCHING, frac: 0.80}
-- {dataset: BEBCWA59_F3_MATCHING, frac: 0.80}
-- {dataset: CCFR_F2_MATCHING, frac: 0.80}
-- {dataset: CCFR_F3_MATCHING, frac: 0.80}
-# - {dataset: CDHSW_DXDYNUU_MATCHING, frac: 0.80}
-# - {dataset: CDHSW_DXDYNUB_MATCHING, frac: 0.80}
-# - {dataset: CDHSW_F2_MATCHING, frac: 0.80}
-# - {dataset: CDHSW_F3_MATCHING, frac: 0.80}
-# - {dataset: CDHSW_FW_MATCHING, frac: 0.80}
-- {dataset: CHORUS_DXDYNUB_MATCHING, frac: 0.80}
-- {dataset: CHORUS_DXDYNUU_MATCHING, frac: 0.80}
-- {dataset: CHORUS_F2_MATCHING, frac: 0.80}
-- {dataset: CHORUS_F3_MATCHING, frac: 0.80}
-- {dataset: NUTEV_DXDYNUB_MATCHING, frac: 0.80}
-- {dataset: NUTEV_DXDYNUU_MATCHING, frac: 0.80}
-- {dataset: NUTEV_F2_MATCHING, frac: 0.80}
-- {dataset: NUTEV_F3_MATCHING, frac: 0.80}
+- {dataset: BEBCWA59_F2_MATCHING, frac: 0.75}
+- {dataset: BEBCWA59_F3_MATCHING, frac: 0.75}
+- {dataset: CCFR_F2_MATCHING, frac: 0.75}
+- {dataset: CCFR_F3_MATCHING, frac: 0.75}
+# - {dataset: CDHSW_DXDYNUU_MATCHING, frac: 0.75}
+# - {dataset: CDHSW_DXDYNUB_MATCHING, frac: 0.75}
+# - {dataset: CDHSW_F2_MATCHING, frac: 0.75}
+# - {dataset: CDHSW_F3_MATCHING, frac: 0.75}
+# - {dataset: CDHSW_FW_MATCHING, frac: 0.75}
+- {dataset: CHORUS_DXDYNUB_MATCHING, frac: 0.75}
+- {dataset: CHORUS_DXDYNUU_MATCHING, frac: 0.75}
+- {dataset: CHORUS_F2_MATCHING, frac: 0.75}
+- {dataset: CHORUS_F3_MATCHING, frac: 0.75}
+- {dataset: NUTEV_DXDYNUB_MATCHING, frac: 0.75}
+- {dataset: NUTEV_DXDYNUU_MATCHING, frac: 0.75}
+- {dataset: NUTEV_F2_MATCHING, frac: 0.75}
+- {dataset: NUTEV_F3_MATCHING, frac: 0.75}
 
 # Define some kinematic cuts (Omit if not needed)
 kinematic_cuts:

diff --git a/src/nnusf/sffit/load_data.py b/src/nnusf/sffit/load_data.py
@@ -54,7 +54,7 @@ def add_pseudodata(experimental_datasets, shift=True):
     for dataset in experimental_datasets.values():
         cholesky = np.linalg.cholesky(dataset.covmat)
         random_samples = np.random.randn(dataset.n_data)
-        shift_data = random_samples @ cholesky if shift else 0
+        shift_data = cholesky @ random_samples if shift else 0
         pseudodata = dataset.central_values + shift_data
         dataset.pseudodata = pseudodata
 

diff --git a/src/nnusf/sffit/model_gen.py b/src/nnusf/sffit/model_gen.py
@@ -109,10 +109,9 @@ def sf_model(input_layer):
         vl_data.append(expd_vl)
 
         # Mask the covmat first before computing the inverse
-        invcovmat = np.linalg.inv(data.covmat)
-        invcov_tr, invcov_vl = mask_covmat(invcovmat, tr_mask, vl_mask)
-        chi2_tr = chi2(invcov_tr)
-        chi2_vl = chi2(invcov_vl)
+        covmat_tr, covmat_vl = mask_covmat(data.covmat, tr_mask, vl_mask)
+        chi2_tr = chi2(np.linalg.inv(covmat_tr))
+        chi2_vl = chi2(np.linalg.inv(covmat_vl))
         tr_chi2.append(chi2_tr)
         vl_chi2.append(chi2_vl)