use_t0_sampling=True default when loading a fitenvironment

Author: comane

validphys2/src/validphys/config.py

@@ -274,13 +274,21 @@ def produce_fitenvironment(self, fit, fitinputcontext):
         mcseed = runcard["mcseed"]
         genrep = runcard["genrep"]
 
+        # default for new fits is True
+        use_t0_sampling = runcard.get("use_t0_sampling", True)
+        use_t0 = use_t0_sampling
+        t0pdfset = self.parse_t0pdfset(runcard["datacuts"].get("t0pdfset")) if use_t0 else None
+
         return {
             "dataset_inputs": data_input,
             "theoryid": theoryid,
             "use_cuts": CutsPolicy.FROMFIT,
             "mcseed": mcseed,
             "trvlseed": trvlseed,
             "genrep": genrep,
+            "use_t0_sampling": use_t0_sampling,
+            "use_t0": use_t0,
+            "t0pdfset": t0pdfset,
         }
 
     def produce_fitcontext(self, fitinputcontext, fitpdf):

validphys2/src/validphys/tests/conftest.py

@@ -79,7 +79,14 @@ def tmp(tmpdir):
 PSEUDODATA_FIT = "pseudodata_test_fit_n3fit_241121"
 
 
-base_config = dict(pdf=PDF, use_cuts='nocuts', dataset_inputs=DATA, theoryid=THEORYID_NEW, Q=10)
+base_config = dict(
+    pdf=PDF,
+    use_cuts='nocuts',
+    use_t0_sampling=False,
+    dataset_inputs=DATA,
+    theoryid=THEORYID_NEW,
+    Q=10,
+)
 
 
 @pytest.fixture(scope='module')

validphys2/src/validphys/tests/test_pseudodata.py

@@ -42,8 +42,7 @@ def test_read_pdf_pseudodata():
 
 
 def test_recreate_fit_pseudodata():
-    CONFIG = {"fit": PSEUDODATA_FIT, "use_t0_sampling": False}
-    fit_pseudodata = API.recreate_fit_pseudodata(**CONFIG)
+    fit_pseudodata = API.recreate_fit_pseudodata(fit=PSEUDODATA_FIT)
 
     nrep = API.num_fitted_replicas(fit=PSEUDODATA_FIT)
     assert nrep == len(fit_pseudodata)
@@ -54,8 +53,7 @@ def test_recreate_fit_pseudodata():
 
 
 def test_recreate_pdf_pseudodata():
-    CONFIG = {"fit": PSEUDODATA_FIT, "use_t0_sampling": False}
-    pdf_pseudodata = API.recreate_pdf_pseudodata(**CONFIG)
+    pdf_pseudodata = API.recreate_pdf_pseudodata(fit=PSEUDODATA_FIT)
 
     pdf = API.pdf(pdf=PSEUDODATA_FIT)
     # -1 because we ignore replica 0
@@ -76,9 +74,8 @@ def test_no_savepseudodata():
 
 
 def test_read_matches_recreate():
-    CONFIG = {"fit": PSEUDODATA_FIT, "use_t0_sampling": False}
-    reads = API.read_fit_pseudodata(**CONFIG)
-    recreates = API.recreate_fit_pseudodata(**CONFIG)
+    reads = API.read_fit_pseudodata(fit=PSEUDODATA_FIT)
+    recreates = API.recreate_fit_pseudodata(fit=PSEUDODATA_FIT)
     for read, recreate in zip(reads, recreates):
         # We ignore the absolute ordering of the dataframes and just check
         # that they contain identical elements.

validphys2/src/validphys/tests/test_pythonmakereplica.py

@@ -43,7 +43,6 @@ def test_commondata_unchanged(data_config, dataset_inputs, use_cuts):
     config["dataset_inputs"] = dataset_inputs
     config["use_cuts"] = use_cuts
     config["replica_mcseed"] = SEED
-    config["use_t0_sampling"] = False
     ld_cds = API.dataset_inputs_loaded_cd_with_cuts(**config)
 
     # keep a copy of all dataframes/series pre make replica
@@ -76,7 +75,7 @@ def test_pseudodata_seeding(data_config, dataset_inputs, use_cuts):
     config["dataset_inputs"] = dataset_inputs
     config["use_cuts"] = use_cuts
     config["replica_mcseed"] = SEED
-    config["use_t0_sampling"] = False
+
     rep_1 = API.make_replica(**config)
     rep_2 = API.make_replica(**config)
     np.testing.assert_allclose(rep_1, rep_2)
@@ -90,7 +89,6 @@ def test_pseudodata_has_correct_ndata(data_config, dataset_inputs, use_cuts):
     config["dataset_inputs"] = dataset_inputs
     config["use_cuts"] = use_cuts
     config["replica_mcseed"] = SEED
-    config["use_t0_sampling"] = False
     ld_cds = API.dataset_inputs_loaded_cd_with_cuts(**config)
     rep = API.make_replica(**config)
     ndata = np.sum([cd.ndata for cd in ld_cds])
@@ -106,7 +104,6 @@ def test_genrep_off(data_config, dataset_inputs, use_cuts):
     config["use_cuts"] = use_cuts
     config["replica_mcseed"] = SEED
     config["genrep"] = False
-    config["use_t0_sampling"] = False
 
     # `make_replica` reorders the data according to the groups in the exp covmat
     not_replica = API.make_replica(**config)