Skip to content

Commit

Permalink
fix unconventional names
Browse files Browse the repository at this point in the history
  • Loading branch information
scarlehoff committed Aug 9, 2024
1 parent 06db080 commit a3557cc
Show file tree
Hide file tree
Showing 182 changed files with 134 additions and 106 deletions.
2 changes: 1 addition & 1 deletion n3fit/runcards/examples/developing.yml
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
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
48 changes: 24 additions & 24 deletions n3fit/runcards/examples/nnpdfpol20_dis_nlo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,32 @@ 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_2004_1JET_200GEV_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: STAR-2004_1JET_200GEV_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
48 changes: 24 additions & 24 deletions n3fit/runcards/examples/nnpdfpol20_dis_nlo_mhou.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,32 @@ 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_2004_1JET_200GEV_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: STAR-2004_1JET_200GEV_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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
30 changes: 28 additions & 2 deletions nnpdf_data/nnpdf_data/new_commondata/dataset_names.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ ATLASDY2D8TEV:
dataset: ATLAS_Z0_8TEV_HIMASS_M-Y
variant: legacy
ATLAS_WM_JET_8TEV_PT:
dataset: ATLAS_WJ_JET_8TEV_WM-PT
dataset: ATLAS_WJ_8TEV_WM-PT
variant: legacy
ATLAS_WP_JET_8TEV_PT:
dataset: ATLAS_WJ_JET_8TEV_WP-PT
dataset: ATLAS_WJ_8TEV_WP-PT
variant: legacy
ATLAS_WZ_TOT_13TEV:
dataset: ATLAS_DY_13TEV_TOT
Expand Down Expand Up @@ -352,3 +352,29 @@ INTEGXV3:
dataset: NNPDF_INTEG_3GEV_XV3
INTEGXV8:
dataset: NNPDF_INTEG_3GEV_XV8
STAR_2004_1JET_200GEV_ALL: STAR-2004_1JET_200GEV_ALL
STAR_2005_1JET_200GEV_ALL: STAR-2005_1JET_200GEV_ALL
STAR_2006_1JET_200GEV_ALL: STAR-2006_1JET_200GEV_ALL
STAR_2009_1JET_200GEV_CC-ALL: STAR-2009_1JET_200GEV_CC-ALL
STAR_2009_1JET_200GEV_CF-ALL: STAR-2009_1JET_200GEV_CF-ALL
STAR_2009_2JET_200GEV_A-ALL: STAR-2009_2JET_200GEV_A-ALL
STAR_2009_2JET_200GEV_B-ALL: STAR-2009_2JET_200GEV_B-ALL
STAR_2009_2JET_200GEV_C-ALL: STAR-2009_2JET_200GEV_C-ALL
STAR_2009_2JET_MIDRAP_200GEV_OS-ALL: STAR-2009_2JET_200GEV_MIDRAP_OS-ALL
STAR_2009_2JET_MIDRAP_200GEV_SS-ALL: STAR-2009_2JET_200GEV_MIDRAP_SS-ALL
STAR_2012_1JET_510GEV_ALL: STAR-2012_1JET_510GEV_ALL
STAR_2012_2JET_510GEV_A-ALL: STAR-2012_2JET_510GEV_A-ALL
STAR_2012_2JET_510GEV_B-ALL: STAR-2012_2JET_510GEV_B-ALL
STAR_2012_2JET_510GEV_C-ALL: STAR-2012_2JET_510GEV_C-ALL
STAR_2012_2JET_510GEV_D-ALL: STAR-2012_2JET_510GEV_D-ALL
STAR_2013_1JET_510GEV_ALL: STAR-2013_1JET_510GEV_ALL
STAR_2013_2JET_510GEV_A-ALL: STAR-2013_2JET_510GEV_A-ALL
STAR_2013_2JET_510GEV_B-ALL: STAR-2013_2JET_510GEV_B-ALL
STAR_2013_2JET_510GEV_C-ALL: STAR-2013_2JET_510GEV_C-ALL
STAR_2013_2JET_510GEV_D-ALL: STAR-2013_2JET_510GEV_D-ALL
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
Loading

0 comments on commit a3557cc

Please sign in to comment.