update ds names in some vp tests

NNPDF · Apr 3, 2024 · d752805 · d752805
1 parent e63df51
commit d752805
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 65 deletions.
diff --git a/validphys2/src/validphys/tests/test_commondata_columns.py b/validphys2/src/validphys/tests/test_commondata_columns.py
diff --git a/validphys2/src/validphys/tests/test_commondataparser.py b/validphys2/src/validphys/tests/test_commondataparser.py
@@ -4,37 +4,37 @@
 from validphys.api import API
 from validphys.commondataparser import load_commondata
 from validphys.loader import FallbackLoader as Loader
-from validphys.tests.conftest import THEORYID, FIT
+from validphys.tests.conftest import THEORYID_NEW, FIT
 
 
 def test_basic_commondata_loading():
     l = Loader()
-    cd = l.check_commondata(setname="H1HERAF2B")
+    cd = l.check_commondata(setname="SLAC_NC_NOTFIXED_D_DW_EM-F2", variant="legacy")
     res = load_commondata(cd)
     # Test commondata loading
-    assert res.ndata == 12
+    assert res.ndata == 211
     assert isinstance(res.commondata_table, pd.DataFrame)
     # Test systype loading
-    assert res.nsys == 25
+    assert res.nsys == 103
     assert isinstance(res.systype_table, pd.DataFrame)
 
     # Test a dataset with no systematics
-    emptysyscd = l.check_posset(theoryID=THEORYID, setname='POSDYCBD', postlambda=1e-10)
+    emptysyscd = l.check_posset(theoryID=THEORYID_NEW, setname='NNPDF_POS_2P24GEV_XDQ', postlambda=1e-10)
     emptysysres = load_commondata(emptysyscd.commondata)
     assert emptysysres.nsys == 0
     assert emptysysres.systype_table.empty is True
 
 
 def test_commondata_with_cuts():
     l = Loader()
-    setname = "NMC"
+    setname = "NMC_NC_NOTFIXED_P_EM-SIGMARED"
 
-    cd = l.check_commondata(setname=setname)
+    cd = l.check_commondata(setname=setname, variant="legacy")
     loaded_cd = load_commondata(cd)
 
     fit_cuts = l.check_fit_cuts(fit=FIT, commondata=cd)
     internal_cuts = l.check_internal_cuts(
-        cd, API.rules(theoryid=THEORYID, use_cuts="internal")
+        cd, API.rules(theoryid=THEORYID_NEW, use_cuts="internal")
     )
 
     loaded_cd_fit_cuts = loaded_cd.with_cuts(fit_cuts)
@@ -57,7 +57,7 @@ def test_commondata_with_cuts():
     assert all(loaded_cd.with_cuts([1, 2, 3]).commondata_table.index - 1 == [1, 2, 3])
 
     # Check that giving cuts for another dataset raises the correct ValueError exception
-    cd_bad = l.check_commondata(setname="NMCPD")
+    cd_bad = l.check_commondata(setname="NMC_NC_NOTFIXED_EM-F2", variant="legacy")
     bad_cuts = l.check_fit_cuts(fit=FIT, commondata=cd_bad)
     with pytest.raises(ValueError):
         loaded_cd.with_cuts(bad_cuts)