Skip to content

Commit

Permalink
fix unconventional names
Browse files Browse the repository at this point in the history
  • Loading branch information
@scarlehoff
scarlehoff committed Aug 9, 2024
1 parent 3da948d commit c3215b7
Show file tree
Hide file tree
Showing 182 changed files with 117 additions and 102 deletions.
2 changes: 1 addition & 1 deletion n3fit/runcards/examples/developing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dataset_inputs:
- {dataset: D0_WPWM_1P96TEV_ASY, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_DY_7TEV_36PB_ETA, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0_7TEV_49FB_HIMASS, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_WJ_JET_8TEV_WM-PT, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_WJ_8TEV_WM-PT, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [], variant: legacy_10}
- {dataset: ATLAS_TTBAR_8TEV_TOT_X-SEC, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_1JET_8TEV_R06_PTY, frac: 0.75, cfac: [], variant: legacy_decorrelated}
Expand Down
4 changes: 2 additions & 2 deletions n3fit/runcards/examples/nnpdf40-like.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ dataset_inputs:
- {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, variant: legacy}
- {dataset: ATLAS_Z0_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, variant: legacy}
- {dataset: ATLAS_WJ_JET_8TEV_WM-PT, frac: 0.75, variant: legacy}
- {dataset: ATLAS_WJ_8TEV_WP-PT, frac: 0.75, variant: legacy}
- {dataset: ATLAS_WJ_8TEV_WM-PT, frac: 0.75, variant: legacy}
- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, variant: legacy_10}
- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75, variant: legacy_10}
- {dataset: ATLAS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, variant: legacy}
Expand Down
46 changes: 23 additions & 23 deletions n3fit/runcards/examples/nnpdfpol20_dis_nlo.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@ dataset_inputs:
- {dataset: STAR_WMWP_510GEV_WM-AL, frac: 0.60, cfac: []}
- {dataset: STAR_WMWP_510GEV_WP-AL, frac: 0.60, cfac: []}
# Polarized Jet datasets
- {dataset: STAR_2005_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2006_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2005_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2006_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: PHENIX_1JET_200GEV_ALL, frac: 0.60, cfac: []}
# Poalrized Dijet datasets
- {dataset: STAR_2009_2JET_200GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_200GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_200GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_MIDRAP_200GEV_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_MIDRAP_200GEV_SS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_2JET_MIDRAP_200GEV_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_2JET_MIDRAP_200GEV_SS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_MIDRAP_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_MIDRAP_SS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_2JET_200GEV_MIDRAP_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_2JET_200GEV_MIDRAP_SS-ALL, frac: 0.60, cfac: []}

############################################################
datacuts:
Expand Down
46 changes: 23 additions & 23 deletions n3fit/runcards/examples/nnpdfpol20_dis_nlo_mhou.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@ dataset_inputs:
- {dataset: STAR_WMWP_510GEV_WM-AL, frac: 0.60, cfac: []}
- {dataset: STAR_WMWP_510GEV_WP-AL, frac: 0.60, cfac: []}
# Polarized Jet datasets
- {dataset: STAR_2005_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2006_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2005_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2006_1JET_200GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_1JET_510GEV_ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
- {dataset: PHENIX_1JET_200GEV_ALL, frac: 0.60, cfac: []}
# Poalrized Dijet datasets
- {dataset: STAR_2009_2JET_200GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_200GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_200GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_MIDRAP_200GEV_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2009_2JET_MIDRAP_200GEV_SS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2012_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2013_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_2JET_MIDRAP_200GEV_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR_2015_2JET_MIDRAP_200GEV_SS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_MIDRAP_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2009_2JET_200GEV_MIDRAP_SS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2012_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2013_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_2JET_200GEV_MIDRAP_OS-ALL, frac: 0.60, cfac: []}
- {dataset: STAR-2015_2JET_200GEV_MIDRAP_SS-ALL, frac: 0.60, cfac: []}

############################################################
datacuts:
Expand Down
8 changes: 4 additions & 4 deletions n3fit/runcards/hyperopt_studies/renew_hyperopt.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ dataset_inputs:
- {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0_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_WJ_8TEV_WP-PT, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_WJ_8TEV_WM-PT, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10}
- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [], variant: legacy_10}
- {dataset: ATLAS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, cfac: [], variant: legacy}
Expand Down Expand Up @@ -214,7 +214,7 @@ kfold:
- LHCB_WPWM_7TEV_MUON_Y
- LHCB_Z0_13TEV_DIELECTRON-Y
- ATLAS_Z0_7TEV_46FB_CC-Y
- ATLAS_WJ_JET_8TEV_WP-PT
- ATLAS_WJ_8TEV_WP-PT
- ATLAS_Z0_7TEV_49FB_HIMASS
- CMS_WPWM_7TEV_MUON_ASY
- DYE866_Z0_800GEV_DW_RATIO_PDXSECRATIO
Expand All @@ -232,7 +232,7 @@ kfold:
- LHCB_WPWM_8TEV_MUON_Y
- LHCB_Z0_13TEV_DIMUON-Y
- ATLAS_Z0_7TEV_46FB_CF-Y
- ATLAS_WJ_JET_8TEV_WM-PT
- ATLAS_WJ_8TEV_WM-PT
- ATLAS_Z0_7TEV_LOMASS_M
- ATLAS_Z0J_8TEV_PT-Y
- CMS_WPWM_8TEV_MUON_Y
Expand Down
8 changes: 4 additions & 4 deletions n3fit/runcards/hyperopt_studies/restricted_search_space_renew_hyperopt.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ dataset_inputs:
- {dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0_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_WJ_8TEV_WP-PT, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_WJ_8TEV_WM-PT, frac: 0.75, cfac: [], variant: legacy}
- {dataset: ATLAS_Z0J_8TEV_PT-M, frac: 0.75, cfac: [], variant: legacy_10}
- {dataset: ATLAS_Z0J_8TEV_PT-Y, frac: 0.75, cfac: [], variant: legacy_10}
- {dataset: ATLAS_TTBAR_7TEV_TOT_X-SEC, frac: 0.75, cfac: [], variant: legacy}
Expand Down Expand Up @@ -182,7 +182,7 @@ kfold:
- LHCB_WPWM_7TEV_MUON_Y
- LHCB_Z0_13TEV_DIELECTRON-Y
- ATLAS_Z0_7TEV_46FB_CC-Y
- ATLAS_WJ_JET_8TEV_WP-PT
- ATLAS_WJ_8TEV_WP-PT
- ATLAS_Z0_7TEV_49FB_HIMASS
- CMS_WPWM_7TEV_MUON_ASY
- DYE866_Z0_800GEV_DW_RATIO_PDXSECRATIO
Expand All @@ -200,7 +200,7 @@ kfold:
- LHCB_WPWM_8TEV_MUON_Y
- LHCB_Z0_13TEV_DIMUON-Y
- ATLAS_Z0_7TEV_46FB_CF-Y
- ATLAS_WJ_JET_8TEV_WM-PT
- ATLAS_WJ_8TEV_WM-PT
- ATLAS_Z0_7TEV_LOMASS_M
- ATLAS_Z0J_8TEV_PT-Y
- CMS_WPWM_8TEV_MUON_Y
Expand Down
0 .../ATLAS_WJ_JET_8TEV/data_legacy_WM-PT.yaml → ...data/ATLAS_WJ_8TEV/data_legacy_WM-PT.yaml
View file
File renamed without changes.
0 .../ATLAS_WJ_JET_8TEV/data_legacy_WP-PT.yaml → ...data/ATLAS_WJ_8TEV/data_legacy_WP-PT.yaml
View file
File renamed without changes.
0 ...a/ATLAS_WJ_JET_8TEV/kinematics_WM-PT.yaml → ...ndata/ATLAS_WJ_8TEV/kinematics_WM-PT.yaml
View file
File renamed without changes.
0 ...a/ATLAS_WJ_JET_8TEV/kinematics_WP-PT.yaml → ...ndata/ATLAS_WJ_8TEV/kinematics_WP-PT.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ommondata/ATLAS_WJ_JET_8TEV/metadata.yaml → ...ew_commondata/ATLAS_WJ_8TEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: ATLAS_WJ_JET_8TEV
setname: ATLAS_WJ_8TEV
version: 1
version_comment: Port of old commondata
nnpdf_metadata:
Expand Down
0 ...T_8TEV/uncertainties_WM-PT_sys_ATLAS.yaml → ...J_8TEV/uncertainties_WM-PT_sys_ATLAS.yaml
View file
File renamed without changes.
0 ..._JET_8TEV/uncertainties_WM-PT_sys_NP.yaml → ...S_WJ_8TEV/uncertainties_WM-PT_sys_NP.yaml
View file
File renamed without changes.
0 ...T_8TEV/uncertainties_WP-PT_sys_ATLAS.yaml → ...J_8TEV/uncertainties_WP-PT_sys_ATLAS.yaml
View file
File renamed without changes.
0 ..._JET_8TEV/uncertainties_WP-PT_sys_NP.yaml → ...S_WJ_8TEV/uncertainties_WP-PT_sys_NP.yaml
View file
File renamed without changes.
0 ..._JET_8TEV/uncertainties_legacy_WM-PT.yaml → ...S_WJ_8TEV/uncertainties_legacy_WM-PT.yaml
View file
File renamed without changes.
0 ..._JET_8TEV/uncertainties_legacy_WP-PT.yaml → ...S_WJ_8TEV/uncertainties_legacy_WP-PT.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2004_1JET_200GEV/data.yaml → ...ommondata/STAR-2004_1JET_200GEV/data.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2004_1JET_200GEV/filter.py → ...ommondata/STAR-2004_1JET_200GEV/filter.py
View file
File renamed without changes.
0 ...ata/STAR_2004_1JET_200GEV/kinematics.yaml → ...ata/STAR-2004_1JET_200GEV/kinematics.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2004_1JET_200GEV/metadata.yaml → ...ndata/STAR-2004_1JET_200GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2004_1JET_200GEV"
setname: STAR-2004_1JET_200GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...rawdata/HEPData-ins723509-v1-Figure_3.csv → ...rawdata/HEPData-ins723509-v1-Figure_3.csv
View file
File renamed without changes.
0 .../STAR_2004_1JET_200GEV/uncertainties.yaml → .../STAR-2004_1JET_200GEV/uncertainties.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2005_1JET_200GEV/data.yaml → ...ommondata/STAR-2005_1JET_200GEV/data.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2005_1JET_200GEV/filter.py → ...ommondata/STAR-2005_1JET_200GEV/filter.py
View file
File renamed without changes.
0 ...ata/STAR_2005_1JET_200GEV/kinematics.yaml → ...ata/STAR-2005_1JET_200GEV/kinematics.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2005_1JET_200GEV/metadata.yaml → ...ndata/STAR-2005_1JET_200GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2005_1JET_200GEV"
setname: STAR-2005_1JET_200GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...AR_2005_1JET_200GEV/rawdata/Table_14.yaml → ...AR-2005_1JET_200GEV/rawdata/Table_14.yaml
View file
File renamed without changes.
0 .../STAR_2005_1JET_200GEV/uncertainties.yaml → .../STAR-2005_1JET_200GEV/uncertainties.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2006_1JET_200GEV/data.yaml → ...ommondata/STAR-2006_1JET_200GEV/data.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2006_1JET_200GEV/filter.py → ...ommondata/STAR-2006_1JET_200GEV/filter.py
View file
File renamed without changes.
0 ...ata/STAR_2006_1JET_200GEV/kinematics.yaml → ...ata/STAR-2006_1JET_200GEV/kinematics.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2006_1JET_200GEV/metadata.yaml → ...ndata/STAR-2006_1JET_200GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2006_1JET_200GEV"
setname: STAR-2006_1JET_200GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...AR_2006_1JET_200GEV/rawdata/Table_15.yaml → ...AR-2006_1JET_200GEV/rawdata/Table_15.yaml
View file
File renamed without changes.
0 .../STAR_2006_1JET_200GEV/uncertainties.yaml → .../STAR-2006_1JET_200GEV/uncertainties.yaml
View file
File renamed without changes.
0 ...ondata/STAR_2009_1JET_200GEV/data_CC.yaml → ...ondata/STAR-2009_1JET_200GEV/data_CC.yaml
View file
File renamed without changes.
0 ...ondata/STAR_2009_1JET_200GEV/data_CF.yaml → ...ondata/STAR-2009_1JET_200GEV/data_CF.yaml
View file
File renamed without changes.
15 changes: 8 additions & 7 deletions ...ommondata/STAR_2009_1JET_200GEV/filter.py → ...ommondata/STAR-2009_1JET_200GEV/filter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ def read_1jet_data(topology):

def read_2jet_data(topology):
if "S" in topology:
fname = f"../STAR_{YEAR}_2JET_MIDRAP_200GEV/rawdata/Table_{topology}.yaml"
fname = f"../STAR-{YEAR}_2JET_200GEV_MIDRAP/rawdata/Table_{topology}.yaml"
else:
fname = f"../STAR_{YEAR}_2JET_200GEV/rawdata/Table_{topology}.yaml"
fname = f"../STAR-{YEAR}_2JET_200GEV/rawdata/Table_{topology}.yaml"
df = pd.DataFrame()
with open(fname, "r", encoding="utf-8") as file:
data = yaml.safe_load(file)
Expand Down Expand Up @@ -212,12 +212,13 @@ def write_1jet_data(df, topology, art_sys):


def write_2jet_data(df, topology, art_sys):
STORE_PATH = f"../STAR_{YEAR}_2JET_200GEV/"
STORE_PATH = f"../STAR-{YEAR}_2JET_200GEV"
if "S" in topology:
STORE_PATH = f"../STAR_{YEAR}_2JET_MIDRAP_200GEV/"
STORE_PATH += "_MIDRAP"
STORE_PATH = pathlib.Path(STORE_PATH)
# Write central data
data_central_yaml = {"data_central": list(df["ALL"])}
with open(STORE_PATH + f"data_{topology}.yaml", "w", encoding="utf-8") as file:
with open(STORE_PATH / f"data_{topology}.yaml", "w", encoding="utf-8") as file:
yaml.dump(data_central_yaml, file)

# Write kin file
Expand Down Expand Up @@ -261,7 +262,7 @@ def write_2jet_data(df, topology, art_sys):
kin.append(kin_value)
kinematics_yaml = {"bins": kin}
with open(
STORE_PATH + f"kinematics_{topology}.yaml", "w", encoding="utf-8"
STORE_PATH / f"kinematics_{topology}.yaml", "w", encoding="utf-8"
) as file:
yaml.dump(kinematics_yaml, file)

Expand Down Expand Up @@ -304,7 +305,7 @@ def write_2jet_data(df, topology, art_sys):

uncertainties_yaml = {"definitions": error_definition, "bins": error}
with open(
STORE_PATH + f"uncertainties_{topology}.yaml", "w", encoding="utf-8"
STORE_PATH / f"uncertainties_{topology}.yaml", "w", encoding="utf-8"
) as file:
yaml.dump(uncertainties_yaml, file, sort_keys=False)

Expand Down
0 .../STAR_2009_1JET_200GEV/kinematics_CC.yaml → .../STAR-2009_1JET_200GEV/kinematics_CC.yaml
View file
File renamed without changes.
0 .../STAR_2009_1JET_200GEV/kinematics_CF.yaml → .../STAR-2009_1JET_200GEV/kinematics_CF.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2009_1JET_200GEV/metadata.yaml → ...ndata/STAR-2009_1JET_200GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2009_1JET_200GEV"
setname: STAR-2009_1JET_200GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ..._2009_1JET_200GEV/rawdata/Table_3_ALL.csv → ...-2009_1JET_200GEV/rawdata/Table_3_ALL.csv
View file
File renamed without changes.
0 ...R_2009_1JET_200GEV/rawdata/Table_3_pT.csv → ...R-2009_1JET_200GEV/rawdata/Table_3_pT.csv
View file
File renamed without changes.
0 ..._2009_1JET_200GEV/rawdata/Table_4_ALL.csv → ...-2009_1JET_200GEV/rawdata/Table_4_ALL.csv
View file
File renamed without changes.
0 ...R_2009_1JET_200GEV/rawdata/Table_4_pT.csv → ...R-2009_1JET_200GEV/rawdata/Table_4_pT.csv
View file
File renamed without changes.
0 ...STAR_2009_1JET_200GEV/rawdata/Table_5.csv → ...STAR-2009_1JET_200GEV/rawdata/Table_5.csv
View file
File renamed without changes.
0 ..._2009_1JET_200GEV/rawdata/correlation.csv → ...-2009_1JET_200GEV/rawdata/correlation.csv
View file
File renamed without changes.
0 ...AR_2009_1JET_200GEV/uncertainties_CC.yaml → ...AR-2009_1JET_200GEV/uncertainties_CC.yaml
View file
File renamed without changes.
0 ...AR_2009_1JET_200GEV/uncertainties_CF.yaml → ...AR-2009_1JET_200GEV/uncertainties_CF.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2009_2JET_200GEV/data_A.yaml → ...mondata/STAR-2009_2JET_200GEV/data_A.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2009_2JET_200GEV/data_B.yaml → ...mondata/STAR-2009_2JET_200GEV/data_B.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2009_2JET_200GEV/data_C.yaml → ...mondata/STAR-2009_2JET_200GEV/data_C.yaml
View file
File renamed without changes.
0 ...a/STAR_2009_2JET_200GEV/kinematics_A.yaml → ...a/STAR-2009_2JET_200GEV/kinematics_A.yaml
View file
File renamed without changes.
0 ...a/STAR_2009_2JET_200GEV/kinematics_B.yaml → ...a/STAR-2009_2JET_200GEV/kinematics_B.yaml
View file
File renamed without changes.
0 ...a/STAR_2009_2JET_200GEV/kinematics_C.yaml → ...a/STAR-2009_2JET_200GEV/kinematics_C.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2009_2JET_200GEV/metadata.yaml → ...ndata/STAR-2009_2JET_200GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2009_2JET_200GEV"
setname: STAR-2009_2JET_200GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...TAR_2009_2JET_200GEV/rawdata/Table_A.yaml → ...TAR-2009_2JET_200GEV/rawdata/Table_A.yaml
View file
File renamed without changes.
0 ...TAR_2009_2JET_200GEV/rawdata/Table_B.yaml → ...TAR-2009_2JET_200GEV/rawdata/Table_B.yaml
View file
File renamed without changes.
0 ...TAR_2009_2JET_200GEV/rawdata/Table_C.yaml → ...TAR-2009_2JET_200GEV/rawdata/Table_C.yaml
View file
File renamed without changes.
0 ...TAR_2009_2JET_200GEV/uncertainties_A.yaml → ...TAR-2009_2JET_200GEV/uncertainties_A.yaml
View file
File renamed without changes.
0 ...TAR_2009_2JET_200GEV/uncertainties_B.yaml → ...TAR-2009_2JET_200GEV/uncertainties_B.yaml
View file
File renamed without changes.
0 ...TAR_2009_2JET_200GEV/uncertainties_C.yaml → ...TAR-2009_2JET_200GEV/uncertainties_C.yaml
View file
File renamed without changes.
0 ...STAR_2009_2JET_MIDRAP_200GEV/data_OS.yaml → ...STAR-2009_2JET_200GEV_MIDRAP/data_OS.yaml
View file
File renamed without changes.
0 ...STAR_2009_2JET_MIDRAP_200GEV/data_SS.yaml → ...STAR-2009_2JET_200GEV_MIDRAP/data_SS.yaml
View file
File renamed without changes.
0 ...009_2JET_MIDRAP_200GEV/kinematics_OS.yaml → ...009_2JET_200GEV_MIDRAP/kinematics_OS.yaml
View file
File renamed without changes.
0 ...009_2JET_MIDRAP_200GEV/kinematics_SS.yaml → ...009_2JET_200GEV_MIDRAP/kinematics_SS.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...TAR_2009_2JET_MIDRAP_200GEV/metadata.yaml → ...TAR-2009_2JET_200GEV_MIDRAP/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2009_2JET_MIDRAP_200GEV"
setname: STAR-2009_2JET_200GEV_MIDRAP

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ..._2JET_MIDRAP_200GEV/rawdata/Table_OS.yaml → ..._2JET_200GEV_MIDRAP/rawdata/Table_OS.yaml
View file
File renamed without changes.
0 ..._2JET_MIDRAP_200GEV/rawdata/Table_SS.yaml → ..._2JET_200GEV_MIDRAP/rawdata/Table_SS.yaml
View file
File renamed without changes.
0 ..._2JET_MIDRAP_200GEV/uncertainties_OS.yaml → ..._2JET_200GEV_MIDRAP/uncertainties_OS.yaml
View file
File renamed without changes.
0 ..._2JET_MIDRAP_200GEV/uncertainties_SS.yaml → ..._2JET_200GEV_MIDRAP/uncertainties_SS.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2012_1JET_510GEV/data.yaml → ...ommondata/STAR-2012_1JET_510GEV/data.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ommondata/STAR_2012_1JET_510GEV/filter.py → ...ommondata/STAR-2012_1JET_510GEV/filter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def write_1jet_data(df, art_sys):


def write_2jet_data(df, topology, art_sys):
STORE_PATH = HERE / f"../STAR_{YEAR}_2JET_{SQRTS}GEV/"
STORE_PATH = HERE / f"../STAR-{YEAR}_2JET_{SQRTS}GEV/"
# Write central data
data_central_yaml = {"data_central": list(df["ALL"])}
with open(STORE_PATH / f"data_{topology}.yaml", "w", encoding="utf-8") as file:
Expand Down
0 ...ata/STAR_2012_1JET_510GEV/kinematics.yaml → ...ata/STAR-2012_1JET_510GEV/kinematics.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2012_1JET_510GEV/metadata.yaml → ...ndata/STAR-2012_1JET_510GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2012_1JET_510GEV"
setname: STAR-2012_1JET_510GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...2_1JET_510GEV/rawdata/Figure12(Run12).csv → ...2_1JET_510GEV/rawdata/Figure12(Run12).csv
View file
File renamed without changes.
0 ...JET_510GEV/rawdata/Figure14(b,A,data).csv → ...JET_510GEV/rawdata/Figure14(b,A,data).csv
View file
File renamed without changes.
0 ...JET_510GEV/rawdata/Figure14(b,B,data).csv → ...JET_510GEV/rawdata/Figure14(b,B,data).csv
View file
File renamed without changes.
0 ...JET_510GEV/rawdata/Figure14(b,C,data).csv → ...JET_510GEV/rawdata/Figure14(b,C,data).csv
View file
File renamed without changes.
0 ...JET_510GEV/rawdata/Figure14(b,D,data).csv → ...JET_510GEV/rawdata/Figure14(b,D,data).csv
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrAVsA.tex → ...TAR-2012_1JET_510GEV/rawdata/corrAVsA.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrAVsB.tex → ...TAR-2012_1JET_510GEV/rawdata/corrAVsB.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrAVsC.tex → ...TAR-2012_1JET_510GEV/rawdata/corrAVsC.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrAVsD.tex → ...TAR-2012_1JET_510GEV/rawdata/corrAVsD.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrBVsB.tex → ...TAR-2012_1JET_510GEV/rawdata/corrBVsB.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrBVsC.tex → ...TAR-2012_1JET_510GEV/rawdata/corrBVsC.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrBVsD.tex → ...TAR-2012_1JET_510GEV/rawdata/corrBVsD.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrCVsC.tex → ...TAR-2012_1JET_510GEV/rawdata/corrCVsC.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrCVsD.tex → ...TAR-2012_1JET_510GEV/rawdata/corrCVsD.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrDVsD.tex → ...TAR-2012_1JET_510GEV/rawdata/corrDVsD.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrIVsA.tex → ...TAR-2012_1JET_510GEV/rawdata/corrIVsA.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrIVsB.tex → ...TAR-2012_1JET_510GEV/rawdata/corrIVsB.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrIVsC.tex → ...TAR-2012_1JET_510GEV/rawdata/corrIVsC.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrIVsD.tex → ...TAR-2012_1JET_510GEV/rawdata/corrIVsD.tex
View file
File renamed without changes.
0 ...TAR_2012_1JET_510GEV/rawdata/corrIVsI.tex → ...TAR-2012_1JET_510GEV/rawdata/corrIVsI.tex
View file
File renamed without changes.
0 .../STAR_2012_1JET_510GEV/uncertainties.yaml → .../STAR-2012_1JET_510GEV/uncertainties.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2012_2JET_510GEV/data_A.yaml → ...mondata/STAR-2012_2JET_510GEV/data_A.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2012_2JET_510GEV/data_B.yaml → ...mondata/STAR-2012_2JET_510GEV/data_B.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2012_2JET_510GEV/data_C.yaml → ...mondata/STAR-2012_2JET_510GEV/data_C.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2012_2JET_510GEV/data_D.yaml → ...mondata/STAR-2012_2JET_510GEV/data_D.yaml
View file
File renamed without changes.
0 ...a/STAR_2012_2JET_510GEV/kinematics_A.yaml → ...a/STAR-2012_2JET_510GEV/kinematics_A.yaml
View file
File renamed without changes.
0 ...a/STAR_2012_2JET_510GEV/kinematics_B.yaml → ...a/STAR-2012_2JET_510GEV/kinematics_B.yaml
View file
File renamed without changes.
0 ...a/STAR_2012_2JET_510GEV/kinematics_C.yaml → ...a/STAR-2012_2JET_510GEV/kinematics_C.yaml
View file
File renamed without changes.
0 ...a/STAR_2012_2JET_510GEV/kinematics_D.yaml → ...a/STAR-2012_2JET_510GEV/kinematics_D.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2012_2JET_510GEV/metadata.yaml → ...ndata/STAR-2012_2JET_510GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2012_2JET_510GEV"
setname: STAR-2012_2JET_510GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...TAR_2012_2JET_510GEV/uncertainties_A.yaml → ...TAR-2012_2JET_510GEV/uncertainties_A.yaml
View file
File renamed without changes.
0 ...TAR_2012_2JET_510GEV/uncertainties_B.yaml → ...TAR-2012_2JET_510GEV/uncertainties_B.yaml
View file
File renamed without changes.
0 ...TAR_2012_2JET_510GEV/uncertainties_C.yaml → ...TAR-2012_2JET_510GEV/uncertainties_C.yaml
View file
File renamed without changes.
0 ...TAR_2012_2JET_510GEV/uncertainties_D.yaml → ...TAR-2012_2JET_510GEV/uncertainties_D.yaml
View file
File renamed without changes.
0 ...ommondata/STAR_2013_1JET_510GEV/data.yaml → ...ommondata/STAR-2013_1JET_510GEV/data.yaml
View file
File renamed without changes.
5 changes: 3 additions & 2 deletions ...ommondata/STAR_2013_1JET_510GEV/filter.py → ...ommondata/STAR-2013_1JET_510GEV/filter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
compute_covmat,
upper_triangular_to_symmetric,
)
from nnpdf_data.new_commondata.STAR_2012_1JET_510GEV.filter import TOPO_DEF
import importlib
TOPO_DEF = importlib.import_module("nnpdf_data.new_commondata.STAR-2012_1JET_510GEV.filter").TOPO_DEF

# values from the paper https://arxiv.org/pdf/2110.11020.pdf
SQRTS = 510
Expand Down Expand Up @@ -203,7 +204,7 @@ def write_1jet_data(df, art_sys):


def write_2jet_data(df, topology, art_sys):
STORE_PATH = HERE / f"../STAR_{YEAR}_2JET_510GEV/"
STORE_PATH = HERE / f"../STAR-{YEAR}_2JET_510GEV/"
# Write central data
data_central_yaml = {"data_central": list(df["ALL"])}
with open(STORE_PATH / f"data_{topology}.yaml", "w", encoding="utf-8") as file:
Expand Down
0 ...ata/STAR_2013_1JET_510GEV/kinematics.yaml → ...ata/STAR-2013_1JET_510GEV/kinematics.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2013_1JET_510GEV/metadata.yaml → ...ndata/STAR-2013_1JET_510GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2013_1JET_510GEV"
setname: STAR-2013_1JET_510GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...ettopologyA-DijettopologyAcorrelation.csv → ...ettopologyA-DijettopologyAcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyA-DijettopologyBcorrelation.csv → ...ettopologyA-DijettopologyBcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyA-DijettopologyCcorrelation.csv → ...ettopologyA-DijettopologyCcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyA-DijettopologyDcorrelation.csv → ...ettopologyA-DijettopologyDcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyB-DijettopologyBcorrelation.csv → ...ettopologyB-DijettopologyBcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyB-DijettopologyCcorrelation.csv → ...ettopologyB-DijettopologyCcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyB-DijettopologyDcorrelation.csv → ...ettopologyB-DijettopologyDcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyC-DijettopologyCcorrelation.csv → ...ettopologyC-DijettopologyCcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyC-DijettopologyDcorrelation.csv → ...ettopologyC-DijettopologyDcorrelation.csv
View file
File renamed without changes.
0 ...ettopologyD-DijettopologyDcorrelation.csv → ...ettopologyD-DijettopologyDcorrelation.csv
View file
File renamed without changes.
0 ...STAR_2013_1JET_510GEV/rawdata/Figure3.csv → ...STAR-2013_1JET_510GEV/rawdata/Figure3.csv
View file
File renamed without changes.
0 ..._1JET_510GEV/rawdata/Figure5topologyA.csv → ..._1JET_510GEV/rawdata/Figure5topologyA.csv
View file
File renamed without changes.
0 ..._1JET_510GEV/rawdata/Figure5topologyB.csv → ..._1JET_510GEV/rawdata/Figure5topologyB.csv
View file
File renamed without changes.
0 ..._1JET_510GEV/rawdata/Figure5topologyC.csv → ..._1JET_510GEV/rawdata/Figure5topologyC.csv
View file
File renamed without changes.
0 ..._1JET_510GEV/rawdata/Figure5topologyD.csv → ..._1JET_510GEV/rawdata/Figure5topologyD.csv
View file
File renamed without changes.
0 ...nclusivejet-DijettopologyAcorrelation.csv → ...nclusivejet-DijettopologyAcorrelation.csv
View file
File renamed without changes.
0 ...nclusivejet-DijettopologyBcorrelation.csv → ...nclusivejet-DijettopologyBcorrelation.csv
View file
File renamed without changes.
0 ...nclusivejet-DijettopologyCcorrelation.csv → ...nclusivejet-DijettopologyCcorrelation.csv
View file
File renamed without changes.
0 ...nclusivejet-DijettopologyDcorrelation.csv → ...nclusivejet-DijettopologyDcorrelation.csv
View file
File renamed without changes.
0 .../Inclusivejet-Inclusivejetcorrelation.csv → .../Inclusivejet-Inclusivejetcorrelation.csv
View file
File renamed without changes.
0 .../STAR_2013_1JET_510GEV/uncertainties.yaml → .../STAR-2013_1JET_510GEV/uncertainties.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2013_2JET_510GEV/data_A.yaml → ...mondata/STAR-2013_2JET_510GEV/data_A.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2013_2JET_510GEV/data_B.yaml → ...mondata/STAR-2013_2JET_510GEV/data_B.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2013_2JET_510GEV/data_C.yaml → ...mondata/STAR-2013_2JET_510GEV/data_C.yaml
View file
File renamed without changes.
0 ...mondata/STAR_2013_2JET_510GEV/data_D.yaml → ...mondata/STAR-2013_2JET_510GEV/data_D.yaml
View file
File renamed without changes.
0 ...a/STAR_2013_2JET_510GEV/kinematics_A.yaml → ...a/STAR-2013_2JET_510GEV/kinematics_A.yaml
View file
File renamed without changes.
0 ...a/STAR_2013_2JET_510GEV/kinematics_B.yaml → ...a/STAR-2013_2JET_510GEV/kinematics_B.yaml
View file
File renamed without changes.
0 ...a/STAR_2013_2JET_510GEV/kinematics_C.yaml → ...a/STAR-2013_2JET_510GEV/kinematics_C.yaml
View file
File renamed without changes.
0 ...a/STAR_2013_2JET_510GEV/kinematics_D.yaml → ...a/STAR-2013_2JET_510GEV/kinematics_D.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2013_2JET_510GEV/metadata.yaml → ...ndata/STAR-2013_2JET_510GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2013_2JET_510GEV"
setname: STAR-2013_2JET_510GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...TAR_2013_2JET_510GEV/uncertainties_A.yaml → ...TAR-2013_2JET_510GEV/uncertainties_A.yaml
View file
File renamed without changes.
0 ...TAR_2013_2JET_510GEV/uncertainties_B.yaml → ...TAR-2013_2JET_510GEV/uncertainties_B.yaml
View file
File renamed without changes.
0 ...TAR_2013_2JET_510GEV/uncertainties_C.yaml → ...TAR-2013_2JET_510GEV/uncertainties_C.yaml
View file
File renamed without changes.
0 ...TAR_2013_2JET_510GEV/uncertainties_D.yaml → ...TAR-2013_2JET_510GEV/uncertainties_D.yaml
View file
File renamed without changes.
0 ...ondata/STAR_2015_1JET_200GEV/data_CC.yaml → ...ondata/STAR-2015_1JET_200GEV/data_CC.yaml
View file
File renamed without changes.
0 ...ondata/STAR_2015_1JET_200GEV/data_CF.yaml → ...ondata/STAR-2015_1JET_200GEV/data_CF.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ommondata/STAR_2015_1JET_200GEV/filter.py → ...ommondata/STAR-2015_1JET_200GEV/filter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def write_1jet_data(df, topology, art_sys):


def write_2jet_data(df, topology, art_sys):
STORE_PATH = HERE / f"../STAR_{YEAR}_2JET_MIDRAP_{SQRTS}GEV/"
STORE_PATH = HERE / f"../STAR-{YEAR}_2JET_{SQRTS}GEV_MIDRAP/"
# Write central data
data_central_yaml = {"data_central": list(df["ALL"])}
with open(STORE_PATH / f"data_{topology}.yaml", "w", encoding="utf-8") as file:
Expand Down
0 .../STAR_2015_1JET_200GEV/kinematics_CC.yaml → .../STAR-2015_1JET_200GEV/kinematics_CC.yaml
View file
File renamed without changes.
0 .../STAR_2015_1JET_200GEV/kinematics_CF.yaml → .../STAR-2015_1JET_200GEV/kinematics_CF.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndata/STAR_2015_1JET_200GEV/metadata.yaml → ...ndata/STAR-2015_1JET_200GEV/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2015_1JET_200GEV"
setname: STAR-2015_1JET_200GEV

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ...V/rawdata/Table11SupplementalMaterial.csv → ...V/rawdata/Table11SupplementalMaterial.csv
View file
File renamed without changes.
0 ...V/rawdata/Table12SupplementalMaterial.csv → ...V/rawdata/Table12SupplementalMaterial.csv
View file
File renamed without changes.
0 ...V/rawdata/Table13SupplementalMaterial.csv → ...V/rawdata/Table13SupplementalMaterial.csv
View file
File renamed without changes.
0 ...EV/rawdata/Table1SupplementalMaterial.csv → ...EV/rawdata/Table1SupplementalMaterial.csv
View file
File renamed without changes.
0 ...2015_1JET_200GEV/rawdata/Table1bottom.csv → ...2015_1JET_200GEV/rawdata/Table1bottom.csv
View file
File renamed without changes.
0 ...AR_2015_1JET_200GEV/rawdata/Table1top.csv → ...AR-2015_1JET_200GEV/rawdata/Table1top.csv
View file
File renamed without changes.
0 ...EV/rawdata/Table2SupplementalMaterial.csv → ...EV/rawdata/Table2SupplementalMaterial.csv
View file
File renamed without changes.
0 ...2015_1JET_200GEV/rawdata/Table2bottom.csv → ...2015_1JET_200GEV/rawdata/Table2bottom.csv
View file
File renamed without changes.
0 ...AR_2015_1JET_200GEV/rawdata/Table2top.csv → ...AR-2015_1JET_200GEV/rawdata/Table2top.csv
View file
File renamed without changes.
0 ...EV/rawdata/Table4SupplementalMaterial.csv → ...EV/rawdata/Table4SupplementalMaterial.csv
View file
File renamed without changes.
0 ...EV/rawdata/Table5SupplementalMaterial.csv → ...EV/rawdata/Table5SupplementalMaterial.csv
View file
File renamed without changes.
0 ...EV/rawdata/Table6SupplementalMaterial.csv → ...EV/rawdata/Table6SupplementalMaterial.csv
View file
File renamed without changes.
0 ...EV/rawdata/Table7SupplementalMaterial.csv → ...EV/rawdata/Table7SupplementalMaterial.csv
View file
File renamed without changes.
0 ...EV/rawdata/Table8SupplementalMaterial.csv → ...EV/rawdata/Table8SupplementalMaterial.csv
View file
File renamed without changes.
0 ...AR_2015_1JET_200GEV/uncertainties_CC.yaml → ...AR-2015_1JET_200GEV/uncertainties_CC.yaml
View file
File renamed without changes.
0 ...AR_2015_1JET_200GEV/uncertainties_CF.yaml → ...AR-2015_1JET_200GEV/uncertainties_CF.yaml
View file
File renamed without changes.
0 ...STAR_2015_2JET_MIDRAP_200GEV/data_OS.yaml → ...STAR-2015_2JET_200GEV_MIDRAP/data_OS.yaml
View file
File renamed without changes.
0 ...STAR_2015_2JET_MIDRAP_200GEV/data_SS.yaml → ...STAR-2015_2JET_200GEV_MIDRAP/data_SS.yaml
View file
File renamed without changes.
0 ...015_2JET_MIDRAP_200GEV/kinematics_OS.yaml → ...015_2JET_200GEV_MIDRAP/kinematics_OS.yaml
View file
File renamed without changes.
0 ...015_2JET_MIDRAP_200GEV/kinematics_SS.yaml → ...015_2JET_200GEV_MIDRAP/kinematics_SS.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...TAR_2015_2JET_MIDRAP_200GEV/metadata.yaml → ...TAR-2015_2JET_200GEV_MIDRAP/metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setname: "STAR_2015_2JET_MIDRAP_200GEV"
setname: STAR-2015_2JET_200GEV_MIDRAP

nnpdf_metadata:
experiment: "STAR"
Expand Down
0 ..._2JET_MIDRAP_200GEV/uncertainties_OS.yaml → ..._2JET_200GEV_MIDRAP/uncertainties_OS.yaml
View file
File renamed without changes.
0 ..._2JET_MIDRAP_200GEV/uncertainties_SS.yaml → ..._2JET_200GEV_MIDRAP/uncertainties_SS.yaml
View file
File renamed without changes.
13 changes: 13 additions & 0 deletions nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,16 @@ INTEGXV3:
dataset: NNPDF_INTEG_3GEV_XV3
INTEGXV8:
dataset: NNPDF_INTEG_3GEV_XV8
STAR_2004_1JET_200GEV: STAR-2004_1JET_200GEV
STAR_2005_1JET_200GEV: STAR-2005_1JET_200GEV
STAR_2006_1JET_200GEV: STAR-2006_1JET_200GEV
STAR_2009_1JET_200GEV: STAR-2009_1JET_200GEV
STAR_2009_2JET_200GEV: STAR-2009_2JET_200GEV
STAR_2009_2JET_MIDRAP_200GEV: STAR-2009_2JET_200GEV_MIDRAP
STAR_2012_1JET_510GEV: STAR-2012_1JET_510GEV
STAR_2012_2JET_510GEV: STAR-2012_2JET_510GEV
STAR_2013_1JET_510GEV: STAR-2013_1JET_510GEV
STAR_2013_2JET_510GEV: STAR-2013_2JET_510GEV
STAR_2015_1JET_200GEV: STAR-2015_1JET_200GEV
STAR_2015_2JET_MIDRAP_200GEV: STAR-2015_2JET_200GEV_MIDRAP
ATLAS_WJ_JET_8TEV: ATLAS_WJ_8TEV
4 changes: 2 additions & 2 deletions validphys2/src/validphys/cuts/filters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,11 @@
2112.01120, page 7, paragraph 2
rule: '(pT**2 + Q2) > 100'

- dataset: ATLAS_WJ_JET_8TEV_WP-PT
- dataset: ATLAS_WJ_8TEV_WP-PT
reason: Avoid the region where small-pT resummation effects become important.
rule: "p_T >= 30"

- dataset: ATLAS_WJ_JET_8TEV_WM-PT
- dataset: ATLAS_WJ_8TEV_WM-PT
reason: Avoid the region where small-pT resummation effects become important.
rule: "p_T >= 30"

Expand Down
2 changes: 1 addition & 1 deletion validphys2/src/validphys/tests/conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def tmp(tmpdir):
{'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
{'dataset': 'CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED', 'variant': 'legacy'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy_10'},
{'dataset': 'ATLAS_WJ_JET_8TEV_WP-PT', 'variant': 'legacy'},
{'dataset': 'ATLAS_WJ_8TEV_WP-PT', 'variant': 'legacy'},
{'dataset': 'LHCB_Z0_8TEV_MUON_Y', 'cfac': ['NRM']},
]

Expand Down
2 changes: 1 addition & 1 deletion validphys2/src/validphys/tests/regressions/test_thcovmat_chi2.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
0 NMC_NC_NOTFIXED_P_EM-SIGMARED 278.52920496717354
1 CHORUS_CC_NOTFIXED_PB_DW_NU-SIGMARED 400.4162663033831
2 CMS_Z0J_8TEV_PT-Y 38.82979671473423
3 ATLAS_WJ_JET_8TEV_WP-PT 11.501661474292018
3 ATLAS_WJ_8TEV_WP-PT 11.501661474292018
4 LHCB_Z0_8TEV_MUON_Y 22.88204484914811
Loading

0 comments on commit c3215b7

Please sign in to comment.