diff --git a/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml b/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml index 39233e3fa9..e823d9914e 100644 --- a/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml +++ b/nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml @@ -376,5 +376,9 @@ STAR_2015_1JET_200GEV_CC-ALL: STAR-2015_1JET_200GEV_CC-ALL STAR_2015_1JET_200GEV_CF-ALL: STAR-2015_1JET_200GEV_CF-ALL STAR_2015_2JET_MIDRAP_200GEV_OS-ALL: STAR-2015_2JET_200GEV_MIDRAP_OS-ALL STAR_2015_2JET_MIDRAP_200GEV_SS-ALL: STAR-2015_2JET_200GEV_MIDRAP_SS-ALL -ATLAS_WJ_JET_8TEV_WM-PT: ATLAS_WJ_8TEV_WM-PT -ATLAS_WJ_JET_8TEV_WP-PT: ATLAS_WJ_8TEV_WP-PT +ATLAS_WJ_JET_8TEV_WM-PT: + dataset: ATLAS_WJ_8TEV_WM-PT + variant: legacy +ATLAS_WJ_JET_8TEV_WP-PT: + dataset: ATLAS_WJ_8TEV_WP-PT + variant: legacy diff --git a/validphys2/src/validphys/loader.py b/validphys2/src/validphys/loader.py index 72cc3379d1..0558edf22d 100644 --- a/validphys2/src/validphys/loader.py +++ b/validphys2/src/validphys/loader.py @@ -330,11 +330,17 @@ def _available_old_datasets(self): @property @functools.lru_cache def available_datasets(self): - """Provide all available datasets other then positivitiy and integrability. - At the moment this only returns old datasets for which we have a translation available + """Provide all available datasets that were available before the new commondata + was implemented and that have a translation. + + TODO: This should be substituted by a subset of `implemented_dataset` that returns only + complete datasets. """ - skip = ("POS", "INTEG") - old_datasets = [i for i in legacy_to_new_mapping.keys() if not i.startswith(skip)] + # Skip Positivity and Integrability + skip = ["POS", "INTEG"] + # Skip datasets for which a translation exists but were not implemented in the old way + skip += ["STAR", "ATLAS_WJ_JET_8TEV_"] + old_datasets = [i for i in legacy_to_new_mapping.keys() if not i.startswith(tuple(skip))] return set(old_datasets) @property