added single imports in __init__ multiclosure, removed extra central predictions function

Author: comane

validphys2/examples/true_pos_neg_closuretests.yaml

@@ -11,7 +11,7 @@ dataspecs:
     fits:
       - {id: 241227_dis_ict_lam0_weighted_hera575_fs_828872, label: "DIS weighted HERA 575, fs: 1"}
       - {id: 241227_dis_ict_lam0_weighted_hera575_fs_239494, label: "DIS weighted HERA 575, fs: 2"}
-      - {id: 241227_dis_ict_lam0_weighted_hera575_fs_444227, label: "DIS weighted HERA 575, fs: 3"}      
+      # - {id: 241227_dis_ict_lam0_weighted_hera575_fs_444227, label: "DIS weighted HERA 575, fs: 3"}      
       # - {id: 241227_dis_ict_lam0_weighted_hera575_fs_623856, label: "DIS weighted HERA 575, fs: 4"}
       # - {id: 241227_dis_ict_lam0_weighted_hera575_fs_227492, label: "DIS weighted HERA 575, fs: 5"}
       # - {id: 241227_dis_ict_lam0_weighted_hera575_fs_745924, label: "DIS weighted HERA 575, fs: 6"}
@@ -40,7 +40,7 @@ dataspecs:
     fits:
       - {id: 8_6_2023_21_55_4_mnc_dis_pt1_type2_inconsistent_HERANC_commit_a6f0b1539_filterseed_828872, label: "DIS lambda 0, fs: 1"}
       - {id: 8_6_2023_21_38_13_mnc_dis_pt1_type2_inconsistent_HERANC_commit_a6f0b1539_filterseed_239494, label: "DIS lambda 0, fs: 2"}
-      - {id: 8_6_2023_21_41_39_mnc_dis_pt1_type2_inconsistent_HERANC_commit_a6f0b1539_filterseed_444227, label: "DIS lambda 0, fs: 3"}
+      # - {id: 8_6_2023_21_41_39_mnc_dis_pt1_type2_inconsistent_HERANC_commit_a6f0b1539_filterseed_444227, label: "DIS lambda 0, fs: 3"}
       # - {id: 8_6_2023_21_42_26_mnc_dis_pt1_type2_inconsistent_HERANC_commit_a6f0b1539_filterseed_623856, label: "DIS lambda 0, fs: 4"}
       # - {id: 8_6_2023_21_43_13_mnc_dis_pt1_type2_inconsistent_HERANC_commit_a6f0b1539_filterseed_227492, label: "DIS lambda 0, fs: 5"}
       # - {id: 8_6_2023_21_44_1_mnc_dis_pt1_type2_inconsistent_HERANC_commit_a6f0b1539_filterseed_745924, label: "DIS lambda 0, fs: 6"}

validphys2/src/validphys/closuretest/__init__.py

@@ -14,17 +14,27 @@
 from validphys.closuretest.multiclosure_pseudodata import *
 from validphys.closuretest.inconsistent_closuretest.multiclosure_inconsistent_output import *
 from validphys.closuretest.multiclosure_nsigma_helpers import (
+    central_member_chi2,
+    chi2_nsigma_deviation,
+    datasets_chi2_nsigma_deviation,
     fits_datasets_chi2_nsigma_deviation,
     fits_data,
     is_weighted,
     n_fits,
 )
 from validphys.closuretest.multiclosure_nsigma import (
+    multiclosurefits_nsigma,
+    dataspecs_multiclosurefits_nsigma,
+    comp_nsigma_alpha,
+    dataspecs_comp_nsigma_alpha,
     set_1,
     set_2,
     comp_set_1,
     set_3,
     probability_inconsistent,
+    dataspecs_nsigma_alpha,
+    nsigma_alpha,
+    multiclosurefits_nsigma,
 )
 from validphys.closuretest.multiclosure_nsigma_output import (
     plot_all_sets,

validphys2/src/validphys/closuretest/multiclosure_nsigma_helpers.py

@@ -11,9 +11,9 @@
 
 from nnpdf_data.coredata import CommonData
 from reportengine import collect
-from validphys import convolution
 from validphys.calcutils import calc_chi2
-from validphys.core import PDF, DataSetSpec
+from validphys.convolution import central_predictions
+from validphys.core import DataSetSpec
 
 log = logging.getLogger(__name__)
 
@@ -29,23 +29,6 @@ def reduced(self):
         return self.value / self.ndata
 
 
-def central_predictions(dataset: DataSetSpec, pdf: PDF) -> pd.DataFrame:
-    """
-    Computes the central prediction (central PDF member) for a dataset.
-
-    Parameters
-    ----------
-    dataset: validphys.core.DataSetSpec
-    pdf: validphys.core.PDF
-
-    Returns
-    -------
-    pd.DataFrame
-        index is datapoints, column is the central prediction.
-    """
-    return convolution.central_predictions(dataset, pdf)
-
-
 def central_member_chi2(
     central_predictions: pd.DataFrame,
     sqrt_covmat: np.ndarray,