Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bunch of dataset names #2005

Merged
merged 1 commit into from
Mar 14, 2024
Merged

Fix a bunch of dataset names #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildmaster/old_new_porting_map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/source/data/dataset-naming-convention.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ constructed following this [Backus–Naur form]::
| "ZEUS"

<process> ::= "1JET" | "2JET" | "CC" | "DY" | "INTEG" | "NC" | "PH" | "POS" | "SINGLETOP"
| "TTBAR" | "WCHARM" | "WJ" | "WMWP" | "WP" | "WPWM" | "Z0" | "Z0J"
| "TTBAR" | "WCHARM" | "WJ" | "WPWM" | "Z0" | "Z0J"

<energy> ::= <integer> <unit> | <integer> "P" <integer> <unit> | "NOTFIXED"

Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/central.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

############################################################
Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/diagonal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/no_lagrange.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

############################################################
Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/no_msr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

############################################################
Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/no_sumrules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

############################################################
Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/no_vsr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

############################################################
Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/normal_fit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion extra_tests/regression_fits/trainable_prepro.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

############################################################
Expand Down
14 changes: 7 additions & 7 deletions n3fit/runcards/hyperopt_studies/renew_hyperopt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions n3fit/src/n3fit/tests/regressions/hyper-quickcard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions validphys2/src/validphys/cuts/filters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 ...ata/ATLAS_WMWP_13TEV/data_legacy_TOT.yaml → ...ata/ATLAS_WPWM_13TEV/data_legacy_TOT.yaml
View file
Open in desktop
File renamed without changes.
0 ...data/ATLAS_WMWP_13TEV/kinematics_TOT.yaml → ...data/ATLAS_WPWM_13TEV/kinematics_TOT.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...commondata/ATLAS_WMWP_13TEV/metadata.yaml → ...commondata/ATLAS_WPWM_13TEV/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: ATLAS_WMWP_13TEV
setname: ATLAS_WPWM_13TEV
version: 1
version_comment: Port of old commondata
nnpdf_metadata:
Expand Down
0 ..._WMWP_13TEV/uncertainties_legacy_TOT.yaml → ..._WPWM_13TEV/uncertainties_legacy_TOT.yaml
View file
Open in desktop
File renamed without changes.
0 ...commondata/CMS_WP_7TEV_ELECTRON/data.yaml → ...mmondata/CMS_WPWM_7TEV_ELECTRON/data.yaml
View file
Open in desktop
File renamed without changes.
0 ...commondata/CMS_WP_7TEV_ELECTRON/filter.py → ...mmondata/CMS_WPWM_7TEV_ELECTRON/filter.py
View file
Open in desktop
File renamed without changes.
0 ...data/CMS_WP_7TEV_ELECTRON/kinematics.yaml → ...ta/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ondata/CMS_WP_7TEV_ELECTRON/metadata.yaml → ...data/CMS_WPWM_7TEV_ELECTRON/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "CMS_WP_7TEV_ELECTRON"
setname: "CMS_WPWM_7TEV_ELECTRON"

version: 1
version_comment: "First implementation"
Expand Down
0 ...awdata/HEPData-ins1118047-v1-Table_1.yaml → ...awdata/HEPData-ins1118047-v1-Table_1.yaml
View file
Open in desktop
File renamed without changes.
0 ...awdata/HEPData-ins1118047-v1-Table_2.yaml → ...awdata/HEPData-ins1118047-v1-Table_2.yaml
View file
Open in desktop
File renamed without changes.
0 ...a/CMS_WP_7TEV_ELECTRON/uncertainties.yaml → ...CMS_WPWM_7TEV_ELECTRON/uncertainties.yaml
View file
Open in desktop
File renamed without changes.
0 ...new_commondata/CMS_WP_7TEV_MUON/data.yaml → ...w_commondata/CMS_WPWM_7TEV_MUON/data.yaml
View file
Open in desktop
File renamed without changes.
0 ...new_commondata/CMS_WP_7TEV_MUON/filter.py → ...w_commondata/CMS_WPWM_7TEV_MUON/filter.py
View file
Open in desktop
File renamed without changes.
0 ...mmondata/CMS_WP_7TEV_MUON/kinematics.yaml → ...ondata/CMS_WPWM_7TEV_MUON/kinematics.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...commondata/CMS_WP_7TEV_MUON/metadata.yaml → ...mmondata/CMS_WPWM_7TEV_MUON/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
0 ...awdata/HEPData-ins1273570-v1-Table_1.yaml → ...awdata/HEPData-ins1273570-v1-Table_1.yaml
View file
Open in desktop
File renamed without changes.
0 ...data/CMS_WP_7TEV_MUON/rawdata/covmat.corr → ...ta/CMS_WPWM_7TEV_MUON/rawdata/covmat.corr
View file
Open in desktop
File renamed without changes.
0 ...ndata/CMS_WP_7TEV_MUON/uncertainties.yaml → ...ata/CMS_WPWM_7TEV_MUON/uncertainties.yaml
View file
Open in desktop
File renamed without changes.
0 ...P_7TEV_MUON/uncertainties_legacy_ASY.yaml → ...M_7TEV_MUON/uncertainties_legacy_ASY.yaml
View file
Open in desktop
File renamed without changes.
0 ...mondata/CMS_Z0_8TEV/data_legacy_PT-Y.yaml → ...ondata/CMS_Z0J_8TEV/data_legacy_PT-Y.yaml
View file
Open in desktop
File renamed without changes.
0 ...mmondata/CMS_Z0_8TEV/kinematics_PT-Y.yaml → ...mondata/CMS_Z0J_8TEV/kinematics_PT-Y.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../new_commondata/CMS_Z0_8TEV/metadata.yaml → ...new_commondata/CMS_Z0J_8TEV/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: CMS_Z0_8TEV
setname: CMS_Z0J_8TEV
version: 1
version_comment: Port of old commondata
nnpdf_metadata:
Expand Down
0 ...MS_Z0_8TEV/uncertainties_PT-Y_sys_10.yaml → ...S_Z0J_8TEV/uncertainties_PT-Y_sys_10.yaml
View file
Open in desktop
File renamed without changes.
0 ...EV/uncertainties_PT-Y_sys_10_NNPDF31.yaml → ...EV/uncertainties_PT-Y_sys_10_NNPDF31.yaml
View file
Open in desktop
File renamed without changes.
0 ..._8TEV/uncertainties_PT-Y_sys_NNPDF31.yaml → ..._8TEV/uncertainties_PT-Y_sys_NNPDF31.yaml
View file
Open in desktop
File renamed without changes.
0 ...MS_Z0_8TEV/uncertainties_legacy_PT-Y.yaml → ...S_Z0J_8TEV/uncertainties_legacy_PT-Y.yaml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down