NNPDF · giacomomagni · Oct 24, 2024 · Oct 16, 2024 · Oct 17, 2024 · Oct 17, 2024
diff --git a/.github/workflows/fitbot.yml b/.github/workflows/fitbot.yml
@@ -10,7 +10,7 @@ on:
 env:
   N3FIT_MAXNREP: 20 # total number of replicas to fit
   POSTFIT_NREP: 16 # requested replicas for postfit
-  REFERENCE_SET: NNBOT-06f20cf6a-2024-07-26 # reference set for exact results
+  REFERENCE_SET: NNBOT-da9fed01b-2024-10-23 # reference set for exact results
   STABLE_REFERENCE_SET: NNBOT-c0f99b7b3-2024-02-28 # reference set for last tag
   CONDA_PY: 312
   PYTHONHASHSEED: "0"

diff --git a/doc/sphinx/source/data/commondata.rst b/doc/sphinx/source/data/commondata.rst
@@ -56,7 +56,7 @@ The format of this mapping is as follow:
         dataset: new_name_1
         variant: legacy
 
-                                 
+
 CommonData Metadata specification
 ---------------------------------
 
@@ -111,7 +111,7 @@ This will allow to keep an exact tracking of all changes to every dataset even i
 References
 ~~~~~~~~~~
 
-References to the original source of the data. 
+References to the original source of the data.
 This can be ``arXiv``, ``iNSPIRE`` or ``hepdata``.
 All information must be provided unless it is explicitly missing.
 
@@ -137,7 +137,7 @@ In the following we describe the metadata corresponding to the observable within
 
 
 ..  code-block:: yaml
-    
+
    implemented_observables:
     - observable_name: "DIMUON-Y"
       process_type: "EWK_RAP"
@@ -256,7 +256,7 @@ list for all values for all bins.
 ``data_uncertainties``
 ~~~~~~~~~~~~~~~~~~~~~~
 A list of ``.yaml`` files containing the uncertainty information for the measurement.
-When using more than one uncertainty file they will be concatenated. 
+When using more than one uncertainty file they will be concatenated.
 This allows the user the flexibility of creating variants
 where only a subset of the uncertainties are modified.
 
@@ -299,7 +299,9 @@ For instance, we might have two incompatible sources of uncertainties. In such c
 These variants can overwrite certain keys if necessary.
 When a variant is used, the key under the variant will be used instead of the key defined in the observable.
 
-A ``variant`` can only overwrite the entries ``data_central``, ``theory`` and ``data_uncertainties``.
+A ``variant`` can only overwrite the entries ``data_central``, ``theory``, and ``data_uncertainties``.
+If the kinematics or the number of points change, it should be considered a different observable.
+
 Example:
 
 ..  code-block:: yaml
@@ -316,7 +318,7 @@ Example:
             data_central: different_data.yaml
             data_uncertainties:
                 - different_uncertainties.yaml
-              
+
 When loading this dataset with no variant only the ``uncertainties.yaml`` file will be read.
 Instead, when choosing ``variant: name_of_the_variant``, both ``uncertainties.yaml`` and  ``extra_uncertainties.yaml`` will be loaded.
 If we select ``variant: another_variant`` both the ``data_uncertainties`` and the ``data_central`` keys will be substituted.
@@ -334,8 +336,8 @@ It includes two entries:
 Example:
 
 ..  code-block:: yaml
-  
-  theory: 
+
+  theory:
   FK_tables:
       - - Z_contribution
         - Wp_contribution

diff --git a/doc/sphinx/source/n3fit/hyperopt.rst b/doc/sphinx/source/n3fit/hyperopt.rst
@@ -336,12 +336,12 @@ hyperopt configuration dictionary).
 .. code-block:: yaml
 
         dataset_inputs:
-        - {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+        - {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
         - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
-        - {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-        - {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-        - {dataset: BCDMS_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-        - {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
+        - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+        - {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+        - {dataset: BCDMS_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+        - {dataset: BCDMS_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
         - {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
         - {dataset: HERA_CC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
         - {dataset: HERA_CC_318GEV_EP-SIGMARED frac: 0.75, variant: legacy}

diff --git a/doc/sphinx/source/n3fit/runcard_detailed.rst b/doc/sphinx/source/n3fit/runcard_detailed.rst
@@ -26,8 +26,8 @@ The first thing one finds when building a fit runcard for
 .. code-block:: yaml
 
     dataset_inputs:
-        - { dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.5, variant: legacy}
-        - { dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.5, variant: legacy }
+        - { dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy_dw}
+        - { dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.5, variant: legacy_dw }
         - { dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, variant: legacy_10}
 
 
@@ -41,7 +41,7 @@ The fraction of events that are considered for the training and validation sets
 .. code-block:: yaml
 
     dataset_inputs:
-    - { dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
+    - { dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
 
 It is possible to run a fit with no validation set by setting the fraction to ``1.0``, in this case the training set will be used as validation set.
 

diff --git a/n3fit/runcards/examples/Basic_feature_scaling.yml b/n3fit/runcards/examples/Basic_feature_scaling.yml
@@ -9,8 +9,8 @@ description: Basic feature scaling
 # ewk: apply ewk k-factors
 # sys: systematics treatment (see systypes)
 dataset_inputs:
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, cfac: [], variant: legacy}
 
 ############################################################

diff --git a/n3fit/runcards/examples/Basic_hyperopt.yml b/n3fit/runcards/examples/Basic_hyperopt.yml
@@ -10,16 +10,16 @@ description:  Hyperopt example
 # sys: systematics treatment (see systypes)
 dataset_inputs:
 # Fixed target DIS
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
+- {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NU-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NB-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
 # HERA data
 - {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
@@ -85,20 +85,20 @@ kfold:
           - HERA_CC_318GEV_EM-SIGMARED
           - HERA_NC_225GEV_EP-SIGMARED
           - NMC_NC_NOTFIXED_P_EM-SIGMARED
-          - NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED
+          - NUTEV_CC_NOTFIXED_FE_NB-SIGMARED
       - datasets:
           - HERA_CC_318GEV_EP-SIGMARED
           - HERA_NC_251GEV_EP-SIGMARED
-          - NMC_NC_NOTFIXED_DW_EM-F2
-          - NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED
+          - NMC_NC_NOTFIXED_EM-F2
+          - NUTEV_CC_NOTFIXED_FE_NU-SIGMARED
       - datasets:
-          - CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED
+          - CHORUS_CC_NOTFIXED_PB_NB-SIGMARED
           - HERA_NC_300GEV_EP-SIGMARED
-          - BCDMS_NC_NOTFIXED_D_DW_EM-F2
+          - BCDMS_NC_NOTFIXED_D_EM-F2
       - datasets:
-          - CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED
+          - CHORUS_CC_NOTFIXED_PB_NU-SIGMARED
           - HERA_NC_318GEV_EP-SIGMARED
-          - BCDMS_NC_NOTFIXED_P_DW_EM-F2
+          - BCDMS_NC_NOTFIXED_P_EM-F2
 
 ############################################################
 trvlseed: 1

diff --git a/n3fit/runcards/examples/Basic_runcard.yml b/n3fit/runcards/examples/Basic_runcard.yml
@@ -9,8 +9,8 @@ description: Basic runcard
 # ewk: apply ewk k-factors
 # sys: systematics treatment (see systypes)
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10}
 
 ############################################################

diff --git a/n3fit/runcards/examples/Basic_runcard_closure_test.yml b/n3fit/runcards/examples/Basic_runcard_closure_test.yml
@@ -9,8 +9,8 @@ description: Basic closure test runcard
 # ewk: apply ewk k-factors
 # sys: systematics treatment (see systypes)
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10}
 
 ############################################################

diff --git a/n3fit/runcards/examples/Basic_runcard_parallel.yml b/n3fit/runcards/examples/Basic_runcard_parallel.yml
@@ -10,7 +10,7 @@ description: Basic runcard
 # sys: systematics treatment (see systypes)
 dataset_inputs:
 - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, cfac: [], variant: legacy}
 

diff --git a/n3fit/runcards/examples/Basic_runcard_qed.yml b/n3fit/runcards/examples/Basic_runcard_qed.yml
@@ -9,8 +9,8 @@ description: Basic runcard qed
 # ewk: apply ewk k-factors
 # sys: systematics treatment (see systypes)
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10}
 
 

diff --git a/n3fit/runcards/examples/DIS_diagonal_l2reg_example.yml b/n3fit/runcards/examples/DIS_diagonal_l2reg_example.yml
@@ -9,16 +9,16 @@ description: NNLO DIS only in basis which diagonalises experimental covmat with
 # ewk: apply ewk k-factors
 # sys: systematics treatment (see systypes)
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
+- {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NU-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NB-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
 - {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy}

diff --git a/n3fit/runcards/examples/Fit_with_theory_covmat.yml b/n3fit/runcards/examples/Fit_with_theory_covmat.yml
@@ -9,8 +9,8 @@ description: "NNPDF4.0 methodology fit with theory covariance matrix (9pt prescr
 # ewk: apply ewk k-factors
 # sys: systematics treatment (see systypes)
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10}
 
 ############################################################

diff --git a/n3fit/runcards/examples/developing.yml b/n3fit/runcards/examples/developing.yml
@@ -9,13 +9,13 @@ description: Regression runcard for the automatic github fitbot
 # ewk: apply ewk k-factors
 # sys: systematics treatment (see systypes)
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
+- {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NB-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
 - {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_318GEV_EP-SIGMARED, frac: 0.75, variant: legacy}

diff --git a/n3fit/runcards/examples/nnpdf40-like.yml b/n3fit/runcards/examples/nnpdf40-like.yml
@@ -6,16 +6,16 @@ description: NNLO baseline fit, NNPDF4.0 dataset, compare to NNPDF40_nnlo_as_011
 
 ######################################################################################
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
+- {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NU-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NB-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
 - {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy}

diff --git a/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml b/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml
@@ -6,16 +6,16 @@ description: "NNPDF4.0 NNLO reduced set for hyperoptimization"
 ############################################################
 # frac: training fraction
 dataset_inputs:
-- {dataset: NMC_NC_NOTFIXED_DW_EM-F2, frac: 0.75, variant: legacy}
+- {dataset: NMC_NC_NOTFIXED_EM-F2, frac: 0.75, variant: legacy_dw}
 - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: SLAC_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_P_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: BCDMS_NC_NOTFIXED_D_DW_EM-F2, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED, frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
-- {dataset: NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy}
+- {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: SLAC_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_P_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: BCDMS_NC_NOTFIXED_D_EM-F2, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NU-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: CHORUS_CC_NOTFIXED_PB_NB-SIGMARED, frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NU-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
+- {dataset: NUTEV_CC_NOTFIXED_FE_NB-SIGMARED, cfac: [MAS], frac: 0.75, variant: legacy_dw}
 - {dataset: HERA_NC_318GEV_EM-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_225GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
 - {dataset: HERA_NC_251GEV_EP-SIGMARED, frac: 0.75, variant: legacy}
@@ -174,7 +174,7 @@ kfold:
             #- HERA_NC_318GEV_EAVG_BOTTOM-SIGMARED
           - HERA_NC_318GEV_EAVG_CHARM-SIGMARED
           - NMC_NC_NOTFIXED_P_EM-SIGMARED
-          - NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED
+          - NUTEV_CC_NOTFIXED_FE_NB-SIGMARED
         # EWK
           - LHCB_Z0_8TEV_DIELECTRON_Y
           - CMS_WPWM_7TEV_ELECTRON_ASY
@@ -189,9 +189,9 @@ kfold:
           - CMS_SINGLETOP_7TEV_TCHANNEL-XSEC
       - datasets:
         # DIS
-          - CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED
+          - CHORUS_CC_NOTFIXED_PB_NU-SIGMARED
           - HERA_NC_318GEV_EP-SIGMARED
-          - BCDMS_NC_NOTFIXED_P_DW_EM-F2
+          - BCDMS_NC_NOTFIXED_P_EM-F2
         # EWK
           - LHCB_Z0_7TEV_DIELECTRON_Y
           - ATLAS_Z0_7TEV_36PB_ETA
@@ -208,8 +208,8 @@ kfold:
         # DIS
           - HERA_CC_318GEV_EP-SIGMARED
           - HERA_NC_251GEV_EP-SIGMARED
-          - NMC_NC_NOTFIXED_DW_EM-F2
-          - NUTEV_CC_NOTFIXED_FE_DW_NU-SIGMARED
+          - NMC_NC_NOTFIXED_EM-F2
+          - NUTEV_CC_NOTFIXED_FE_NU-SIGMARED
         # EWK
           - LHCB_WPWM_7TEV_MUON_Y
           - LHCB_Z0_13TEV_DIELECTRON-Y
@@ -226,7 +226,7 @@ kfold:
           - CMS_TTBAR_8TEV_2L_DIF_MTTBAR-YT-NORM
       - datasets:
         # DIS
-          - CHORUS_CC_NOTFIXED_PB_DW_NB-SIGMARED
+          - CHORUS_CC_NOTFIXED_PB_NB-SIGMARED
           - HERA_NC_300GEV_EP-SIGMARED
         # EWK
           - LHCB_WPWM_8TEV_MUON_Y