From c50771f69cb0234fb1ff6ab0e8f650475a3b678e Mon Sep 17 00:00:00 2001 From: juacrumar Date: Thu, 14 Mar 2024 12:50:18 +0100 Subject: [PATCH] fix a bunch of dataset names: CMS_Z0_8TEV_PT-Y: CMS_Z0J_8TEV_PT-Y ATLAS_WMWP_13TEV_TOT: ATLAS_WPWM_13TEV_TOT CMS_WP_7TEV_ELECTRON_ASY: CMS_WPWM_7TEV_ELECTRON_ASY CMS_WP_7TEV_MUON_ASY: CMS_WPWM_7TEV_MUON_ASY fix CMS Z0J (Z0 -> Z0J) fix the name everywhere it appears abuse dataset_names for bugfixes fix naming convention in docs ATLAS_WMWP_13TEV_TOT -> ATLAS_WPWM_13TEV_TOT CMS_WP_7TEV -> CMS_WPWM_7TEV update also folder name remove hacky bugfix --- buildmaster/old_new_porting_map.yml | 4 ++-- .../source/data/dataset-naming-convention.rst | 2 +- extra_tests/regression_fits/central.yml | 2 +- extra_tests/regression_fits/diagonal.yml | 2 +- extra_tests/regression_fits/no_lagrange.yml | 2 +- extra_tests/regression_fits/no_msr.yml | 2 +- extra_tests/regression_fits/no_sumrules.yml | 2 +- extra_tests/regression_fits/no_vsr.yml | 2 +- extra_tests/regression_fits/normal_fit.yml | 2 +- extra_tests/regression_fits/trainable_prepro.yml | 2 +- n3fit/runcards/hyperopt_studies/renew_hyperopt.yml | 14 +++++++------- .../n3fit/tests/regressions/hyper-quickcard.yml | 4 ++-- validphys2/src/validphys/cuts/filters.yaml | 6 +++--- .../data_legacy_TOT.yaml | 0 .../kinematics_TOT.yaml | 0 .../metadata.yaml | 2 +- .../uncertainties_legacy_TOT.yaml | 0 .../data.yaml | 0 .../filter.py | 0 .../kinematics.yaml | 0 .../metadata.yaml | 2 +- .../rawdata/HEPData-ins1118047-v1-Table_1.yaml | 0 .../rawdata/HEPData-ins1118047-v1-Table_2.yaml | 0 .../uncertainties.yaml | 0 .../data.yaml | 0 .../filter.py | 0 .../kinematics.yaml | 0 .../metadata.yaml | 2 +- .../rawdata/HEPData-ins1273570-v1-Table_1.yaml | 0 .../rawdata/covmat.corr | 0 .../uncertainties.yaml | 0 .../uncertainties_legacy_ASY.yaml | 0 .../data_legacy_PT-Y.yaml | 0 .../kinematics_PT-Y.yaml | 0 .../{CMS_Z0_8TEV => CMS_Z0J_8TEV}/metadata.yaml | 2 +- .../uncertainties_PT-Y_sys_10.yaml | 0 .../uncertainties_PT-Y_sys_10_NNPDF31.yaml | 0 .../uncertainties_PT-Y_sys_NNPDF31.yaml | 0 .../uncertainties_legacy_PT-Y.yaml | 0 .../datafiles/new_commondata/dataset_names.yml | 8 ++++---- 40 files changed, 31 insertions(+), 31 deletions(-) rename validphys2/src/validphys/datafiles/new_commondata/{ATLAS_WMWP_13TEV => ATLAS_WPWM_13TEV}/data_legacy_TOT.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{ATLAS_WMWP_13TEV => ATLAS_WPWM_13TEV}/kinematics_TOT.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{ATLAS_WMWP_13TEV => ATLAS_WPWM_13TEV}/metadata.yaml (98%) rename validphys2/src/validphys/datafiles/new_commondata/{ATLAS_WMWP_13TEV => ATLAS_WPWM_13TEV}/uncertainties_legacy_TOT.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_ELECTRON => CMS_WPWM_7TEV_ELECTRON}/data.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_ELECTRON => CMS_WPWM_7TEV_ELECTRON}/filter.py (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_ELECTRON => CMS_WPWM_7TEV_ELECTRON}/kinematics.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_ELECTRON => CMS_WPWM_7TEV_ELECTRON}/metadata.yaml (97%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_ELECTRON => CMS_WPWM_7TEV_ELECTRON}/rawdata/HEPData-ins1118047-v1-Table_1.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_ELECTRON => CMS_WPWM_7TEV_ELECTRON}/rawdata/HEPData-ins1118047-v1-Table_2.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_ELECTRON => CMS_WPWM_7TEV_ELECTRON}/uncertainties.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/data.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/filter.py (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/kinematics.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/metadata.yaml (98%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/rawdata/HEPData-ins1273570-v1-Table_1.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/rawdata/covmat.corr (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/uncertainties.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_WP_7TEV_MUON => CMS_WPWM_7TEV_MUON}/uncertainties_legacy_ASY.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_Z0_8TEV => CMS_Z0J_8TEV}/data_legacy_PT-Y.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_Z0_8TEV => CMS_Z0J_8TEV}/kinematics_PT-Y.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_Z0_8TEV => CMS_Z0J_8TEV}/metadata.yaml (98%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_Z0_8TEV => CMS_Z0J_8TEV}/uncertainties_PT-Y_sys_10.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_Z0_8TEV => CMS_Z0J_8TEV}/uncertainties_PT-Y_sys_10_NNPDF31.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_Z0_8TEV => CMS_Z0J_8TEV}/uncertainties_PT-Y_sys_NNPDF31.yaml (100%) rename validphys2/src/validphys/datafiles/new_commondata/{CMS_Z0_8TEV => CMS_Z0J_8TEV}/uncertainties_legacy_PT-Y.yaml (100%) diff --git a/buildmaster/old_new_porting_map.yml b/buildmaster/old_new_porting_map.yml index 6a6b188940..86fe455fcf 100644 --- a/buildmaster/old_new_porting_map.yml +++ b/buildmaster/old_new_porting_map.yml @@ -139,7 +139,7 @@ ATLAS_WZ_TOT_13TEV: new_name: ATLAS_DY_13TEV_TOT reference_arxiv: '1603.09222' ATLAS_W_TOT_13TEV: - new_name: ATLAS_WMWP_13TEV_TOT + new_name: ATLAS_WPWM_13TEV_TOT reference_arxiv: '1603.09222' journal: Phys. Lett. B759 (2016) 601 ATLAS_Z_TOT_13TEV: @@ -320,7 +320,7 @@ CMS_WCHARM_DIFF_UNNORM_13TEV: journal: Eur. Phys. J. C 79 (2019) 269 CMSZDIFF12: - new_name: CMS_Z0_8TEV_PT-Y + new_name: CMS_Z0J_8TEV_PT-Y reference_arxiv: '1504.03511' reference_hepdata: None journal: Phys. Lett. B749 (2015) 187 diff --git a/doc/sphinx/source/data/dataset-naming-convention.rst b/doc/sphinx/source/data/dataset-naming-convention.rst index 87c43c3278..c61b449552 100644 --- a/doc/sphinx/source/data/dataset-naming-convention.rst +++ b/doc/sphinx/source/data/dataset-naming-convention.rst @@ -18,7 +18,7 @@ constructed following this [Backus–Naur form]:: | "ZEUS" ::= "1JET" | "2JET" | "CC" | "DY" | "INTEG" | "NC" | "PH" | "POS" | "SINGLETOP" - | "TTBAR" | "WCHARM" | "WJ" | "WMWP" | "WP" | "WPWM" | "Z0" | "Z0J" + | "TTBAR" | "WCHARM" | "WJ" | "WPWM" | "Z0" | "Z0J" ::= | "P" | "NOTFIXED" diff --git a/extra_tests/regression_fits/central.yml b/extra_tests/regression_fits/central.yml index 6aae22b822..98c52a609c 100644 --- a/extra_tests/regression_fits/central.yml +++ b/extra_tests/regression_fits/central.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} - {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 1.0, cfac: [QCD], variant: legacy} ############################################################ diff --git a/extra_tests/regression_fits/diagonal.yml b/extra_tests/regression_fits/diagonal.yml index e6780c2ebf..3e599fe4dd 100644 --- a/extra_tests/regression_fits/diagonal.yml +++ b/extra_tests/regression_fits/diagonal.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} ############################################################ datacuts: diff --git a/extra_tests/regression_fits/no_lagrange.yml b/extra_tests/regression_fits/no_lagrange.yml index 35aa1cd905..63d5e66b58 100644 --- a/extra_tests/regression_fits/no_lagrange.yml +++ b/extra_tests/regression_fits/no_lagrange.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} - {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 1.0, cfac: [QCD], variant: legacy} ############################################################ diff --git a/extra_tests/regression_fits/no_msr.yml b/extra_tests/regression_fits/no_msr.yml index 206df8ea20..4b79f12617 100644 --- a/extra_tests/regression_fits/no_msr.yml +++ b/extra_tests/regression_fits/no_msr.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} - {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 1.0, cfac: [QCD], variant: legacy} ############################################################ diff --git a/extra_tests/regression_fits/no_sumrules.yml b/extra_tests/regression_fits/no_sumrules.yml index 2d872e617b..bb86fa16dc 100644 --- a/extra_tests/regression_fits/no_sumrules.yml +++ b/extra_tests/regression_fits/no_sumrules.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} - {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 1.0, cfac: [QCD], variant: legacy} ############################################################ diff --git a/extra_tests/regression_fits/no_vsr.yml b/extra_tests/regression_fits/no_vsr.yml index 4f2d05b468..4937a539ba 100644 --- a/extra_tests/regression_fits/no_vsr.yml +++ b/extra_tests/regression_fits/no_vsr.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} - {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 1.0, cfac: [QCD], variant: legacy} ############################################################ diff --git a/extra_tests/regression_fits/normal_fit.yml b/extra_tests/regression_fits/normal_fit.yml index 258d626626..3073af5628 100644 --- a/extra_tests/regression_fits/normal_fit.yml +++ b/extra_tests/regression_fits/normal_fit.yml @@ -7,7 +7,7 @@ description: n3fit regression test, normal fit without initial weights # sys: systematics treatment (see systypes) dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} ############################################################ datacuts: diff --git a/extra_tests/regression_fits/trainable_prepro.yml b/extra_tests/regression_fits/trainable_prepro.yml index 2c37c50019..9f5cd1a03e 100644 --- a/extra_tests/regression_fits/trainable_prepro.yml +++ b/extra_tests/regression_fits/trainable_prepro.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - {dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy} - {dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy} - - {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} + - {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.5, cfac: [QCD], variant: legacy_10} - {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 1.0, cfac: [QCD], variant: legacy} ############################################################ diff --git a/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml b/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml index 9432ae50b2..ee15475242 100644 --- a/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml +++ b/n3fit/runcards/hyperopt_studies/renew_hyperopt.yml @@ -42,7 +42,7 @@ dataset_inputs: - {dataset: ATLAS_Z0_8TEV_HIMASS_M-Y, frac: 0.75, cfac: [], variant: legacy} - {dataset: ATLAS_DY_8TEV_LOWMASS_M-Y, frac: 0.75, cfac: [], variant: legacy} - {dataset: ATLAS_Z0_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy} -- {dataset: ATLAS_WMWP_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy} +- {dataset: ATLAS_WPWM_13TEV_TOT, frac: 0.75, cfac: [NRM], variant: legacy} - {dataset: ATLAS_WJ_JET_8TEV_WP-PT, frac: 0.75, cfac: [], variant: legacy} - {dataset: ATLAS_WJ_JET_8TEV_WM-PT, frac: 0.75, cfac: [], variant: legacy} - {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10} @@ -62,11 +62,11 @@ dataset_inputs: - {dataset: ATLAS_SINGLETOP_7TEV_TBAR-Y-NORM, frac: 0.75, cfac: [], variant: legacy} - {dataset: ATLAS_SINGLETOP_8TEV_T-RAP-NORM, frac: 0.75, cfac: [], variant: legacy} - {dataset: ATLAS_SINGLETOP_8TEV_TBAR-RAP-NORM, frac: 0.75, cfac: [], variant: legacy} -- {dataset: CMS_WP_7TEV_ELECTRON_ASY, frac: 0.75, cfac: []} -- {dataset: CMS_WP_7TEV_MUON_ASY, frac: 0.75, cfac: [], variant: legacy} +- {dataset: CMS_WPWM_7TEV_ELECTRON_ASY, frac: 0.75, cfac: []} +- {dataset: CMS_WPWM_7TEV_MUON_ASY, frac: 0.75, cfac: [], variant: legacy} - {dataset: CMS_Z0_7TEV_DIMUON_2D, frac: 0.75, cfac: []} - {dataset: CMS_WPWM_8TEV_MUON_Y, frac: 0.75, cfac: [], variant: legacy} -- {dataset: CMS_Z0_8TEV_PT-Y, frac: 0.75, cfac: [NRM], variant: legacy_10} +- {dataset: CMS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [NRM], variant: legacy_10} - {dataset: CMS_2JET_7TEV_M12Y, frac: 0.75, cfac: []} - {dataset: CMS_1JET_8TEV_PTY, frac: 0.75, cfac: [], variant: legacy} - {dataset: CMS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, cfac: [], variant: legacy} @@ -179,7 +179,7 @@ kfold: - NUTEV_CC_NOTFIXED_FE_DW_NB-SIGMARED # EWK - LHCB_Z0_8TEV_DIELECTRON_Y - - CMS_WP_7TEV_ELECTRON_ASY + - CMS_WPWM_7TEV_ELECTRON_ASY - ATLAS_Z0J_8TEV_PT-M - D0_WPWM_1P96TEV_ASY - DYE866_Z0_800GEV_PXSEC @@ -197,7 +197,7 @@ kfold: # EWK - LHCB_Z0_7TEV_DIELECTRON_Y - ATLAS_Z0_7TEV_36PB_ETA - - CMS_Z0_8TEV_PT-Y + - CMS_Z0J_8TEV_PT-Y - DYE605_Z0_38P8GEV_DW_PXSEC - CMS_Z0_7TEV_DIMUON_2D # JET+TOP @@ -218,7 +218,7 @@ kfold: - ATLAS_Z0_7TEV_46FB_CC-Y - ATLAS_WJ_JET_8TEV_WP-PT - ATLAS_Z0_7TEV_49FB_HIMASS - - CMS_WP_7TEV_MUON_ASY + - CMS_WPWM_7TEV_MUON_ASY - DYE866_Z0_800GEV_DW_RATIO_PDXSECRATIO - CDF_Z0_1P96TEV_ZRAP # JET+TOP diff --git a/n3fit/src/n3fit/tests/regressions/hyper-quickcard.yml b/n3fit/src/n3fit/tests/regressions/hyper-quickcard.yml index da53408bc4..9b8974a23c 100644 --- a/n3fit/src/n3fit/tests/regressions/hyper-quickcard.yml +++ b/n3fit/src/n3fit/tests/regressions/hyper-quickcard.yml @@ -14,7 +14,7 @@ description: n3fit regression test dataset_inputs: - { dataset: NMC_NC_NOTFIXED_P_EM-SIGMARED, frac: 0.5, variant: legacy } - { dataset: SLAC_NC_NOTFIXED_P_EM-F2, frac: 0.5, variant: legacy } -- { dataset: CMS_WP_7TEV_ELECTRON_ASY, frac: 0.5} +- { dataset: CMS_WPWM_7TEV_ELECTRON_ASY, frac: 0.5} ############################################################ datacuts: @@ -77,7 +77,7 @@ kfold: - NMC_NC_NOTFIXED_P_EM-SIGMARED - datasets: - SLAC_NC_NOTFIXED_P_EM-F2 - - CMS_WP_7TEV_ELECTRON_ASY + - CMS_WPWM_7TEV_ELECTRON_ASY ############################################################ genrep: False # on = generate MC replicas, False = use real data diff --git a/validphys2/src/validphys/cuts/filters.yaml b/validphys2/src/validphys/cuts/filters.yaml index ad5d6f3eb8..d0d829781a 100644 --- a/validphys2/src/validphys/cuts/filters.yaml +++ b/validphys2/src/validphys/cuts/filters.yaml @@ -236,15 +236,15 @@ reason: Avoid the region where EWK corrections are important. rule: "p_T2 <= 150**2" -- dataset: CMS_Z0_8TEV_PT-Y +- dataset: CMS_Z0J_8TEV_PT-Y reason: Avoid the region where resummation effects become important. rule: "p_T2 >= 30**2" -- dataset: CMS_Z0_8TEV_PT-Y +- dataset: CMS_Z0J_8TEV_PT-Y reason: Avoid the region where EWK corrections are important. rule: "p_T2 <= 170**2" -- dataset: CMS_Z0_8TEV_PT-Y +- dataset: CMS_Z0J_8TEV_PT-Y reason: | removes the last rapidity bin, where we cannot provide a decent description due to unknown reasons. diff --git a/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/data_legacy_TOT.yaml b/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/data_legacy_TOT.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/data_legacy_TOT.yaml rename to validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/data_legacy_TOT.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/kinematics_TOT.yaml b/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/kinematics_TOT.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/kinematics_TOT.yaml rename to validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/kinematics_TOT.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/metadata.yaml similarity index 98% rename from validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/metadata.yaml index 0930db89a6..77f74cc9a5 100644 --- a/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/metadata.yaml +++ b/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/metadata.yaml @@ -1,4 +1,4 @@ -setname: ATLAS_WMWP_13TEV +setname: ATLAS_WPWM_13TEV version: 1 version_comment: Port of old commondata nnpdf_metadata: diff --git a/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/uncertainties_legacy_TOT.yaml b/validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/uncertainties_legacy_TOT.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/ATLAS_WMWP_13TEV/uncertainties_legacy_TOT.yaml rename to validphys2/src/validphys/datafiles/new_commondata/ATLAS_WPWM_13TEV/uncertainties_legacy_TOT.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/data.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/data.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/data.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/data.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/filter.py b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/filter.py similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/filter.py rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/filter.py diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/kinematics.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/kinematics.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml similarity index 97% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml index 5be8bf2807..5d61487e5e 100644 --- a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/metadata.yaml +++ b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml @@ -1,4 +1,4 @@ -setname: "CMS_WP_7TEV_ELECTRON" +setname: "CMS_WPWM_7TEV_ELECTRON" version: 1 version_comment: "First implementation" diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/uncertainties.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/uncertainties.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/uncertainties.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_ELECTRON/uncertainties.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/data.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/data.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/data.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/data.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/filter.py b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/filter.py similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/filter.py rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/filter.py diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/kinematics.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/kinematics.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/metadata.yaml similarity index 98% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/metadata.yaml index f8da1e6001..8f1659d48c 100644 --- a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/metadata.yaml +++ b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/metadata.yaml @@ -1,4 +1,4 @@ -setname: CMS_WP_7TEV_MUON +setname: CMS_WPWM_7TEV_MUON version: 1 version_comment: First implementation for pT>25 GeV arXiv: diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/covmat.corr b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/rawdata/covmat.corr similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/covmat.corr rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/rawdata/covmat.corr diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/uncertainties.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/uncertainties.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/uncertainties.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/uncertainties.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/uncertainties_legacy_ASY.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/uncertainties_legacy_ASY.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/uncertainties_legacy_ASY.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_7TEV_MUON/uncertainties_legacy_ASY.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/data_legacy_PT-Y.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/data_legacy_PT-Y.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/data_legacy_PT-Y.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/data_legacy_PT-Y.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/kinematics_PT-Y.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/kinematics_PT-Y.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/kinematics_PT-Y.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/kinematics_PT-Y.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/metadata.yaml similarity index 98% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/metadata.yaml index 8cc043a77d..4e48b845ba 100644 --- a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/metadata.yaml +++ b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/metadata.yaml @@ -1,4 +1,4 @@ -setname: CMS_Z0_8TEV +setname: CMS_Z0J_8TEV version: 1 version_comment: Port of old commondata nnpdf_metadata: diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_PT-Y_sys_10.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_PT-Y_sys_10.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_PT-Y_sys_10.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_PT-Y_sys_10.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_PT-Y_sys_10_NNPDF31.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_PT-Y_sys_10_NNPDF31.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_PT-Y_sys_10_NNPDF31.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_PT-Y_sys_10_NNPDF31.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_PT-Y_sys_NNPDF31.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_PT-Y_sys_NNPDF31.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_PT-Y_sys_NNPDF31.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_PT-Y_sys_NNPDF31.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_legacy_PT-Y.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_legacy_PT-Y.yaml similarity index 100% rename from validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_8TEV/uncertainties_legacy_PT-Y.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0J_8TEV/uncertainties_legacy_PT-Y.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml b/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml index 827617ca10..dbfbec4a50 100644 --- a/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml +++ b/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml @@ -67,9 +67,9 @@ CMS_TTB_DIFF_13TEV_2016_2L_TRAP: CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM: CMS_TTBAR_13TEV_2L_DIF_YT-NORM CMS_TTB_DIFF_13TEV_2016_2L_TTRAP: CMS_TTBAR_13TEV_2L_DIF_YTTBAR CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM: CMS_TTBAR_13TEV_2L_DIF_YTTBAR-NORM -CMSWEASY840PB: CMS_WP_7TEV_ELECTRON_ASY +CMSWEASY840PB: CMS_WPWM_7TEV_ELECTRON_ASY CMSWMASY47FB: - dataset: CMS_WP_7TEV_MUON_ASY + dataset: CMS_WPWM_7TEV_MUON_ASY variant: legacy CMSDY2D11: CMS_Z0_7TEV_DIMUON_2D CMSWMU8TEV: @@ -168,7 +168,7 @@ ATLAS_WZ_TOT_13TEV: dataset: ATLAS_DY_13TEV_TOT variant: legacy ATLAS_W_TOT_13TEV: - dataset: ATLAS_WMWP_13TEV_TOT + dataset: ATLAS_WPWM_13TEV_TOT variant: legacy ATLAS_Z_TOT_13TEV: dataset: ATLAS_Z0_13TEV_TOT @@ -288,7 +288,7 @@ CMS_WCHARM_DIFF_UNNORM_13TEV: dataset: CMS_WCHARM_13TEV_WPWM-TOT-UNNORM variant: legacy CMSZDIFF12: - dataset: CMS_Z0_8TEV_PT-Y + dataset: CMS_Z0J_8TEV_PT-Y variant: legacy CMS_SINGLETOP_TCH_R_13TEV: dataset: CMS_SINGLETOP_13TEV_TCHANNEL-XSEC